diff options
| author | Christian Lamparter <chunkeey@googlemail.com> | 2016-10-05 15:19:34 +0200 |
|---|---|---|
| committer | John Crispin <john@phrozen.org> | 2016-10-15 11:36:50 +0200 |
| commit | e9455c561d4af68840421e3d442e4ad5ebfbedc6 (patch) | |
| tree | 96e5867729c8c23e6f3f6983c68dc5d22fcfa3e5 /target/linux/generic/files/drivers | |
| parent | bcfb535730fde6f1543f7140e818992ea13f4d30 (diff) | |
| download | upstream-e9455c561d4af68840421e3d442e4ad5ebfbedc6.tar.gz upstream-e9455c561d4af68840421e3d442e4ad5ebfbedc6.tar.bz2 upstream-e9455c561d4af68840421e3d442e4ad5ebfbedc6.zip | |
generic: ar8216: improve ar8xxx_is_possible check
The commit "generic: ar8216: add sanity check to ar8216_probe"
(774da6c7a40320a320b28d71291c0e61fcf7bc8a) stated that PHY IDs
should be checked at address 0-4. However, the PHY 4 was
never check by the loop. This patch extends the check to be
similar to the Atheors SDK. It tries all 4 ports and skips
unconnected PHYs if necessary. If it cannot find any familiar
PHYs, it will prevent the phy driver from initializing.
This patch is necessary for the C-60. It doesn't have a
PHY at port 3, so this caused the check in ar8xxx_is_possible
to fail. As a result, the ethernet ports on the C-60 didn't
work.
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
Diffstat (limited to 'target/linux/generic/files/drivers')
| -rw-r--r-- | target/linux/generic/files/drivers/net/phy/ar8216.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/generic/files/drivers/net/phy/ar8216.c b/target/linux/generic/files/drivers/net/phy/ar8216.c index 70f47746a4..cd5fbac86e 100644 --- a/target/linux/generic/files/drivers/net/phy/ar8216.c +++ b/target/linux/generic/files/drivers/net/phy/ar8216.c @@ -2113,21 +2113,21 @@ ar8xxx_phy_match(u32 phy_id) static bool ar8xxx_is_possible(struct mii_bus *bus) { - unsigned i; + unsigned int i, found_phys = 0; - for (i = 0; i < 4; i++) { + for (i = 0; i < 5; i++) { u32 phy_id; phy_id = mdiobus_read(bus, i, MII_PHYSID1) << 16; phy_id |= mdiobus_read(bus, i, MII_PHYSID2); - if (!ar8xxx_phy_match(phy_id)) { + if (ar8xxx_phy_match(phy_id)) { + found_phys++; + } else if (phy_id) { pr_debug("ar8xxx: unknown PHY at %s:%02x id:%08x\n", dev_name(&bus->dev), i, phy_id); - return false; } } - - return true; + return !!found_phys; } static int |