Merge tag 'mips_4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux

[uclinux-h8/linux.git] / arch / mips / boot / dts / mscc / ocelot.dtsi

diff --git a/arch/mips/boot/dts/mscc/ocelot.dtsi b/arch/mips/boot/dts/mscc/ocelot.dtsi
index 99a9e85..90c60d4 100644 (file)
--- a/arch/mips/boot/dts/mscc/ocelot.dtsi
+++ b/arch/mips/boot/dts/mscc/ocelot.dtsi
@@ -120,7 +120,6 @@
                        reg = <0x1010000 0x10000>,
                              <0x1030000 0x10000>,
                              <0x1080000 0x100>,
-                             <0x10d0000 0x10000>,
                              <0x11e0000 0x100>,
                              <0x11f0000 0x100>,
                              <0x1200000 0x100>,
@@ -134,10 +133,10 @@
                              <0x1280000 0x100>,
                              <0x1800000 0x80000>,
                              <0x1880000 0x10000>;
-                       reg-names = "sys", "rew", "qs", "hsio", "port0",
-                                   "port1", "port2", "port3", "port4", "port5",
-                                   "port6", "port7", "port8", "port9", "port10",
-                                   "qsys", "ana";
+                       reg-names = "sys", "rew", "qs", "port0", "port1",
+                                   "port2", "port3", "port4", "port5", "port6",
+                                   "port7", "port8", "port9", "port10", "qsys",
+                                   "ana";
                        interrupts = <21 22>;
                        interrupt-names = "xtr", "inj";
 
@@ -250,5 +249,15 @@
                        pinctrl-0 = <&miim1>;
                        status = "disabled";
                };
+
+               hsio: syscon@10d0000 {
+                       compatible = "mscc,ocelot-hsio", "syscon", "simple-mfd";
+                       reg = <0x10d0000 0x10000>;
+
+                       serdes: serdes {
+                               compatible = "mscc,vsc7514-serdes";
+                               #phy-cells = <2>;
+                       };
+               };
        };
 };