dts: vt8500: Update serial nodes and disable by default in SoC files

Missing aliases for uarts on vt8500, wm8505, wm8650 added.
Nodes incorrectly labelled uart@.., changed to serial@... on all SoCs.
Set each uarts default status = "disabled" as they generally don't exist.

For each board file, we only need to enable uart0 as no other uarts are
physically present on any of these boards.

Signed-off-by: Tony Prisk <linux@prisktech.co.nz>

diff --git a/arch/arm/boot/dts/vt8500-bv07.dts b/arch/arm/boot/dts/vt8500-bv07.dts
index 877b33afa7ed9182ca2b4f20597f66e26729dd3f..87f33310e2bc1fe91334509fc6f2c89dd85d63cd 100644 (file)
--- a/arch/arm/boot/dts/vt8500-bv07.dts
+++ b/arch/arm/boot/dts/vt8500-bv07.dts
@@ -30,3 +30,7 @@
                };
        };
 };
+
+&uart0 {
+       status = "okay";
+};

diff --git a/arch/arm/boot/dts/vt8500.dtsi b/arch/arm/boot/dts/vt8500.dtsi
index a0b490d5151969dc1d12959a8af2f0b14f7edda3..51d0e912c8f585b1acb51edc9f47fc4270a1a988 100644 (file)
--- a/arch/arm/boot/dts/vt8500.dtsi
+++ b/arch/arm/boot/dts/vt8500.dtsi
@@ -21,6 +21,13 @@
                };
        };
 
+       aliases {
+               serial0 = &uart0;
+               serial1 = &uart1;
+               serial2 = &uart2;
+               serial3 = &uart3;
+       };
+
        soc {
                #address-cells = <1>;
                #size-cells = <1>;
@@ -121,32 +128,36 @@
                        reg = <0xd8050400 0x100>;
                };
 
-               uart@d8200000 {
+               uart0: serial@d8200000 {
                        compatible = "via,vt8500-uart";
                        reg = <0xd8200000 0x1040>;
                        interrupts = <32>;
                        clocks = <&clkuart0>;
+                       status = "disabled";
                };
 
-               uart@d82b0000 {
+               uart1: serial@d82b0000 {
                        compatible = "via,vt8500-uart";
                        reg = <0xd82b0000 0x1040>;
                        interrupts = <33>;
                        clocks = <&clkuart1>;
+                       status = "disabled";
                };
 
-               uart@d8210000 {
+               uart2: serial@d8210000 {
                        compatible = "via,vt8500-uart";
                        reg = <0xd8210000 0x1040>;
                        interrupts = <47>;
                        clocks = <&clkuart2>;
+                       status = "disabled";
                };
 
-               uart@d82c0000 {
+               uart3: serial@d82c0000 {
                        compatible = "via,vt8500-uart";
                        reg = <0xd82c0000 0x1040>;
                        interrupts = <50>;
                        clocks = <&clkuart3>;
+                       status = "disabled";
                };
 
                rtc@d8100000 {

diff --git a/arch/arm/boot/dts/wm8505-ref.dts b/arch/arm/boot/dts/wm8505-ref.dts
index edd2cec3d37f6b801335af4361560a2cecc1bb6b..e3e6b9eb09d02f9c0cb237dea44ea864b076cd57 100644 (file)
--- a/arch/arm/boot/dts/wm8505-ref.dts
+++ b/arch/arm/boot/dts/wm8505-ref.dts
@@ -30,3 +30,7 @@
                };
        };
 };
+
+&uart0 {
+       status = "okay";
+};

diff --git a/arch/arm/boot/dts/wm8505.dtsi b/arch/arm/boot/dts/wm8505.dtsi
index 35d9ead79513988a6af39b41337f27102f17d1d3..060b5fca2c16e115561f14de67531decfe0d008e 100644 (file)
--- a/arch/arm/boot/dts/wm8505.dtsi
+++ b/arch/arm/boot/dts/wm8505.dtsi
@@ -21,6 +21,15 @@
                };
        };
 
+       aliases {
+               serial0 = &uart0;
+               serial1 = &uart1;
+               serial2 = &uart2;
+               serial3 = &uart3;
+               serial4 = &uart4;
+               serial5 = &uart5;
+       };
+
        soc {
                #address-cells = <1>;
                #size-cells = <1>;
@@ -167,46 +176,52 @@
                        reg = <0xd8050400 0x100>;
                };
 
-               uart@d8200000 {
+               uart0: serial@d8200000 {
                        compatible = "via,vt8500-uart";
                        reg = <0xd8200000 0x1040>;
                        interrupts = <32>;
                        clocks = <&clkuart0>;
+                       status = "disabled";
                };
 
-               uart@d82b0000 {
+               uart1: serial@d82b0000 {
                        compatible = "via,vt8500-uart";
                        reg = <0xd82b0000 0x1040>;
                        interrupts = <33>;
                        clocks = <&clkuart1>;
+                       status = "disabled";
                };
 
-               uart@d8210000 {
+               uart2: serial@d8210000 {
                        compatible = "via,vt8500-uart";
                        reg = <0xd8210000 0x1040>;
                        interrupts = <47>;
                        clocks = <&clkuart2>;
+                       status = "disabled";
                };
 
-               uart@d82c0000 {
+               uart3: serial@d82c0000 {
                        compatible = "via,vt8500-uart";
                        reg = <0xd82c0000 0x1040>;
                        interrupts = <50>;
                        clocks = <&clkuart3>;
+                       status = "disabled";
                };
 
-               uart@d8370000 {
+               uart4: serial@d8370000 {
                        compatible = "via,vt8500-uart";
                        reg = <0xd8370000 0x1040>;
                        interrupts = <31>;
                        clocks = <&clkuart4>;
+                       status = "disabled";
                };
 
-               uart@d8380000 {
+               uart5: serial@d8380000 {
                        compatible = "via,vt8500-uart";
                        reg = <0xd8380000 0x1040>;
                        interrupts = <30>;
                        clocks = <&clkuart5>;
+                       status = "disabled";
                };
 
                rtc@d8100000 {

diff --git a/arch/arm/boot/dts/wm8650-mid.dts b/arch/arm/boot/dts/wm8650-mid.dts
index 61671a0d9edec507422bbf27fbf51bf5c908f2f6..dd0d1b6023886bb7ba23910334fa4260432c36af 100644 (file)
--- a/arch/arm/boot/dts/wm8650-mid.dts
+++ b/arch/arm/boot/dts/wm8650-mid.dts
@@ -32,3 +32,6 @@
        };
 };
 
+&uart0 {
+       status = "okay";
+};

diff --git a/arch/arm/boot/dts/wm8650.dtsi b/arch/arm/boot/dts/wm8650.dtsi
index 7dce5c18615cb0a6d99535a5a28144c48dd29dbf..4fdae5ce4dfb6609ea4b5e20b8c9419b299116a3 100644 (file)
--- a/arch/arm/boot/dts/wm8650.dtsi
+++ b/arch/arm/boot/dts/wm8650.dtsi
@@ -21,6 +21,11 @@
                };
        };
 
+       aliases {
+               serial0 = &uart0;
+               serial1 = &uart1;
+       };
+
        soc {
                #address-cells = <1>;
                #size-cells = <1>;
@@ -150,18 +155,20 @@
                        reg = <0xd8050400 0x100>;
                };
 
-               uart@d8200000 {
+               uart0: serial@d8200000 {
                        compatible = "via,vt8500-uart";
                        reg = <0xd8200000 0x1040>;
                        interrupts = <32>;
                        clocks = <&clkuart0>;
+                       status = "disabled";
                };
 
-               uart@d82b0000 {
+               uart1: serial@d82b0000 {
                        compatible = "via,vt8500-uart";
                        reg = <0xd82b0000 0x1040>;
                        interrupts = <33>;
                        clocks = <&clkuart1>;
+                       status = "disabled";
                };
 
                rtc@d8100000 {

diff --git a/arch/arm/boot/dts/wm8750-apc8750.dts b/arch/arm/boot/dts/wm8750-apc8750.dts
index 62675eba966619a853ec08a748239f9e89fd7275..37e4a408bf395ce0a8b5c600509344e0ea60c7ea 100644 (file)
--- a/arch/arm/boot/dts/wm8750-apc8750.dts
+++ b/arch/arm/boot/dts/wm8750-apc8750.dts
@@ -24,3 +24,7 @@
                wm,pull = <2>;  /* pull-up */
        };
 };
+
+&uart0 {
+       status = "okay";
+};

diff --git a/arch/arm/boot/dts/wm8750.dtsi b/arch/arm/boot/dts/wm8750.dtsi
index 462de589a2febbd18c77ca00ac0c2898bee51353..e4a1e8553e30df4f704e80f141ae6b6ac0a39b0f 100644 (file)
--- a/arch/arm/boot/dts/wm8750.dtsi
+++ b/arch/arm/boot/dts/wm8750.dtsi
@@ -258,46 +258,52 @@
                        interrupts = <26>;
                };
 
-               uart0: uart@d8200000 {
+               uart0: serial@d8200000 {
                        compatible = "via,vt8500-uart";
                        reg = <0xd8200000 0x1040>;
                        interrupts = <32>;
                        clocks = <&clkuart0>;
+                       status = "disabled";
                };
 
-               uart1: uart@d82b0000 {
+               uart1: serial@d82b0000 {
                        compatible = "via,vt8500-uart";
                        reg = <0xd82b0000 0x1040>;
                        interrupts = <33>;
                        clocks = <&clkuart1>;
+                       status = "disabled";
                };
 
-                uart2: uart@d8210000 {
+                uart2: serial@d8210000 {
                         compatible = "via,vt8500-uart";
                         reg = <0xd8210000 0x1040>;
                         interrupts = <47>;
                         clocks = <&clkuart2>;
+                       status = "disabled";
                 };
 
-                uart3: uart@d82c0000 {
+                uart3: serial@d82c0000 {
                         compatible = "via,vt8500-uart";
                         reg = <0xd82c0000 0x1040>;
                         interrupts = <50>;
                         clocks = <&clkuart3>;
+                       status = "disabled";
                 };
 
-                uart4: uart@d8370000 {
+                uart4: serial@d8370000 {
                         compatible = "via,vt8500-uart";
                         reg = <0xd8370000 0x1040>;
                         interrupts = <30>;
                         clocks = <&clkuart4>;
+                       status = "disabled";
                 };
 
-                uart5: uart@d8380000 {
+                uart5: serial@d8380000 {
                         compatible = "via,vt8500-uart";
                         reg = <0xd8380000 0x1040>;
                         interrupts = <43>;
                         clocks = <&clkuart5>;
+                       status = "disabled";
                 };
 
                rtc@d8100000 {

diff --git a/arch/arm/boot/dts/wm8850-w70v2.dts b/arch/arm/boot/dts/wm8850-w70v2.dts
index 32d22532cd6c1f2c4490c05d159358ce131651cc..90e913fb64be39c62c34b1e18f975333510a3758 100644 (file)
--- a/arch/arm/boot/dts/wm8850-w70v2.dts
+++ b/arch/arm/boot/dts/wm8850-w70v2.dts
@@ -41,3 +41,7 @@
                };
        };
 };
+
+&uart0 {
+       status = "okay";
+};

diff --git a/arch/arm/boot/dts/wm8850.dtsi b/arch/arm/boot/dts/wm8850.dtsi
index 3aa1315389358a502ba2fab523de372e9da30b1a..fc60e320458998dedaad87a884088f9284e5055d 100644 (file)
--- a/arch/arm/boot/dts/wm8850.dtsi
+++ b/arch/arm/boot/dts/wm8850.dtsi
@@ -189,32 +189,36 @@
                        interrupts = <26>;
                };
 
-               uart0: uart@d8200000 {
+               uart0: serial@d8200000 {
                        compatible = "via,vt8500-uart";
                        reg = <0xd8200000 0x1040>;
                        interrupts = <32>;
                        clocks = <&clkuart0>;
+                       status = "disabled";
                };
 
-               uart1: uart@d82b0000 {
+               uart1: serial@d82b0000 {
                        compatible = "via,vt8500-uart";
                        reg = <0xd82b0000 0x1040>;
                        interrupts = <33>;
                        clocks = <&clkuart1>;
+                       status = "disabled";
                };
 
-                uart2: uart@d8210000 {
+                uart2: serial@d8210000 {
                         compatible = "via,vt8500-uart";
                         reg = <0xd8210000 0x1040>;
                         interrupts = <47>;
                         clocks = <&clkuart2>;
+                       status = "disabled";
                 };
 
-                uart3: uart@d82c0000 {
+                uart3: serial@d82c0000 {
                         compatible = "via,vt8500-uart";
                         reg = <0xd82c0000 0x1040>;
                         interrupts = <50>;
                         clocks = <&clkuart3>;
+                       status = "disabled";
                 };
 
                rtc@d8100000 {