net: phy: Add 2000base-x, 2500base-x and rxaui modes

The mv88e6390 ports 9 and 10 supports some additional PHY modes. Add
these modes to the PHY core so they can be used in the binding.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/Documentation/devicetree/bindings/net/ethernet.txt b/Documentation/devicetree/bindings/net/ethernet.txt
index 05150957ecfda1bdee82f716fc7a00c70f9aa713..3a6916909d90193d57af64ff1fd63ef9c875f3fd 100644 (file)
--- a/Documentation/devicetree/bindings/net/ethernet.txt
+++ b/Documentation/devicetree/bindings/net/ethernet.txt
@@ -29,6 +29,9 @@ The following properties are common to the Ethernet controllers:
   * "smii"
   * "xgmii"
   * "trgmii"
+  * "2000base-x",
+  * "2500base-x",
+  * "rxaui"
 - phy-connection-type: the same as "phy-mode" property but described in ePAPR;
 - phy-handle: phandle, specifies a reference to a node representing a PHY
   device; this property is described in ePAPR and so preferred;

diff --git a/include/linux/phy.h b/include/linux/phy.h
index 43474f39ef6523c5b59eee8d4adbe93ed3d62451..28ae9eafec1913c311415b16175cd584c7a0aca9 100644 (file)
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -81,6 +81,9 @@ typedef enum {
        PHY_INTERFACE_MODE_MOCA,
        PHY_INTERFACE_MODE_QSGMII,
        PHY_INTERFACE_MODE_TRGMII,
+       PHY_INTERFACE_MODE_1000BASEX,
+       PHY_INTERFACE_MODE_2500BASEX,
+       PHY_INTERFACE_MODE_RXAUI,
        PHY_INTERFACE_MODE_MAX,
 } phy_interface_t;
 
@@ -141,6 +144,12 @@ static inline const char *phy_modes(phy_interface_t interface)
                return "qsgmii";
        case PHY_INTERFACE_MODE_TRGMII:
                return "trgmii";
+       case PHY_INTERFACE_MODE_1000BASEX:
+               return "1000base-x";
+       case PHY_INTERFACE_MODE_2500BASEX:
+               return "2500base-x";
+       case PHY_INTERFACE_MODE_RXAUI:
+               return "rxaui";
        default:
                return "unknown";
        }