aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Prisk <linux@prisktech.co.nz>2013-04-22 22:23:26 -0400
committerTony Prisk <linux@prisktech.co.nz>2013-05-12 04:31:13 -0400
commit55954f8522cf108e8c894130b2656516b9ae6991 (patch)
treeab834b44f2e7b1da0b5ab40f4e96d430f0c8151c
parent4606c48051db62db14756e1085fe0f8821a0e116 (diff)
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>
-rw-r--r--arch/arm/boot/dts/vt8500-bv07.dts4
-rw-r--r--arch/arm/boot/dts/vt8500.dtsi19
-rw-r--r--arch/arm/boot/dts/wm8505-ref.dts4
-rw-r--r--arch/arm/boot/dts/wm8505.dtsi27
-rw-r--r--arch/arm/boot/dts/wm8650-mid.dts3
-rw-r--r--arch/arm/boot/dts/wm8650.dtsi11
-rw-r--r--arch/arm/boot/dts/wm8750-apc8750.dts4
-rw-r--r--arch/arm/boot/dts/wm8750.dtsi18
-rw-r--r--arch/arm/boot/dts/wm8850-w70v2.dts4
-rw-r--r--arch/arm/boot/dts/wm8850.dtsi12
10 files changed, 84 insertions, 22 deletions
diff --git a/arch/arm/boot/dts/vt8500-bv07.dts b/arch/arm/boot/dts/vt8500-bv07.dts
index 877b33afa7ed..87f33310e2bc 100644
--- a/arch/arm/boot/dts/vt8500-bv07.dts
+++ b/arch/arm/boot/dts/vt8500-bv07.dts
@@ -30,3 +30,7 @@
30 }; 30 };
31 }; 31 };
32}; 32};
33
34&uart0 {
35 status = "okay";
36};
diff --git a/arch/arm/boot/dts/vt8500.dtsi b/arch/arm/boot/dts/vt8500.dtsi
index a0b490d51519..51d0e912c8f5 100644
--- a/arch/arm/boot/dts/vt8500.dtsi
+++ b/arch/arm/boot/dts/vt8500.dtsi
@@ -21,6 +21,13 @@
21 }; 21 };
22 }; 22 };
23 23
24 aliases {
25 serial0 = &uart0;
26 serial1 = &uart1;
27 serial2 = &uart2;
28 serial3 = &uart3;
29 };
30
24 soc { 31 soc {
25 #address-cells = <1>; 32 #address-cells = <1>;
26 #size-cells = <1>; 33 #size-cells = <1>;
@@ -121,32 +128,36 @@
121 reg = <0xd8050400 0x100>; 128 reg = <0xd8050400 0x100>;
122 }; 129 };
123 130
124 uart@d8200000 { 131 uart0: serial@d8200000 {
125 compatible = "via,vt8500-uart"; 132 compatible = "via,vt8500-uart";
126 reg = <0xd8200000 0x1040>; 133 reg = <0xd8200000 0x1040>;
127 interrupts = <32>; 134 interrupts = <32>;
128 clocks = <&clkuart0>; 135 clocks = <&clkuart0>;
136 status = "disabled";
129 }; 137 };
130 138
131 uart@d82b0000 { 139 uart1: serial@d82b0000 {
132 compatible = "via,vt8500-uart"; 140 compatible = "via,vt8500-uart";
133 reg = <0xd82b0000 0x1040>; 141 reg = <0xd82b0000 0x1040>;
134 interrupts = <33>; 142 interrupts = <33>;
135 clocks = <&clkuart1>; 143 clocks = <&clkuart1>;
144 status = "disabled";
136 }; 145 };
137 146
138 uart@d8210000 { 147 uart2: serial@d8210000 {
139 compatible = "via,vt8500-uart"; 148 compatible = "via,vt8500-uart";
140 reg = <0xd8210000 0x1040>; 149 reg = <0xd8210000 0x1040>;
141 interrupts = <47>; 150 interrupts = <47>;
142 clocks = <&clkuart2>; 151 clocks = <&clkuart2>;
152 status = "disabled";
143 }; 153 };
144 154
145 uart@d82c0000 { 155 uart3: serial@d82c0000 {
146 compatible = "via,vt8500-uart"; 156 compatible = "via,vt8500-uart";
147 reg = <0xd82c0000 0x1040>; 157 reg = <0xd82c0000 0x1040>;
148 interrupts = <50>; 158 interrupts = <50>;
149 clocks = <&clkuart3>; 159 clocks = <&clkuart3>;
160 status = "disabled";
150 }; 161 };
151 162
152 rtc@d8100000 { 163 rtc@d8100000 {
diff --git a/arch/arm/boot/dts/wm8505-ref.dts b/arch/arm/boot/dts/wm8505-ref.dts
index edd2cec3d37f..e3e6b9eb09d0 100644
--- a/arch/arm/boot/dts/wm8505-ref.dts
+++ b/arch/arm/boot/dts/wm8505-ref.dts
@@ -30,3 +30,7 @@
30 }; 30 };
31 }; 31 };
32}; 32};
33
34&uart0 {
35 status = "okay";
36};
diff --git a/arch/arm/boot/dts/wm8505.dtsi b/arch/arm/boot/dts/wm8505.dtsi
index 35d9ead79513..060b5fca2c16 100644
--- a/arch/arm/boot/dts/wm8505.dtsi
+++ b/arch/arm/boot/dts/wm8505.dtsi
@@ -21,6 +21,15 @@
21 }; 21 };
22 }; 22 };
23 23
24 aliases {
25 serial0 = &uart0;
26 serial1 = &uart1;
27 serial2 = &uart2;
28 serial3 = &uart3;
29 serial4 = &uart4;
30 serial5 = &uart5;
31 };
32
24 soc { 33 soc {
25 #address-cells = <1>; 34 #address-cells = <1>;
26 #size-cells = <1>; 35 #size-cells = <1>;
@@ -167,46 +176,52 @@
167 reg = <0xd8050400 0x100>; 176 reg = <0xd8050400 0x100>;
168 }; 177 };
169 178
170 uart@d8200000 { 179 uart0: serial@d8200000 {
171 compatible = "via,vt8500-uart"; 180 compatible = "via,vt8500-uart";
172 reg = <0xd8200000 0x1040>; 181 reg = <0xd8200000 0x1040>;
173 interrupts = <32>; 182 interrupts = <32>;
174 clocks = <&clkuart0>; 183 clocks = <&clkuart0>;
184 status = "disabled";
175 }; 185 };
176 186
177 uart@d82b0000 { 187 uart1: serial@d82b0000 {
178 compatible = "via,vt8500-uart"; 188 compatible = "via,vt8500-uart";
179 reg = <0xd82b0000 0x1040>; 189 reg = <0xd82b0000 0x1040>;
180 interrupts = <33>; 190 interrupts = <33>;
181 clocks = <&clkuart1>; 191 clocks = <&clkuart1>;
192 status = "disabled";
182 }; 193 };
183 194
184 uart@d8210000 { 195 uart2: serial@d8210000 {
185 compatible = "via,vt8500-uart"; 196 compatible = "via,vt8500-uart";
186 reg = <0xd8210000 0x1040>; 197 reg = <0xd8210000 0x1040>;
187 interrupts = <47>; 198 interrupts = <47>;
188 clocks = <&clkuart2>; 199 clocks = <&clkuart2>;
200 status = "disabled";
189 }; 201 };
190 202
191 uart@d82c0000 { 203 uart3: serial@d82c0000 {
192 compatible = "via,vt8500-uart"; 204 compatible = "via,vt8500-uart";
193 reg = <0xd82c0000 0x1040>; 205 reg = <0xd82c0000 0x1040>;
194 interrupts = <50>; 206 interrupts = <50>;
195 clocks = <&clkuart3>; 207 clocks = <&clkuart3>;
208 status = "disabled";
196 }; 209 };
197 210
198 uart@d8370000 { 211 uart4: serial@d8370000 {
199 compatible = "via,vt8500-uart"; 212 compatible = "via,vt8500-uart";
200 reg = <0xd8370000 0x1040>; 213 reg = <0xd8370000 0x1040>;
201 interrupts = <31>; 214 interrupts = <31>;
202 clocks = <&clkuart4>; 215 clocks = <&clkuart4>;
216 status = "disabled";
203 }; 217 };
204 218
205 uart@d8380000 { 219 uart5: serial@d8380000 {
206 compatible = "via,vt8500-uart"; 220 compatible = "via,vt8500-uart";
207 reg = <0xd8380000 0x1040>; 221 reg = <0xd8380000 0x1040>;
208 interrupts = <30>; 222 interrupts = <30>;
209 clocks = <&clkuart5>; 223 clocks = <&clkuart5>;
224 status = "disabled";
210 }; 225 };
211 226
212 rtc@d8100000 { 227 rtc@d8100000 {
diff --git a/arch/arm/boot/dts/wm8650-mid.dts b/arch/arm/boot/dts/wm8650-mid.dts
index 61671a0d9ede..dd0d1b602388 100644
--- a/arch/arm/boot/dts/wm8650-mid.dts
+++ b/arch/arm/boot/dts/wm8650-mid.dts
@@ -32,3 +32,6 @@
32 }; 32 };
33}; 33};
34 34
35&uart0 {
36 status = "okay";
37};
diff --git a/arch/arm/boot/dts/wm8650.dtsi b/arch/arm/boot/dts/wm8650.dtsi
index 7dce5c18615c..4fdae5ce4dfb 100644
--- a/arch/arm/boot/dts/wm8650.dtsi
+++ b/arch/arm/boot/dts/wm8650.dtsi
@@ -21,6 +21,11 @@
21 }; 21 };
22 }; 22 };
23 23
24 aliases {
25 serial0 = &uart0;
26 serial1 = &uart1;
27 };
28
24 soc { 29 soc {
25 #address-cells = <1>; 30 #address-cells = <1>;
26 #size-cells = <1>; 31 #size-cells = <1>;
@@ -150,18 +155,20 @@
150 reg = <0xd8050400 0x100>; 155 reg = <0xd8050400 0x100>;
151 }; 156 };
152 157
153 uart@d8200000 { 158 uart0: serial@d8200000 {
154 compatible = "via,vt8500-uart"; 159 compatible = "via,vt8500-uart";
155 reg = <0xd8200000 0x1040>; 160 reg = <0xd8200000 0x1040>;
156 interrupts = <32>; 161 interrupts = <32>;
157 clocks = <&clkuart0>; 162 clocks = <&clkuart0>;
163 status = "disabled";
158 }; 164 };
159 165
160 uart@d82b0000 { 166 uart1: serial@d82b0000 {
161 compatible = "via,vt8500-uart"; 167 compatible = "via,vt8500-uart";
162 reg = <0xd82b0000 0x1040>; 168 reg = <0xd82b0000 0x1040>;
163 interrupts = <33>; 169 interrupts = <33>;
164 clocks = <&clkuart1>; 170 clocks = <&clkuart1>;
171 status = "disabled";
165 }; 172 };
166 173
167 rtc@d8100000 { 174 rtc@d8100000 {
diff --git a/arch/arm/boot/dts/wm8750-apc8750.dts b/arch/arm/boot/dts/wm8750-apc8750.dts
index 62675eba9666..37e4a408bf39 100644
--- a/arch/arm/boot/dts/wm8750-apc8750.dts
+++ b/arch/arm/boot/dts/wm8750-apc8750.dts
@@ -24,3 +24,7 @@
24 wm,pull = <2>; /* pull-up */ 24 wm,pull = <2>; /* pull-up */
25 }; 25 };
26}; 26};
27
28&uart0 {
29 status = "okay";
30};
diff --git a/arch/arm/boot/dts/wm8750.dtsi b/arch/arm/boot/dts/wm8750.dtsi
index 462de589a2fe..e4a1e8553e30 100644
--- a/arch/arm/boot/dts/wm8750.dtsi
+++ b/arch/arm/boot/dts/wm8750.dtsi
@@ -258,46 +258,52 @@
258 interrupts = <26>; 258 interrupts = <26>;
259 }; 259 };
260 260
261 uart0: uart@d8200000 { 261 uart0: serial@d8200000 {
262 compatible = "via,vt8500-uart"; 262 compatible = "via,vt8500-uart";
263 reg = <0xd8200000 0x1040>; 263 reg = <0xd8200000 0x1040>;
264 interrupts = <32>; 264 interrupts = <32>;
265 clocks = <&clkuart0>; 265 clocks = <&clkuart0>;
266 status = "disabled";
266 }; 267 };
267 268
268 uart1: uart@d82b0000 { 269 uart1: serial@d82b0000 {
269 compatible = "via,vt8500-uart"; 270 compatible = "via,vt8500-uart";
270 reg = <0xd82b0000 0x1040>; 271 reg = <0xd82b0000 0x1040>;
271 interrupts = <33>; 272 interrupts = <33>;
272 clocks = <&clkuart1>; 273 clocks = <&clkuart1>;
274 status = "disabled";
273 }; 275 };
274 276
275 uart2: uart@d8210000 { 277 uart2: serial@d8210000 {
276 compatible = "via,vt8500-uart"; 278 compatible = "via,vt8500-uart";
277 reg = <0xd8210000 0x1040>; 279 reg = <0xd8210000 0x1040>;
278 interrupts = <47>; 280 interrupts = <47>;
279 clocks = <&clkuart2>; 281 clocks = <&clkuart2>;
282 status = "disabled";
280 }; 283 };
281 284
282 uart3: uart@d82c0000 { 285 uart3: serial@d82c0000 {
283 compatible = "via,vt8500-uart"; 286 compatible = "via,vt8500-uart";
284 reg = <0xd82c0000 0x1040>; 287 reg = <0xd82c0000 0x1040>;
285 interrupts = <50>; 288 interrupts = <50>;
286 clocks = <&clkuart3>; 289 clocks = <&clkuart3>;
290 status = "disabled";
287 }; 291 };
288 292
289 uart4: uart@d8370000 { 293 uart4: serial@d8370000 {
290 compatible = "via,vt8500-uart"; 294 compatible = "via,vt8500-uart";
291 reg = <0xd8370000 0x1040>; 295 reg = <0xd8370000 0x1040>;
292 interrupts = <30>; 296 interrupts = <30>;
293 clocks = <&clkuart4>; 297 clocks = <&clkuart4>;
298 status = "disabled";
294 }; 299 };
295 300
296 uart5: uart@d8380000 { 301 uart5: serial@d8380000 {
297 compatible = "via,vt8500-uart"; 302 compatible = "via,vt8500-uart";
298 reg = <0xd8380000 0x1040>; 303 reg = <0xd8380000 0x1040>;
299 interrupts = <43>; 304 interrupts = <43>;
300 clocks = <&clkuart5>; 305 clocks = <&clkuart5>;
306 status = "disabled";
301 }; 307 };
302 308
303 rtc@d8100000 { 309 rtc@d8100000 {
diff --git a/arch/arm/boot/dts/wm8850-w70v2.dts b/arch/arm/boot/dts/wm8850-w70v2.dts
index 32d22532cd6c..90e913fb64be 100644
--- a/arch/arm/boot/dts/wm8850-w70v2.dts
+++ b/arch/arm/boot/dts/wm8850-w70v2.dts
@@ -41,3 +41,7 @@
41 }; 41 };
42 }; 42 };
43}; 43};
44
45&uart0 {
46 status = "okay";
47};
diff --git a/arch/arm/boot/dts/wm8850.dtsi b/arch/arm/boot/dts/wm8850.dtsi
index 3aa131538935..fc60e3204589 100644
--- a/arch/arm/boot/dts/wm8850.dtsi
+++ b/arch/arm/boot/dts/wm8850.dtsi
@@ -189,32 +189,36 @@
189 interrupts = <26>; 189 interrupts = <26>;
190 }; 190 };
191 191
192 uart0: uart@d8200000 { 192 uart0: serial@d8200000 {
193 compatible = "via,vt8500-uart"; 193 compatible = "via,vt8500-uart";
194 reg = <0xd8200000 0x1040>; 194 reg = <0xd8200000 0x1040>;
195 interrupts = <32>; 195 interrupts = <32>;
196 clocks = <&clkuart0>; 196 clocks = <&clkuart0>;
197 status = "disabled";
197 }; 198 };
198 199
199 uart1: uart@d82b0000 { 200 uart1: serial@d82b0000 {
200 compatible = "via,vt8500-uart"; 201 compatible = "via,vt8500-uart";
201 reg = <0xd82b0000 0x1040>; 202 reg = <0xd82b0000 0x1040>;
202 interrupts = <33>; 203 interrupts = <33>;
203 clocks = <&clkuart1>; 204 clocks = <&clkuart1>;
205 status = "disabled";
204 }; 206 };
205 207
206 uart2: uart@d8210000 { 208 uart2: serial@d8210000 {
207 compatible = "via,vt8500-uart"; 209 compatible = "via,vt8500-uart";
208 reg = <0xd8210000 0x1040>; 210 reg = <0xd8210000 0x1040>;
209 interrupts = <47>; 211 interrupts = <47>;
210 clocks = <&clkuart2>; 212 clocks = <&clkuart2>;
213 status = "disabled";
211 }; 214 };
212 215
213 uart3: uart@d82c0000 { 216 uart3: serial@d82c0000 {
214 compatible = "via,vt8500-uart"; 217 compatible = "via,vt8500-uart";
215 reg = <0xd82c0000 0x1040>; 218 reg = <0xd82c0000 0x1040>;
216 interrupts = <50>; 219 interrupts = <50>;
217 clocks = <&clkuart3>; 220 clocks = <&clkuart3>;
221 status = "disabled";
218 }; 222 };
219 223
220 rtc@d8100000 { 224 rtc@d8100000 {