Merge tag 'ib-mfd-regulator-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd into regulator-tps65090

Immutable branch between MFD and Regulator due for v3.16 merge-window.

1 files changed, 3 insertions, 0 deletions

diff --git a/include/linux/phy.h b/include/linux/phy.h
index 24126c4b27b5..4d0221fd0688 100644
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -75,6 +75,7 @@ typedef enum {
         PHY_INTERFACE_MODE_SMII,
         PHY_INTERFACE_MODE_XGMII,
         PHY_INTERFACE_MODE_MOCA,
+        PHY_INTERFACE_MODE_QSGMII,
         PHY_INTERFACE_MODE_MAX,
 } phy_interface_t;
 
@@ -116,6 +117,8 @@ static inline const char *phy_modes(phy_interface_t interface)
                 return "xgmii";
         case PHY_INTERFACE_MODE_MOCA:
                 return "moca";
+        case PHY_INTERFACE_MODE_QSGMII:
+                return "qsgmii";
         default:
                 return "unknown";
         }