ARM: dts: aspeed: Clean up UART nodes

- Shorten size of reg property so it covers only the implemented
 registers

 - Add VUART compatible, and change node name to serial@

 - Remove outdated current-speed property. Different bootloaders use
 different speeds, so this is no longer helpful

Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
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 4125e07f22f9f681215ff407b0f1ee8ae8639fa1..e455bd236798258f64213ca61bef23338ac88391 100644 (file)
--- a/arch/arm/boot/dts/aspeed-g4.dtsi
+++ b/arch/arm/boot/dts/aspeed-g4.dtsi
@@ -27,6 +27,7 @@ aliases {
                serial2 = &uart3;
                serial3 = &uart4;
                serial4 = &uart5;
+               serial5 = &vuart;
        };
 
        cpus {
@@ -185,7 +186,7 @@ timer: timer@1e782000 {
 
                        uart1: serial@1e783000 {
                                compatible = "ns16550a";
-                               reg = <0x1e783000 0x1000>;
+                               reg = <0x1e783000 0x20>;
                                reg-shift = <2>;
                                interrupts = <9>;
                                clocks = <&clk_uart>;
@@ -195,11 +196,10 @@ uart1: serial@1e783000 {
 
                        uart5: serial@1e784000 {
                                compatible = "ns16550a";
-                               reg = <0x1e784000 0x1000>;
+                               reg = <0x1e784000 0x20>;
                                reg-shift = <2>;
                                interrupts = <10>;
                                clocks = <&clk_uart>;
-                               current-speed = <38400>;
                                no-loopback-test;
                                status = "disabled";
                        };
@@ -218,9 +218,9 @@ wdt2: wdt@1e785020 {
                                status = "disabled";
                        };
 
-                       uart6: serial@1e787000 {
-                               compatible = "ns16550a";
-                               reg = <0x1e787000 0x1000>;
+                       vuart: serial@1e787000 {
+                               compatible = "aspeed,ast2400-vuart";
+                               reg = <0x1e787000 0x40>;
                                reg-shift = <2>;
                                interrupts = <10>;
                                clocks = <&clk_uart>;
@@ -230,7 +230,7 @@ uart6: serial@1e787000 {
 
                        uart2: serial@1e78d000 {
                                compatible = "ns16550a";
-                               reg = <0x1e78d000 0x1000>;
+                               reg = <0x1e78d000 0x20>;
                                reg-shift = <2>;
                                interrupts = <32>;
                                clocks = <&clk_uart>;
@@ -240,7 +240,7 @@ uart2: serial@1e78d000 {
 
                        uart3: serial@1e78e000 {
                                compatible = "ns16550a";
-                               reg = <0x1e78e000 0x1000>;
+                               reg = <0x1e78e000 0x20>;
                                reg-shift = <2>;
                                interrupts = <33>;
                                clocks = <&clk_uart>;
@@ -250,7 +250,7 @@ uart3: serial@1e78e000 {
 
                        uart4: serial@1e78f000 {
                                compatible = "ns16550a";
-                               reg = <0x1e78f000 0x1000>;
+                               reg = <0x1e78f000 0x20>;
                                reg-shift = <2>;
                                interrupts = <34>;
                                clocks = <&clk_uart>;

diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi
index 61cc2d25143a1d120e876e1a8d782115b48442fe..77dded187d5ab1a34e51196f16ae6fffe88800d4 100644 (file)
--- a/arch/arm/boot/dts/aspeed-g5.dtsi
+++ b/arch/arm/boot/dts/aspeed-g5.dtsi
@@ -27,6 +27,7 @@ aliases {
                serial2 = &uart3;
                serial3 = &uart4;
                serial4 = &uart5;
+               serial5 = &vuart;
        };
 
        cpus {
@@ -229,7 +230,7 @@ timer: timer@1e782000 {
 
                        uart1: serial@1e783000 {
                                compatible = "ns16550a";
-                               reg = <0x1e783000 0x1000>;
+                               reg = <0x1e783000 0x20>;
                                reg-shift = <2>;
                                interrupts = <9>;
                                clocks = <&clk_uart>;
@@ -239,11 +240,10 @@ uart1: serial@1e783000 {
 
                        uart5: serial@1e784000 {
                                compatible = "ns16550a";
-                               reg = <0x1e784000 0x1000>;
+                               reg = <0x1e784000 0x20>;
                                reg-shift = <2>;
                                interrupts = <10>;
                                clocks = <&clk_uart>;
-                               current-speed = <38400>;
                                no-loopback-test;
                                status = "disabled";
                        };
@@ -297,9 +297,9 @@ lhc: lhc@20 {
                                };
                        };
 
-                       uart6: serial@1e787000 {
-                               compatible = "ns16550a";
-                               reg = <0x1e787000 0x1000>;
+                       vuart: serial@1e787000 {
+                               compatible = "aspeed,ast2500-vuart";
+                               reg = <0x1e787000 0x40>;
                                reg-shift = <2>;
                                interrupts = <10>;
                                clocks = <&clk_uart>;
@@ -309,7 +309,7 @@ uart6: serial@1e787000 {
 
                        uart2: serial@1e78d000 {
                                compatible = "ns16550a";
-                               reg = <0x1e78d000 0x1000>;
+                               reg = <0x1e78d000 0x20>;
                                reg-shift = <2>;
                                interrupts = <32>;
                                clocks = <&clk_uart>;
@@ -319,7 +319,7 @@ uart2: serial@1e78d000 {
 
                        uart3: serial@1e78e000 {
                                compatible = "ns16550a";
-                               reg = <0x1e78e000 0x1000>;
+                               reg = <0x1e78e000 0x20>;
                                reg-shift = <2>;
                                interrupts = <33>;
                                clocks = <&clk_uart>;
@@ -329,7 +329,7 @@ uart3: serial@1e78e000 {
 
                        uart4: serial@1e78f000 {
                                compatible = "ns16550a";
-                               reg = <0x1e78f000 0x1000>;
+                               reg = <0x1e78f000 0x20>;
                                reg-shift = <2>;
                                interrupts = <34>;
                                clocks = <&clk_uart>;