Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 324931ba authored by Grant Likely's avatar Grant Likely Committed by David S. Miller
Browse files

net: rework fsl_pq_mdio driver to use of_mdio infrastructure 



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

Tested on Freescale MPC8349emitxgp eval board

Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Acked-by: default avatarAndy Fleming <afleming@freescale.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ca816d98

drivers/net/fsl_pq_mdio.c

+3 −48
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include <linux/mii.h>

#include <linux/phy.h>

#include <linux/of.h>

#include <linux/of_mdio.h>

#include <linux/of_platform.h>



#include <asm/io.h>
@@ -154,44 +155,6 @@ static int fsl_pq_mdio_reset(struct mii_bus *bus) 
	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)

{

	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->irq = create_irq_map(np);

	new_bus->irq = kcalloc(PHY_MAX_ADDR, sizeof(int), GFP_KERNEL);



	if (NULL == new_bus->irq) {

		err = -ENOMEM;
@@ -384,15 +347,7 @@ static int fsl_pq_mdio_probe(struct of_device *ofdev, 


	out_be32(tbipa, tbiaddr);



	/*

	 * 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);



	err = of_mdiobus_register(new_bus, np);

	if (err) {

		printk (KERN_ERR "%s: Cannot register as MDIO bus\n",

				new_bus->name);