diff options
| author | James Byrne <james.byrne@origamienergy.com> | 2019-03-06 12:48:27 +0000 |
|---|---|---|
| committer | Joe Hershberger <joe.hershberger@ni.com> | 2019-05-14 14:43:33 -0500 |
| commit | 77b508d34b9485c981b084e8169dd64b381935b6 (patch) | |
| tree | 7293e7d7f1c8da570464271ab03d12959b293690 /configs/colibri_imx7_defconfig | |
| parent | 90176e3be63802bc8630bab651d169993f0f0763 (diff) | |
| download | u-boot-77b508d34b9485c981b084e8169dd64b381935b6.tar.gz u-boot-77b508d34b9485c981b084e8169dd64b381935b6.tar.xz u-boot-77b508d34b9485c981b084e8169dd64b381935b6.zip | |
net: phy: micrel: Allow KSZ8xxx and KSZ90x1 to be used together
Commit d397f7c45b0b ("net: phy: micrel: Separate KSZ9000 drivers from
KSZ8000 drivers") separated the KSZ8xxx and KSZ90x1 drivers and warns
that you shouldn't select both of them due to a device ID clash between
the KSZ9021 and the KS8721, asserting that "it is highly unlikely for a
system to contain both a KSZ8000 and a KSZ9000 PHY". Unfortunately
boards like the SAMA5D3xEK do contain both types of PHY, but fortunately
the Linux Micrel PHY driver provides a solution by using different PHY
ID and mask values to distinguish these chips.
This commit contains the following changes:
- The PHY ID and mask values for the KSZ9021 and the KS8721 now match
those used by the Linux driver.
- The warnings about not enabling both drivers have been removed.
- The description for PHY_MICREL_KSZ8XXX has been corrected (these are
10/100 PHYs, not GbE PHYs).
- PHY_MICREL_KSZ9021 and PHY_MICREL_KSZ9031 no longer select PHY_GIGE
since this is selected by PHY_MICREL_KSZ90X1.
- All of the relevant defconfig files have been updated now that
PHY_MICREL_KSZ8XXX does not default to 'Y'.
Signed-off-by: James Byrne <james.byrne@origamienergy.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Diffstat (limited to 'configs/colibri_imx7_defconfig')
| -rw-r--r-- | configs/colibri_imx7_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/configs/colibri_imx7_defconfig b/configs/colibri_imx7_defconfig index 58620ea68f..bfb84ecde8 100644 --- a/configs/colibri_imx7_defconfig +++ b/configs/colibri_imx7_defconfig @@ -57,6 +57,7 @@ CONFIG_NAND_MXS_DT=y CONFIG_MTD_UBI_FASTMAP=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y +CONFIG_PHY_MICREL_KSZ8XXX=y CONFIG_MII=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX7=y |