diff options
author | Shawn Guo <shawn.guo@linaro.org> | 2011-07-05 04:42:09 -0400 |
---|---|---|
committer | Shawn Guo <shawn.guo@linaro.org> | 2011-07-26 21:31:02 -0400 |
commit | 4157ef1b8779b34581ee8b9dc8f7f95188008eca (patch) | |
tree | 6be8331bc24c59d9fea27a256a681c570c3dfdee /include/linux/phy.h | |
parent | 6ca1a113791eb09dac8c48b2b264c4d72aab410f (diff) |
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 'include/linux/phy.h')
-rw-r--r-- | include/linux/phy.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/phy.h b/include/linux/phy.h index ad5186354d92..54fc4138955f 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h | |||
@@ -53,6 +53,7 @@ | |||
53 | 53 | ||
54 | /* Interface Mode definitions */ | 54 | /* Interface Mode definitions */ |
55 | typedef enum { | 55 | typedef enum { |
56 | PHY_INTERFACE_MODE_NA, | ||
56 | PHY_INTERFACE_MODE_MII, | 57 | PHY_INTERFACE_MODE_MII, |
57 | PHY_INTERFACE_MODE_GMII, | 58 | PHY_INTERFACE_MODE_GMII, |
58 | PHY_INTERFACE_MODE_SGMII, | 59 | PHY_INTERFACE_MODE_SGMII, |
@@ -62,7 +63,8 @@ typedef enum { | |||
62 | PHY_INTERFACE_MODE_RGMII_ID, | 63 | PHY_INTERFACE_MODE_RGMII_ID, |
63 | PHY_INTERFACE_MODE_RGMII_RXID, | 64 | PHY_INTERFACE_MODE_RGMII_RXID, |
64 | PHY_INTERFACE_MODE_RGMII_TXID, | 65 | PHY_INTERFACE_MODE_RGMII_TXID, |
65 | PHY_INTERFACE_MODE_RTBI | 66 | PHY_INTERFACE_MODE_RTBI, |
67 | PHY_INTERFACE_MODE_SMII, | ||
66 | } phy_interface_t; | 68 | } phy_interface_t; |
67 | 69 | ||
68 | 70 | ||