Merge tag 'ipvs-for-v4.18' of http://git.kernel.org/pub/scm/linux/kernel/git/horms...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / aspeed-g5.dtsi

diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi
index 2477ebc11d9db4dfdd62fe09fcdf6a00c9f80161..f9917717dd088faa33227177ceca19d822ae632f 100644 (file)
--- a/arch/arm/boot/dts/aspeed-g5.dtsi
+++ b/arch/arm/boot/dts/aspeed-g5.dtsi
@@ -210,6 +210,7 @@
                                reg-shift = <2>;
                                interrupts = <9>;
                                clocks = <&syscon ASPEED_CLK_GATE_UART1CLK>;
+                               resets = <&lpc_reset 4>;
                                no-loopback-test;
                                status = "disabled";
                        };
@@ -269,7 +270,7 @@
 
                                #address-cells = <1>;
                                #size-cells = <1>;
-                               ranges = <0 0x1e789000 0x1000>;
+                               ranges = <0x0 0x1e789000 0x1000>;
 
                                lpc_bmc: lpc-bmc@0 {
                                        compatible = "aspeed,ast2500-lpc-bmc";
@@ -279,16 +280,16 @@
                                lpc_host: lpc-host@80 {
                                        compatible = "aspeed,ast2500-lpc-host", "simple-mfd", "syscon";
                                        reg = <0x80 0x1e0>;
+                                       reg-io-width = <4>;
 
                                        #address-cells = <1>;
                                        #size-cells = <1>;
-                                       ranges = <0 0x80 0x1e0>;
-
-                                       reg-io-width = <4>;
+                                       ranges = <0x0 0x80 0x1e0>;
 
                                        lpc_ctrl: lpc-ctrl@0 {
                                                compatible = "aspeed,ast2500-lpc-ctrl";
                                                reg = <0x0 0x80>;
+                                               clocks = <&syscon ASPEED_CLK_GATE_LCLK>;
                                                status = "disabled";
                                        };
 
@@ -303,6 +304,19 @@
                                                compatible = "aspeed,ast2500-lhc";
                                                reg = <0x20 0x24 0x48 0x8>;
                                        };
+
+                                       lpc_reset: reset-controller@18 {
+                                               compatible = "aspeed,ast2500-lpc-reset";
+                                               reg = <0x18 0x4>;
+                                               #reset-cells = <1>;
+                                       };
+
+                                       ibt: ibt@c0 {
+                                               compatible = "aspeed,ast2500-ibt-bmc";
+                                               reg = <0xc0 0x18>;
+                                               interrupts = <8>;
+                                               status = "disabled";
+                                       };
                                };
                        };
 
@@ -312,6 +326,7 @@
                                reg-shift = <2>;
                                interrupts = <32>;
                                clocks = <&syscon ASPEED_CLK_GATE_UART2CLK>;
+                               resets = <&lpc_reset 5>;
                                no-loopback-test;
                                status = "disabled";
                        };
@@ -322,6 +337,7 @@
                                reg-shift = <2>;
                                interrupts = <33>;
                                clocks = <&syscon ASPEED_CLK_GATE_UART3CLK>;
+                               resets = <&lpc_reset 6>;
                                no-loopback-test;
                                status = "disabled";
                        };
@@ -332,6 +348,7 @@
                                reg-shift = <2>;
                                interrupts = <34>;
                                clocks = <&syscon ASPEED_CLK_GATE_UART4CLK>;
+                               resets = <&lpc_reset 7>;
                                no-loopback-test;
                                status = "disabled";
                        };