diff options
| author |   Egil Hjelmeland <privat@egil-hjelmeland.no> | 2017-07-30 19:58:53 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-07-30 19:23:29 -0700 |
| commit | d329ac88eb217fef1516a1dcfda27b7f5a8eb07b (patch) | |
| tree | f726bff632bec2da4cbcfa120d3748928a7c083b /drivers/net/dsa | |
| parent | Merge branch 'ethtool-fec' (diff) | |
| download | linux-dev-d329ac88eb217fef1516a1dcfda27b7f5a8eb07b.tar.xz linux-dev-d329ac88eb217fef1516a1dcfda27b7f5a8eb07b.zip | |
net: dsa: lan9303: Fix lan9303_detect_phy_setup() for MDIO
Handle that MDIO read with no response return 0xffff.
Signed-off-by: Egil Hjelmeland <privat@egil-hjelmeland.no>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/dsa')
| -rw-r--r-- | drivers/net/dsa/lan9303-core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/dsa/lan9303-core.c b/drivers/net/dsa/lan9303-core.c index cd76e61f1fca..9d0ab77edb4a 100644 --- a/drivers/net/dsa/lan9303-core.c +++ b/drivers/net/dsa/lan9303-core.c @@ -427,6 +427,7 @@ static int lan9303_detect_phy_setup(struct lan9303 *chip) * Special reg 18 of phy 3 reads as 0x0000, if 'phy_addr_sel_strap' is 0 * and the IDs are 0-1-2, else it contains something different from * 0x0000, which means 'phy_addr_sel_strap' is 1 and the IDs are 1-2-3. + * 0xffff is returned on MDIO read with no response. */ reg = lan9303_port_phy_reg_read(chip, 3, MII_LAN911X_SPECIAL_MODES); if (reg < 0) { @@ -434,7 +435,7 @@ static int lan9303_detect_phy_setup(struct lan9303 *chip) return reg; } - if (reg != 0) + if ((reg != 0) && (reg != 0xffff)) chip->phy_addr_sel_strap = 1; else chip->phy_addr_sel_strap = 0; |