openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

powerpc: Add support for multiple gfar mdio interfaces 

The old code assumed there was only one, but the 8572 actually has 3.

Also, our usual id, 0xe0024520, gets resolved to -1 somewhere, and this was
preventing the multiple buses from having different ids.  So we only keep
the low 20 bits, which have the interesting info, anyway.

Signed-off-by: Andy Fleming <afleming@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
This commit is contained in:
Andy Fleming 2008-05-02 13:03:50 -05:00 committed by Kumar Gala
parent a47fda9307
commit 4cd7e1cbd4
1 changed files with 39 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
arch/powerpc/sysdev/fsl_soc.c
View File

@ -207,68 +207,60 @@ static int __init of_add_fixed_phys(void)
arch_initcall(of_add_fixed_phys); arch_initcall(of_add_fixed_phys);
#endif /* CONFIG_FIXED_PHY */ #endif /* CONFIG_FIXED_PHY */
static int __init gfar_mdio_of_init(void) static int gfar_mdio_of_init_one(struct device_node *np)
{ {
struct device_node *np = NULL; int k;
struct device_node *child = NULL;
struct gianfar_mdio_data mdio_data;
struct platform_device *mdio_dev; struct platform_device *mdio_dev;
struct resource res; struct resource res;
int ret; int ret;
np = of_find_compatible_node(np, NULL, "fsl,gianfar-mdio"); memset(&res, 0, sizeof(res));
memset(&mdio_data, 0, sizeof(mdio_data));
/* try the deprecated version */ ret = of_address_to_resource(np, 0, &res);
if (!np) if (ret)
np = of_find_compatible_node(np, "mdio", "gianfar"); return ret;
if (np) { mdio_dev = platform_device_register_simple("fsl-gianfar_mdio",
int k; res.start&0xfffff, &res, 1);
struct device_node *child = NULL; if (IS_ERR(mdio_dev))
struct gianfar_mdio_data mdio_data; return PTR_ERR(mdio_dev);
memset(&res, 0, sizeof(res)); for (k = 0; k < 32; k++)
memset(&mdio_data, 0, sizeof(mdio_data)); mdio_data.irq[k] = PHY_POLL;
ret = of_address_to_resource(np, 0, &res); while ((child = of_get_next_child(np, child)) != NULL) {
if (ret) int irq = irq_of_parse_and_map(child, 0);
goto err; if (irq != NO_IRQ) {
const u32 *id = of_get_property(child, "reg", NULL);
mdio_dev = mdio_data.irq[*id] = irq;
platform_device_register_simple("fsl-gianfar_mdio",
res.start, &res, 1);
if (IS_ERR(mdio_dev)) {
ret = PTR_ERR(mdio_dev);
goto err;
} }
for (k = 0; k < 32; k++)
mdio_data.irq[k] = PHY_POLL;
while ((child = of_get_next_child(np, child)) != NULL) {
int irq = irq_of_parse_and_map(child, 0);
if (irq != NO_IRQ) {
const u32 *id = of_get_property(child,
"reg", NULL);
mdio_data.irq[*id] = irq;
}
}
ret =
platform_device_add_data(mdio_dev, &mdio_data,
sizeof(struct gianfar_mdio_data));
if (ret)
goto unreg;
} }
of_node_put(np); ret = platform_device_add_data(mdio_dev, &mdio_data,
return 0; sizeof(struct gianfar_mdio_data));
if (ret)
platform_device_unregister(mdio_dev);
unreg:
platform_device_unregister(mdio_dev);
err:
of_node_put(np);
return ret; return ret;
} }
static int __init gfar_mdio_of_init(void)
{
struct device_node *np = NULL;
for_each_compatible_node(np, NULL, "fsl,gianfar-mdio")
gfar_mdio_of_init_one(np);
/* try the deprecated version */
for_each_compatible_node(np, "mdio", "gianfar");
gfar_mdio_of_init_one(np);
return 0;
}
arch_initcall(gfar_mdio_of_init); arch_initcall(gfar_mdio_of_init);
static const char *gfar_tx_intr = "tx"; static const char *gfar_tx_intr = "tx";
@ -393,7 +385,7 @@ static int __init gfar_of_init(void)
gfar_data.phy_id = *id; gfar_data.phy_id = *id;
snprintf(gfar_data.bus_id, MII_BUS_ID_SIZE, "%llx", snprintf(gfar_data.bus_id, MII_BUS_ID_SIZE, "%llx",
(unsigned long long)res.start); (unsigned long long)res.start&0xfffff);
of_node_put(phy); of_node_put(phy);
of_node_put(mdio); of_node_put(mdio);