AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

net: rework fsl_pq_mdio driver to use of_mdio infrastructure

Browse Source 
This patch simplifies the driver by making use of more common code.

Tested on Freescale MPC8349emitxgp eval board

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: Andy Fleming <afleming@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Grant Likely 2009-04-25 12:53:07 +00:00 committed by David S. Miller
parent ca816d9817
commit 324931ba21
1 changed files with 3 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
drivers/net/fsl_pq_mdio.c
View File

@ -34,6 +34,7 @@
#include <linux/mii.h> #include <linux/mii.h>
#include <linux/phy.h> #include <linux/phy.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/of_mdio.h>
#include <linux/of_platform.h> #include <linux/of_platform.h>
#include <asm/io.h> #include <asm/io.h>
@ -154,44 +155,6 @@ static int fsl_pq_mdio_reset(struct mii_bus *bus)
return 0; return 0;
} }
/* Allocate an array which provides irq #s for each PHY on the given bus */
static int *create_irq_map(struct device_node *np)
{
int *irqs;
int i;
struct device_node *child = NULL;
irqs = kcalloc(PHY_MAX_ADDR, sizeof(int), GFP_KERNEL);
if (!irqs)
return NULL;
for (i = 0; i < PHY_MAX_ADDR; i++)
irqs[i] = PHY_POLL;
while ((child = of_get_next_child(np, child)) != NULL) {
int irq = irq_of_parse_and_map(child, 0);
const u32 *id;
if (irq == NO_IRQ)
continue;
id = of_get_property(child, "reg", NULL);
if (!id)
continue;
if (*id < PHY_MAX_ADDR && *id >= 0)
irqs[*id] = irq;
else
printk(KERN_WARNING "%s: "
"%d is not a valid PHY address\n",
np->full_name, *id);
}
return irqs;
}
void fsl_pq_mdio_bus_name(char *name, struct device_node *np) void fsl_pq_mdio_bus_name(char *name, struct device_node *np)
{ {
const u32 *addr; const u32 *addr;
@ -315,7 +278,7 @@ static int fsl_pq_mdio_probe(struct of_device *ofdev,
new_bus->priv = (void __force *)regs; new_bus->priv = (void __force *)regs;
new_bus->irq = create_irq_map(np); new_bus->irq = kcalloc(PHY_MAX_ADDR, sizeof(int), GFP_KERNEL);
if (NULL == new_bus->irq) { if (NULL == new_bus->irq) {
err = -ENOMEM; err = -ENOMEM;
@ -384,15 +347,7 @@ static int fsl_pq_mdio_probe(struct of_device *ofdev,
out_be32(tbipa, tbiaddr); out_be32(tbipa, tbiaddr);
/* err = of_mdiobus_register(new_bus, np);
* 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-tbi"))
new_bus->phy_mask = ~(1 << tbiaddr);
err = mdiobus_register(new_bus);
if (err) { if (err) {
printk (KERN_ERR "%s: Cannot register as MDIO bus\n", printk (KERN_ERR "%s: Cannot register as MDIO bus\n",
new_bus->name); new_bus->name);