Merge tag 'armsoc-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[cascardo/linux.git] / arch / arm64 / boot / dts / apm / apm-storm.dtsi

diff --git a/arch/arm64/boot/dts/apm/apm-storm.dtsi b/arch/arm64/boot/dts/apm/apm-storm.dtsi
index 91c73b8..f1c2c71 100644 (file)
--- a/arch/arm64/boot/dts/apm/apm-storm.dtsi
+++ b/arch/arm64/boot/dts/apm/apm-storm.dtsi
@@ -227,20 +227,11 @@
                                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>;
@@ -911,6 +902,14 @@
                        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";
@@ -924,7 +923,7 @@
                        /* 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>;
@@ -950,6 +949,7 @@
                        clocks = <&sge0clk 0>;
                        local-mac-address = [00 00 00 00 00 00];
                        phy-connection-type = "sgmii";
+                       phy-handle = <&sgenet0phy>;
                };
 
                sgenet1: ethernet@1f210030 {
@@ -963,9 +963,9 @@
                                     <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 {