Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

[PATCH] gianfar: Use new PHY_ID_FMT macro

Browse source 
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: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
This commit is contained in:
Kumar Gala 2006-01-11 11:27:33 -08:00 committed by Jeff Garzik
parent a4d00f179f
commit 4d3248a29c
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/net/gianfar.c
View file

@ -399,12 +399,15 @@ static int init_phy(struct net_device *dev)
priv->einfo->device_flags & FSL_GIANFAR_DEV_HAS_GIGABIT ? priv->einfo->device_flags & FSL_GIANFAR_DEV_HAS_GIGABIT ?
SUPPORTED_1000baseT_Full : 0; SUPPORTED_1000baseT_Full : 0;
struct phy_device *phydev; struct phy_device *phydev;
char phy_id[BUS_ID_SIZE];
priv->oldlink = 0; priv->oldlink = 0;
priv->oldspeed = 0; priv->oldspeed = 0;
priv->oldduplex = -1; 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)) { if (IS_ERR(phydev)) {
printk(KERN_ERR "%s: Could not attach to PHY\n", dev->name); printk(KERN_ERR "%s: Could not attach to PHY\n", dev->name);

3
include/linux/fsl_devices.h
View file

@ -50,7 +50,8 @@ struct gianfar_platform_data {
/* board specific information */ /* board specific information */
u32 board_flags; u32 board_flags;
const char *bus_id; u32 bus_id;
u32 phy_id;
u8 mac_addr[6]; u8 mac_addr[6];
}; };