diff options
| author | Haiying Wang <Haiying.Wang@freescale.com> | 2009-01-29 17:28:04 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-01-29 17:28:04 -0800 |
| commit | b1c4a9dddf09fe99b8f88252718ac5b357363dc4 (patch) | |
| tree | c898bb74a859e7eae7220b983b6a9fd3079d178b /drivers/net/ucc_geth_mii.c | |
| parent | 1af7ad51049d6a310a19d497960597198290ddfa (diff) | |
| download | lwn-b1c4a9dddf09fe99b8f88252718ac5b357363dc4.tar.gz lwn-b1c4a9dddf09fe99b8f88252718ac5b357363dc4.zip | |
ucc_geth: Change uec phy id to the same format as gianfar's
The commit b31a1d8b41513b96e9c7ec2f68c5734cef0b26a4 ("gianfar: Convert
gianfar to an of_platform_driver") changes the gianfar's phy id to the
format like "mdio@xxxx:xx", but uec still uses the old format like
"xxxxxxxx:xx". For the board whose UEC uses gianfar-mdio like
MPC8568MDS, the phy can not be attached because of the incompatible
phy id format. This patch changes uec's phy id to the same format as
gianfar's.
Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ucc_geth_mii.c')
| -rw-r--r-- | drivers/net/ucc_geth_mii.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/drivers/net/ucc_geth_mii.c b/drivers/net/ucc_geth_mii.c index c001d261366b..54635911305c 100644 --- a/drivers/net/ucc_geth_mii.c +++ b/drivers/net/ucc_geth_mii.c @@ -156,7 +156,7 @@ static int uec_mdio_probe(struct of_device *ofdev, const struct of_device_id *ma if (err) goto reg_map_fail; - snprintf(new_bus->id, MII_BUS_ID_SIZE, "%x", res.start); + uec_mdio_bus_name(new_bus->id, np); new_bus->irq = kmalloc(32 * sizeof(int), GFP_KERNEL); @@ -283,3 +283,13 @@ void uec_mdio_exit(void) { of_unregister_platform_driver(&uec_mdio_driver); } + +void uec_mdio_bus_name(char *name, struct device_node *np) +{ + const u32 *reg; + + reg = of_get_property(np, "reg", NULL); + + snprintf(name, MII_BUS_ID_SIZE, "%s@%x", np->name, reg ? *reg : 0); +} + |