summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2017-06-23 15:06:44 -0400
committerDavid S. Miller <davem@davemloft.net>2017-06-23 15:06:44 -0400
commitcf3db45dc1bedd628bae363a0d32d4ee11b4d9dd (patch)
tree799a1e47b219515bde555e0a269e448bd258c84d /include
parentd4d0249ae28a6d62647a894051634bb87c9b5953 (diff)
parentbedd00c81b30a7c5f1fbe144f2db9c9864073b27 (diff)
downloadlinux-cf3db45dc1bedd628bae363a0d32d4ee11b4d9dd.tar.gz
linux-cf3db45dc1bedd628bae363a0d32d4ee11b4d9dd.tar.bz2
linux-cf3db45dc1bedd628bae363a0d32d4ee11b4d9dd.zip
Merge branch 'phy-internal'
Florian Fainelli says: ==================== net: phy: Support "internal" PHY interface This makes the "internal" phy-mode property generally available and documented and this allows us to remove some custom parsing code we had for bcmgenet and bcm_sf2 which both used that specific value. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r--include/linux/phy.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/phy.h b/include/linux/phy.h
index 23d2e46dd322..1d8d70193782 100644
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -64,6 +64,7 @@
/* Interface Mode definitions */
typedef enum {
PHY_INTERFACE_MODE_NA,
+ PHY_INTERFACE_MODE_INTERNAL,
PHY_INTERFACE_MODE_MII,
PHY_INTERFACE_MODE_GMII,
PHY_INTERFACE_MODE_SGMII,
@@ -114,6 +115,8 @@ static inline const char *phy_modes(phy_interface_t interface)
switch (interface) {
case PHY_INTERFACE_MODE_NA:
return "";
+ case PHY_INTERFACE_MODE_INTERNAL:
+ return "internal";
case PHY_INTERFACE_MODE_MII:
return "mii";
case PHY_INTERFACE_MODE_GMII: