summaryrefslogtreecommitdiff
path: root/drivers/of
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2011-07-05 16:42:09 +0800
committerShawn Guo <shawn.guo@linaro.org>2011-07-27 09:31:02 +0800
commit4157ef1b8779b34581ee8b9dc8f7f95188008eca (patch)
tree6be8331bc24c59d9fea27a256a681c570c3dfdee /drivers/of
parent6ca1a113791eb09dac8c48b2b264c4d72aab410f (diff)
downloadlinux-3.10-4157ef1b8779b34581ee8b9dc8f7f95188008eca.tar.gz
linux-3.10-4157ef1b8779b34581ee8b9dc8f7f95188008eca.tar.bz2
linux-3.10-4157ef1b8779b34581ee8b9dc8f7f95188008eca.zip
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 <shawn.guo@linaro.org> Cc: David S. Miller <davem@davemloft.net> Cc: Grant Likely <grant.likely@secretlab.ca> Acked-by: Grant Likely <grant.likely@secretlab.ca> Acked-by: David Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/of')
-rw-r--r--drivers/of/of_net.c2
1 files changed, 2 insertions, 0 deletions
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",
};
/**