summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Vorontsov <avorontsov@ru.mvista.com>2009-03-31 10:33:52 +0200
committerDavid S. Miller <davem@davemloft.net>2009-04-02 10:28:00 +0200
commit0ac023faa69e54c0c443da360fa2bf8fbd9e3078 (patch)
treec602e73a72f49feda998f0f64ffc512466d47cc6
parentucc_geth: Pass proper device to DMA routines, otherwise oops happens (diff)
downloadlinux-0ac023faa69e54c0c443da360fa2bf8fbd9e3078.tar.xz
linux-0ac023faa69e54c0c443da360fa2bf8fbd9e3078.zip
fsl_pq_mdio: Revive UCC MDIO support
commit 1577ecef766650a57fceb171acee2b13cbfaf1d3 ("netdev: Merge UCC and gianfar MDIO bus drivers") introduced a regression so that UCC MDIO buses no longer work. This is because fsl_pq_mdio driver wrongly masks all non-TBI PHYs for !fsl,gianfar-mdio buses, while it should do that only for fsl,gianfar-tbi buses. Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/fsl_pq_mdio.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/fsl_pq_mdio.c b/drivers/net/fsl_pq_mdio.c
index b3079a5a7f2b..d9e1ecfbf360 100644
--- a/drivers/net/fsl_pq_mdio.c
+++ b/drivers/net/fsl_pq_mdio.c
@@ -387,7 +387,7 @@ static int fsl_pq_mdio_probe(struct of_device *ofdev,
* The TBIPHY-only buses will find PHYs at every address,
* so we mask them all but the TBI
*/
- if (!of_device_is_compatible(np, "fsl,gianfar-mdio"))
+ if (of_device_is_compatible(np, "fsl,gianfar-tbi"))
new_bus->phy_mask = ~(1 << tbiaddr);
err = mdiobus_register(new_bus);