dtb: xgene: Add MDIO node

Added mdio node for mdio driver.  Also added phy-handle
reference to the ethernet nodes.

Removed unused clock node from storm sgenet1.

Signed-off-by: Iyappan Subramanian <isubramanian@apm.com>
Tested-by: Fushen Chen <fchen@apm.com>
Tested-by: Toan Le <toanle@apm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/arch/arm64/boot/dts/apm/apm-merlin.dts b/arch/arm64/boot/dts/apm/apm-merlin.dts
index 387c6a8d0da9fb4d810b21066be6b5516fa88cc1..b0f64414c1b0c6f315b5509fb18c3e142df7a0e4 100644 (file)
--- a/arch/arm64/boot/dts/apm/apm-merlin.dts
+++ b/arch/arm64/boot/dts/apm/apm-merlin.dts
@@ -83,3 +83,9 @@ rtc68: rtc@68 {
                status = "ok";
        };
 };
+
+&mdio {
+       sgenet0phy: phy@0 {
+               reg = <0x0>;
+       };
+};

diff --git a/arch/arm64/boot/dts/apm/apm-mustang.dts b/arch/arm64/boot/dts/apm/apm-mustang.dts
index 44db32ec5e9c34802c1447592f89083617c5d78a..b7fb5d9295c2c4dd85bad0dad0b74137f8c19775 100644 (file)
--- a/arch/arm64/boot/dts/apm/apm-mustang.dts
+++ b/arch/arm64/boot/dts/apm/apm-mustang.dts
@@ -79,3 +79,15 @@ &xgenet {
 &mmc0 {
        status = "ok";
 };
+
+&mdio {
+       menet0phy: phy@3 {
+               reg = <0x3>;
+       };
+       sgenet0phy: phy@4 {
+               reg = <0x4>;
+       };
+       sgenet1phy: phy@5 {
+               reg = <0x5>;
+       };
+};

diff --git a/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi b/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi
index c569f761d0902008718c27aa1d1c9daccc7a2822..2e1e5daa1dc7a187e3d89b6746d10bc130653c80 100644 (file)
--- a/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi
+++ b/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi
@@ -625,10 +625,18 @@ sbgpio: gpio@17001000{
                        apm,irq-start = <8>;
                };
 
+               mdio: mdio@1f610000 {
+                       compatible = "apm,xgene-mdio-xfi";
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <0x0 0x1f610000 0x0 0xd100>;
+                       clocks = <&xge0clk 0>;
+               };
+
                sgenet0: ethernet@1f610000 {
                        compatible = "apm,xgene2-sgenet";
                        status = "disabled";
-                       reg = <0x0 0x1f610000 0x0 0x10000>,
+                       reg = <0x0 0x1f610000 0x0 0xd100>,
                              <0x0 0x1f600000 0x0 0Xd100>,
                              <0x0 0x20000000 0x0 0X20000>;
                        interrupts = <0 96 4>,
@@ -637,6 +645,7 @@ sgenet0: ethernet@1f610000 {
                        clocks = <&xge0clk 0>;
                        local-mac-address = [00 01 73 00 00 01];
                        phy-connection-type = "sgmii";
+                       phy-handle = <&sgenet0phy>;
                };
 
                xgenet1: ethernet@1f620000 {

diff --git a/arch/arm64/boot/dts/apm/apm-storm.dtsi b/arch/arm64/boot/dts/apm/apm-storm.dtsi
index 5147d76989241612bb242025487bbb1aa7f55aa4..6bf7cbe2e72d502d3f417290245bd4c953c53511 100644 (file)
--- a/arch/arm64/boot/dts/apm/apm-storm.dtsi
+++ b/arch/arm64/boot/dts/apm/apm-storm.dtsi
@@ -237,20 +237,11 @@ sge0clk: sge0clk@1f21c000 {
                                clocks = <&socplldiv2 0>;
                                reg = <0x0 0x1f21c000 0x0 0x1000>;
                                reg-names = "csr-reg";
-                               csr-mask = <0x3>;
+                               csr-mask = <0xa>;
+                               enable-mask = <0xf>;
                                clock-output-names = "sge0clk";
                        };
 
-                       sge1clk: sge1clk@1f21c000 {
-                               compatible = "apm,xgene-device-clock";
-                               #clock-cells = <1>;
-                               clocks = <&socplldiv2 0>;
-                               reg = <0x0 0x1f21c000 0x0 0x1000>;
-                               reg-names = "csr-reg";
-                               csr-mask = <0xc>;
-                               clock-output-names = "sge1clk";
-                       };
-
                        xge0clk: xge0clk@1f61c000 {
                                compatible = "apm,xgene-device-clock";
                                #clock-cells = <1>;
@@ -921,6 +912,14 @@ rtc: rtc@10510000 {
                        clocks = <&rtcclk 0>;
                };
 
+               mdio: mdio@17020000 {
+                       compatible = "apm,xgene-mdio-rgmii";
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <0x0 0x17020000 0x0 0xd100>;
+                       clocks = <&menetclk 0>;
+               };
+
                menet: ethernet@17020000 {
                        compatible = "apm,xgene-enet";
                        status = "disabled";
@@ -934,7 +933,7 @@ menet: ethernet@17020000 {
                        /* mac address will be overwritten by the bootloader */
                        local-mac-address = [00 00 00 00 00 00];
                        phy-connection-type = "rgmii";
-                       phy-handle = <&menetphy>;
+                       phy-handle = <&menet0phy>,<&menetphy>;
                        mdio {
                                compatible = "apm,xgene-mdio";
                                #address-cells = <1>;
@@ -960,6 +959,7 @@ sgenet0: ethernet@1f210000 {
                        clocks = <&sge0clk 0>;
                        local-mac-address = [00 00 00 00 00 00];
                        phy-connection-type = "sgmii";
+                       phy-handle = <&sgenet0phy>;
                };
 
                sgenet1: ethernet@1f210030 {
@@ -973,9 +973,9 @@ sgenet1: ethernet@1f210030 {
                                     <0x0 0xAD 0x4>;
                        port-id = <1>;
                        dma-coherent;
-                       clocks = <&sge1clk 0>;
                        local-mac-address = [00 00 00 00 00 00];
                        phy-connection-type = "sgmii";
+                       phy-handle = <&sgenet1phy>;
                };
 
                xgenet: ethernet@1f610000 {