phy: fixed_phy: Add gpio to determine link up/down.

An SFP module may have a link up/down status pin which can be
connection to a GPIO line of the host. Add support for reading such an
GPIO in the fixed_phy driver.

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/fixed-link.txt b/Documentation/devicetree/bindings/net/fixed-link.txt
index 82bf7e0..ec5d889 100644 (file)
--- a/Documentation/devicetree/bindings/net/fixed-link.txt
+++ b/Documentation/devicetree/bindings/net/fixed-link.txt
@@ -17,6 +17,8 @@ properties:
   enabled.
 * 'asym-pause' (boolean, optional), to indicate that asym_pause should
   be enabled.
+* 'link-gpios' ('gpio-list', optional), to indicate if a gpio can be read
+  to determine if the link is up.
 
 Old, deprecated 'fixed-link' binding:
 
@@ -30,7 +32,7 @@ Old, deprecated 'fixed-link' binding:
   - e: asymmetric pause configuration: 0 for no asymmetric pause, 1 for
     asymmetric pause
 
-Example:
+Examples:
 
 ethernet@0 {
        ...
@@ -40,3 +42,13 @@ ethernet@0 {
        };
        ...
 };
+
+ethernet@1 {
+       ...
+       fixed-link {
+             speed = <1000>;
+             pause;
+             link-gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
+       };
+       ...
+};

diff --cc Documentation/networking/stmmac.txt
Simple merge

diff --cc arch/m68k/coldfire/m5272.c
Simple merge

diff --cc arch/mips/ar7/platform.c
Simple merge

diff --cc arch/mips/bcm47xx/setup.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/genet/bcmmii.c
Simple merge

diff --cc drivers/net/phy/fixed_phy.c
Simple merge

diff --cc drivers/of/of_mdio.c
Simple merge

diff --cc include/linux/phy_fixed.h
Simple merge