From 4157ef1b8779b34581ee8b9dc8f7f95188008eca Mon Sep 17 00:00:00 2001 From: Shawn Guo Date: Tue, 5 Jul 2011 16:42:09 +0800 Subject: net: ibm_newemac: convert it to use of_get_phy_mode The patch extends 'enum phy_interface_t' and of_get_phy_mode a little bit with PHY_INTERFACE_MODE_NA and PHY_INTERFACE_MODE_SMII added, and then converts ibm_newemac net driver to use of_get_phy_mode getting phy mode from device tree. It also resolves the namespace conflict on phy_read/write between common mdiobus interface and ibm_newemac private one. Signed-off-by: Shawn Guo Cc: David S. Miller Cc: Grant Likely Acked-by: Grant Likely Acked-by: David Miller --- drivers/of/of_net.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'drivers/of/of_net.c') diff --git a/drivers/of/of_net.c b/drivers/of/of_net.c index cc117db0589..bb184717588 100644 --- a/drivers/of/of_net.c +++ b/drivers/of/of_net.c @@ -16,6 +16,7 @@ * device driver can get phy interface from device tree. */ static const char *phy_modes[] = { + [PHY_INTERFACE_MODE_NA] = "", [PHY_INTERFACE_MODE_MII] = "mii", [PHY_INTERFACE_MODE_GMII] = "gmii", [PHY_INTERFACE_MODE_SGMII] = "sgmii", @@ -26,6 +27,7 @@ static const char *phy_modes[] = { [PHY_INTERFACE_MODE_RGMII_RXID] = "rgmii-rxid", [PHY_INTERFACE_MODE_RGMII_TXID] = "rgmii-txid", [PHY_INTERFACE_MODE_RTBI] = "rtbi", + [PHY_INTERFACE_MODE_SMII] = "smii", }; /** -- cgit v1.2.3-70-g09d2