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

Commit 4d3248a2 authored by Kumar Gala's avatar Kumar Gala Committed by Jeff Garzik
Browse files

[PATCH] gianfar: Use new PHY_ID_FMT macro 



Make the driver produce the string used by phy_connect and have board specific
code pass the integer mii bus id and phy device id for the specific controller
instance.

Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent a4d00f17

drivers/net/gianfar.c

+4 −1
Original line number Diff line number Diff line
@@ -399,12 +399,15 @@ static int init_phy(struct net_device *dev) 
		priv->einfo->device_flags & FSL_GIANFAR_DEV_HAS_GIGABIT ?

		SUPPORTED_1000baseT_Full : 0;

	struct phy_device *phydev;

	char phy_id[BUS_ID_SIZE];



	priv->oldlink = 0;

	priv->oldspeed = 0;

	priv->oldduplex = -1;



	phydev = phy_connect(dev, priv->einfo->bus_id, &adjust_link, 0);

	snprintf(phy_id, BUS_ID_SIZE, PHY_ID_FMT, priv->einfo->bus_id, priv->einfo->phy_id);



	phydev = phy_connect(dev, phy_id, &adjust_link, 0);



	if (IS_ERR(phydev)) {

		printk(KERN_ERR "%s: Could not attach to PHY\n", dev->name);

include/linux/fsl_devices.h

+2 −1
Original line number Diff line number Diff line
@@ -50,7 +50,8 @@ struct gianfar_platform_data { 


	/* board specific information */

	u32 board_flags;

	const char *bus_id;

	u32 bus_id;

	u32 phy_id;

	u8 mac_addr[6];

};