ARM: dts: aspeed: Add LPC and child devices

Ensure the ordering is correct and add all of the children in the SoC
device trees for the ast2400 and ast2500.

Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: Joel Stanley <joel@jms.id.au>

diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi
index 45d815a86d420b9f8f108919bb846f865f9b5231..9422f9cb1e11dea90cdad327044142006baf39b9 100644 (file)
--- a/arch/arm/boot/dts/aspeed-g4.dtsi
+++ b/arch/arm/boot/dts/aspeed-g4.dtsi
@@ -225,6 +225,41 @@ vuart: serial@1e787000 {
                                status = "disabled";
                        };
 
+                       lpc: lpc@1e789000 {
+                               compatible = "aspeed,ast2400-lpc", "simple-mfd";
+                               reg = <0x1e789000 0x1000>;
+
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+                               ranges = <0x0 0x1e789000 0x1000>;
+
+                               lpc_bmc: lpc-bmc@0 {
+                                       compatible = "aspeed,ast2400-lpc-bmc";
+                                       reg = <0x0 0x80>;
+                               };
+
+                               lpc_host: lpc-host@80 {
+                                       compatible = "aspeed,ast2400-lpc-host", "simple-mfd", "syscon";
+                                       reg = <0x80 0x1e0>;
+                                       reg-io-width = <4>;
+
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+                                       ranges = <0x0 0x80 0x1e0>;
+
+                                       lpc_ctrl: lpc-ctrl@0 {
+                                               compatible = "aspeed,ast2400-lpc-ctrl";
+                                               reg = <0x0 0x80>;
+                                               status = "disabled";
+                                       };
+
+                                       lhc: lhc@20 {
+                                               compatible = "aspeed,ast2400-lhc";
+                                               reg = <0x20 0x24 0x48 0x8>;
+                                       };
+                               };
+                       };
+
                        uart2: serial@1e78d000 {
                                compatible = "ns16550a";
                                reg = <0x1e78d000 0x20>;

diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi
index 5c4ecdba3a6bc2e2d4ed5d669dcc116327e986e0..069f13df19d12852de962778a81a27ee3aec151f 100644 (file)
--- a/arch/arm/boot/dts/aspeed-g5.dtsi
+++ b/arch/arm/boot/dts/aspeed-g5.dtsi
@@ -265,6 +265,16 @@ wdt3: watchdog@1e785040 {
                                status = "disabled";
                        };
 
+                       vuart: serial@1e787000 {
+                               compatible = "aspeed,ast2500-vuart";
+                               reg = <0x1e787000 0x40>;
+                               reg-shift = <2>;
+                               interrupts = <10>;
+                               clocks = <&clk_uart>;
+                               no-loopback-test;
+                               status = "disabled";
+                       };
+
                        lpc: lpc@1e789000 {
                                compatible = "aspeed,ast2500-lpc", "simple-mfd";
                                reg = <0x1e789000 0x1000>;
@@ -288,6 +298,13 @@ lpc_host: lpc-host@80 {
 
                                        reg-io-width = <4>;
 
+                                       lpc_ctrl: lpc-ctrl@0 {
+                                               compatible = "aspeed,ast2500-lpc-ctrl";
+                                               reg = <0x0 0x80>;
+                                               status = "disabled";
+                                       };
+
+
                                        lhc: lhc@20 {
                                                compatible = "aspeed,ast2500-lhc";
                                                reg = <0x20 0x24 0x48 0x8>;
@@ -295,16 +312,6 @@ lhc: lhc@20 {
                                };
                        };
 
-                       vuart: serial@1e787000 {
-                               compatible = "aspeed,ast2500-vuart";
-                               reg = <0x1e787000 0x40>;
-                               reg-shift = <2>;
-                               interrupts = <10>;
-                               clocks = <&clk_uart>;
-                               no-loopback-test;
-                               status = "disabled";
-                       };
-
                        uart2: serial@1e78d000 {
                                compatible = "ns16550a";
                                reg = <0x1e78d000 0x20>;