diff options
| author | Florian Fainelli <f.fainelli@gmail.com> | 2015-05-22 14:07:30 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-05-25 00:16:07 -0400 |
| commit | cc4a84c3da6f9dd6a297dc81fe4437643a60fe03 (patch) | |
| tree | 92c7fed87a13bde8aad5e90dacc9efa985263557 | |
| parent | cf539cbd8a81e12880735a0912de8b99f46c84fd (diff) | |
| download | linux-exynos-cc4a84c3da6f9dd6a297dc81fe4437643a60fe03.tar.gz linux-exynos-cc4a84c3da6f9dd6a297dc81fe4437643a60fe03.tar.bz2 linux-exynos-cc4a84c3da6f9dd6a297dc81fe4437643a60fe03.zip | |
net: phy: bcm7xxx: Fix 7425 PHY ID and flags
While adding support for 7425 PHY in the 7xxx PHY driver, the ID that
was used was actually coming from an external PHY: a BCM5461x. Fix this
by using the proper ID for the internal 7425 PHY and set the
PHY_IS_INTERNAL flag, otherwise consumers of this PHY driver would not
be able to properly identify it as such.
Fixes: d068b02cfdfc2 ("net: phy: add BCM7425 and BCM7429 PHYs")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Reviewed-by: Petri Gynther <pgynther@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/phy/bcm7xxx.c | 2 | ||||
| -rw-r--r-- | include/linux/brcmphy.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/phy/bcm7xxx.c b/drivers/net/phy/bcm7xxx.c index 64c74c6a4828..b5dc59de094e 100644 --- a/drivers/net/phy/bcm7xxx.c +++ b/drivers/net/phy/bcm7xxx.c @@ -404,7 +404,7 @@ static struct phy_driver bcm7xxx_driver[] = { .name = "Broadcom BCM7425", .features = PHY_GBIT_FEATURES | SUPPORTED_Pause | SUPPORTED_Asym_Pause, - .flags = 0, + .flags = PHY_IS_INTERNAL, .config_init = bcm7xxx_config_init, .config_aneg = genphy_config_aneg, .read_status = genphy_read_status, diff --git a/include/linux/brcmphy.h b/include/linux/brcmphy.h index ae2982c0f7a6..656da2a12ffe 100644 --- a/include/linux/brcmphy.h +++ b/include/linux/brcmphy.h @@ -17,7 +17,7 @@ #define PHY_ID_BCM7250 0xae025280 #define PHY_ID_BCM7364 0xae025260 #define PHY_ID_BCM7366 0x600d8490 -#define PHY_ID_BCM7425 0x03625e60 +#define PHY_ID_BCM7425 0x600d86b0 #define PHY_ID_BCM7429 0x600d8730 #define PHY_ID_BCM7439 0x600d8480 #define PHY_ID_BCM7439_2 0xae025080 |