aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorJavier Martinez Canillas <javier.martinez@collabora.co.uk>2013-09-20 11:42:19 -0400
committerBenoit Cousson <bcousson@baylibre.com>2013-10-11 15:06:32 -0400
commite0efaafbb5ba9bffe44c0ae838e5fd81632868b7 (patch)
treee56f2922850c33d47de48f6b3f45b40120fae1a5 /arch
parent82d75afcb718dc8fe9fcd71959bff7878df53076 (diff)
ARM: dts: AM33XX: don't redefine OCP bus and device nodes
The On Chip Peripherals (OCP) device node is a simplified representation of the AM33XX SoC interconnect. An OCP dev node is already defined in the am33xx.dtsi Device Tree source file included by am33xx based boards so there is no need to redefine this on each board DT file. Also, the OCP and IP modules directly connected to it are SoC internal details that is better to keep outside of board files. Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk> Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/am335x-bone-common.dtsi100
-rw-r--r--arch/arm/boot/dts/am335x-evm.dts380
-rw-r--r--arch/arm/boot/dts/am335x-evmsk.dts148
3 files changed, 311 insertions, 317 deletions
diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
index 29799ac3423a..ff5c3cafbdff 100644
--- a/arch/arm/boot/dts/am335x-bone-common.dtsi
+++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
@@ -21,57 +21,6 @@
21 reg = <0x80000000 0x10000000>; /* 256 MB */ 21 reg = <0x80000000 0x10000000>; /* 256 MB */
22 }; 22 };
23 23
24 ocp {
25 uart0: serial@44e09000 {
26 pinctrl-names = "default";
27 pinctrl-0 = <&uart0_pins>;
28
29 status = "okay";
30 };
31
32 musb: usb@47400000 {
33 status = "okay";
34
35 control@44e10000 {
36 status = "okay";
37 };
38
39 usb-phy@47401300 {
40 status = "okay";
41 };
42
43 usb-phy@47401b00 {
44 status = "okay";
45 };
46
47 usb@47401000 {
48 status = "okay";
49 };
50
51 usb@47401800 {
52 status = "okay";
53 dr_mode = "host";
54 };
55
56 dma-controller@07402000 {
57 status = "okay";
58 };
59 };
60
61 i2c0: i2c@44e0b000 {
62 pinctrl-names = "default";
63 pinctrl-0 = <&i2c0_pins>;
64
65 status = "okay";
66 clock-frequency = <400000>;
67
68 tps: tps@24 {
69 reg = <0x24>;
70 };
71
72 };
73 };
74
75 leds { 24 leds {
76 pinctrl-names = "default"; 25 pinctrl-names = "default";
77 pinctrl-0 = <&user_leds_s0>; 26 pinctrl-0 = <&user_leds_s0>;
@@ -217,6 +166,55 @@
217 }; 166 };
218}; 167};
219 168
169&uart0 {
170 pinctrl-names = "default";
171 pinctrl-0 = <&uart0_pins>;
172
173 status = "okay";
174};
175
176&usb {
177 status = "okay";
178
179 control@44e10000 {
180 status = "okay";
181 };
182
183 usb-phy@47401300 {
184 status = "okay";
185 };
186
187 usb-phy@47401b00 {
188 status = "okay";
189 };
190
191 usb@47401000 {
192 status = "okay";
193 };
194
195 usb@47401800 {
196 status = "okay";
197 dr_mode = "host";
198 };
199
200 dma-controller@07402000 {
201 status = "okay";
202 };
203};
204
205&i2c0 {
206 pinctrl-names = "default";
207 pinctrl-0 = <&i2c0_pins>;
208
209 status = "okay";
210 clock-frequency = <400000>;
211
212 tps: tps@24 {
213 reg = <0x24>;
214 };
215
216};
217
220/include/ "tps65217.dtsi" 218/include/ "tps65217.dtsi"
221 219
222&tps { 220&tps {
diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts
index 1525cd6d4844..23b0a3e32f2e 100644
--- a/arch/arm/boot/dts/am335x-evm.dts
+++ b/arch/arm/boot/dts/am335x-evm.dts
@@ -24,197 +24,6 @@
24 reg = <0x80000000 0x10000000>; /* 256 MB */ 24 reg = <0x80000000 0x10000000>; /* 256 MB */
25 }; 25 };
26 26
27 ocp {
28 uart0: serial@44e09000 {
29 pinctrl-names = "default";
30 pinctrl-0 = <&uart0_pins>;
31
32 status = "okay";
33 };
34
35 i2c0: i2c@44e0b000 {
36 pinctrl-names = "default";
37 pinctrl-0 = <&i2c0_pins>;
38
39 status = "okay";
40 clock-frequency = <400000>;
41
42 tps: tps@2d {
43 reg = <0x2d>;
44 };
45 };
46
47 musb: usb@47400000 {
48 status = "okay";
49
50 control@44e10000 {
51 status = "okay";
52 };
53
54 usb-phy@47401300 {
55 status = "okay";
56 };
57
58 usb-phy@47401b00 {
59 status = "okay";
60 };
61
62 usb@47401000 {
63 status = "okay";
64 };
65
66 usb@47401800 {
67 status = "okay";
68 dr_mode = "host";
69 };
70
71 dma-controller@07402000 {
72 status = "okay";
73 };
74 };
75
76 i2c1: i2c@4802a000 {
77 pinctrl-names = "default";
78 pinctrl-0 = <&i2c1_pins>;
79
80 status = "okay";
81 clock-frequency = <100000>;
82
83 lis331dlh: lis331dlh@18 {
84 compatible = "st,lis331dlh", "st,lis3lv02d";
85 reg = <0x18>;
86 Vdd-supply = <&lis3_reg>;
87 Vdd_IO-supply = <&lis3_reg>;
88
89 st,click-single-x;
90 st,click-single-y;
91 st,click-single-z;
92 st,click-thresh-x = <10>;
93 st,click-thresh-y = <10>;
94 st,click-thresh-z = <10>;
95 st,irq1-click;
96 st,irq2-click;
97 st,wakeup-x-lo;
98 st,wakeup-x-hi;
99 st,wakeup-y-lo;
100 st,wakeup-y-hi;
101 st,wakeup-z-lo;
102 st,wakeup-z-hi;
103 st,min-limit-x = <120>;
104 st,min-limit-y = <120>;
105 st,min-limit-z = <140>;
106 st,max-limit-x = <550>;
107 st,max-limit-y = <550>;
108 st,max-limit-z = <750>;
109 };
110
111 tsl2550: tsl2550@39 {
112 compatible = "taos,tsl2550";
113 reg = <0x39>;
114 };
115
116 tmp275: tmp275@48 {
117 compatible = "ti,tmp275";
118 reg = <0x48>;
119 };
120 };
121
122 elm: elm@48080000 {
123 status = "okay";
124 };
125
126 epwmss0: epwmss@48300000 {
127 status = "okay";
128
129 ecap0: ecap@48300100 {
130 status = "okay";
131 pinctrl-names = "default";
132 pinctrl-0 = <&ecap0_pins>;
133 };
134 };
135
136 gpmc: gpmc@50000000 {
137 status = "okay";
138 pinctrl-names = "default";
139 pinctrl-0 = <&nandflash_pins_s0>;
140 ranges = <0 0 0x08000000 0x10000000>; /* CS0: NAND */
141 nand@0,0 {
142 reg = <0 0 0>; /* CS0, offset 0 */
143 nand-bus-width = <8>;
144 ti,nand-ecc-opt = "bch8";
145 gpmc,device-nand = "true";
146 gpmc,device-width = <1>;
147 gpmc,sync-clk-ps = <0>;
148 gpmc,cs-on-ns = <0>;
149 gpmc,cs-rd-off-ns = <44>;
150 gpmc,cs-wr-off-ns = <44>;
151 gpmc,adv-on-ns = <6>;
152 gpmc,adv-rd-off-ns = <34>;
153 gpmc,adv-wr-off-ns = <44>;
154 gpmc,we-on-ns = <0>;
155 gpmc,we-off-ns = <40>;
156 gpmc,oe-on-ns = <0>;
157 gpmc,oe-off-ns = <54>;
158 gpmc,access-ns = <64>;
159 gpmc,rd-cycle-ns = <82>;
160 gpmc,wr-cycle-ns = <82>;
161 gpmc,wait-on-read = "true";
162 gpmc,wait-on-write = "true";
163 gpmc,bus-turnaround-ns = <0>;
164 gpmc,cycle2cycle-delay-ns = <0>;
165 gpmc,clk-activation-ns = <0>;
166 gpmc,wait-monitoring-ns = <0>;
167 gpmc,wr-access-ns = <40>;
168 gpmc,wr-data-mux-bus-ns = <0>;
169
170 #address-cells = <1>;
171 #size-cells = <1>;
172 elm_id = <&elm>;
173
174 /* MTD partition table */
175 partition@0 {
176 label = "SPL1";
177 reg = <0x00000000 0x000020000>;
178 };
179
180 partition@1 {
181 label = "SPL2";
182 reg = <0x00020000 0x00020000>;
183 };
184
185 partition@2 {
186 label = "SPL3";
187 reg = <0x00040000 0x00020000>;
188 };
189
190 partition@3 {
191 label = "SPL4";
192 reg = <0x00060000 0x00020000>;
193 };
194
195 partition@4 {
196 label = "U-boot";
197 reg = <0x00080000 0x001e0000>;
198 };
199
200 partition@5 {
201 label = "environment";
202 reg = <0x00260000 0x00020000>;
203 };
204
205 partition@6 {
206 label = "Kernel";
207 reg = <0x00280000 0x00500000>;
208 };
209
210 partition@7 {
211 label = "File-System";
212 reg = <0x00780000 0x0F880000>;
213 };
214 };
215 };
216 };
217
218 vbat: fixedregulator@0 { 27 vbat: fixedregulator@0 {
219 compatible = "regulator-fixed"; 28 compatible = "regulator-fixed";
220 regulator-name = "vbat"; 29 regulator-name = "vbat";
@@ -405,6 +214,195 @@
405 }; 214 };
406}; 215};
407 216
217&uart0 {
218 pinctrl-names = "default";
219 pinctrl-0 = <&uart0_pins>;
220
221 status = "okay";
222};
223
224&i2c0 {
225 pinctrl-names = "default";
226 pinctrl-0 = <&i2c0_pins>;
227
228 status = "okay";
229 clock-frequency = <400000>;
230
231 tps: tps@2d {
232 reg = <0x2d>;
233 };
234};
235
236&usb {
237 status = "okay";
238
239 control@44e10000 {
240 status = "okay";
241 };
242
243 usb-phy@47401300 {
244 status = "okay";
245 };
246
247 usb-phy@47401b00 {
248 status = "okay";
249 };
250
251 usb@47401000 {
252 status = "okay";
253 };
254
255 usb@47401800 {
256 status = "okay";
257 dr_mode = "host";
258 };
259
260 dma-controller@07402000 {
261 status = "okay";
262 };
263};
264
265&i2c1 {
266 pinctrl-names = "default";
267 pinctrl-0 = <&i2c1_pins>;
268
269 status = "okay";
270 clock-frequency = <100000>;
271
272 lis331dlh: lis331dlh@18 {
273 compatible = "st,lis331dlh", "st,lis3lv02d";
274 reg = <0x18>;
275 Vdd-supply = <&lis3_reg>;
276 Vdd_IO-supply = <&lis3_reg>;
277
278 st,click-single-x;
279 st,click-single-y;
280 st,click-single-z;
281 st,click-thresh-x = <10>;
282 st,click-thresh-y = <10>;
283 st,click-thresh-z = <10>;
284 st,irq1-click;
285 st,irq2-click;
286 st,wakeup-x-lo;
287 st,wakeup-x-hi;
288 st,wakeup-y-lo;
289 st,wakeup-y-hi;
290 st,wakeup-z-lo;
291 st,wakeup-z-hi;
292 st,min-limit-x = <120>;
293 st,min-limit-y = <120>;
294 st,min-limit-z = <140>;
295 st,max-limit-x = <550>;
296 st,max-limit-y = <550>;
297 st,max-limit-z = <750>;
298 };
299
300 tsl2550: tsl2550@39 {
301 compatible = "taos,tsl2550";
302 reg = <0x39>;
303 };
304
305 tmp275: tmp275@48 {
306 compatible = "ti,tmp275";
307 reg = <0x48>;
308 };
309};
310
311&elm {
312 status = "okay";
313};
314
315&epwmss0 {
316 status = "okay";
317
318 ecap0: ecap@48300100 {
319 status = "okay";
320 pinctrl-names = "default";
321 pinctrl-0 = <&ecap0_pins>;
322 };
323};
324
325&gpmc {
326 status = "okay";
327 pinctrl-names = "default";
328 pinctrl-0 = <&nandflash_pins_s0>;
329 ranges = <0 0 0x08000000 0x10000000>; /* CS0: NAND */
330 nand@0,0 {
331 reg = <0 0 0>; /* CS0, offset 0 */
332 nand-bus-width = <8>;
333 ti,nand-ecc-opt = "bch8";
334 gpmc,device-nand = "true";
335 gpmc,device-width = <1>;
336 gpmc,sync-clk-ps = <0>;
337 gpmc,cs-on-ns = <0>;
338 gpmc,cs-rd-off-ns = <44>;
339 gpmc,cs-wr-off-ns = <44>;
340 gpmc,adv-on-ns = <6>;
341 gpmc,adv-rd-off-ns = <34>;
342 gpmc,adv-wr-off-ns = <44>;
343 gpmc,we-on-ns = <0>;
344 gpmc,we-off-ns = <40>;
345 gpmc,oe-on-ns = <0>;
346 gpmc,oe-off-ns = <54>;
347 gpmc,access-ns = <64>;
348 gpmc,rd-cycle-ns = <82>;
349 gpmc,wr-cycle-ns = <82>;
350 gpmc,wait-on-read = "true";
351 gpmc,wait-on-write = "true";
352 gpmc,bus-turnaround-ns = <0>;
353 gpmc,cycle2cycle-delay-ns = <0>;
354 gpmc,clk-activation-ns = <0>;
355 gpmc,wait-monitoring-ns = <0>;
356 gpmc,wr-access-ns = <40>;
357 gpmc,wr-data-mux-bus-ns = <0>;
358
359 #address-cells = <1>;
360 #size-cells = <1>;
361 elm_id = <&elm>;
362
363 /* MTD partition table */
364 partition@0 {
365 label = "SPL1";
366 reg = <0x00000000 0x000020000>;
367 };
368
369 partition@1 {
370 label = "SPL2";
371 reg = <0x00020000 0x00020000>;
372 };
373
374 partition@2 {
375 label = "SPL3";
376 reg = <0x00040000 0x00020000>;
377 };
378
379 partition@3 {
380 label = "SPL4";
381 reg = <0x00060000 0x00020000>;
382 };
383
384 partition@4 {
385 label = "U-boot";
386 reg = <0x00080000 0x001e0000>;
387 };
388
389 partition@5 {
390 label = "environment";
391 reg = <0x00260000 0x00020000>;
392 };
393
394 partition@6 {
395 label = "Kernel";
396 reg = <0x00280000 0x00500000>;
397 };
398
399 partition@7 {
400 label = "File-System";
401 reg = <0x00780000 0x0F880000>;
402 };
403 };
404};
405
408#include "tps65910.dtsi" 406#include "tps65910.dtsi"
409 407
410&tps { 408&tps {
diff --git a/arch/arm/boot/dts/am335x-evmsk.dts b/arch/arm/boot/dts/am335x-evmsk.dts
index f0066fe5d739..bc93895a6eca 100644
--- a/arch/arm/boot/dts/am335x-evmsk.dts
+++ b/arch/arm/boot/dts/am335x-evmsk.dts
@@ -31,81 +31,6 @@
31 reg = <0x80000000 0x10000000>; /* 256 MB */ 31 reg = <0x80000000 0x10000000>; /* 256 MB */
32 }; 32 };
33 33
34 ocp {
35 uart0: serial@44e09000 {
36 pinctrl-names = "default";
37 pinctrl-0 = <&uart0_pins>;
38
39 status = "okay";
40 };
41
42 i2c0: i2c@44e0b000 {
43 pinctrl-names = "default";
44 pinctrl-0 = <&i2c0_pins>;
45
46 status = "okay";
47 clock-frequency = <400000>;
48
49 tps: tps@2d {
50 reg = <0x2d>;
51 };
52
53 lis331dlh: lis331dlh@18 {
54 compatible = "st,lis331dlh", "st,lis3lv02d";
55 reg = <0x18>;
56 Vdd-supply = <&lis3_reg>;
57 Vdd_IO-supply = <&lis3_reg>;
58
59 st,click-single-x;
60 st,click-single-y;
61 st,click-single-z;
62 st,click-thresh-x = <10>;
63 st,click-thresh-y = <10>;
64 st,click-thresh-z = <10>;
65 st,irq1-click;
66 st,irq2-click;
67 st,wakeup-x-lo;
68 st,wakeup-x-hi;
69 st,wakeup-y-lo;
70 st,wakeup-y-hi;
71 st,wakeup-z-lo;
72 st,wakeup-z-hi;
73 st,min-limit-x = <120>;
74 st,min-limit-y = <120>;
75 st,min-limit-z = <140>;
76 st,max-limit-x = <550>;
77 st,max-limit-y = <550>;
78 st,max-limit-z = <750>;
79 };
80 };
81
82 musb: usb@47400000 {
83 status = "okay";
84
85 control@44e10000 {
86 status = "okay";
87 };
88
89 usb-phy@47401300 {
90 status = "okay";
91 };
92
93 usb@47401000 {
94 status = "okay";
95 };
96 };
97
98 epwmss2: epwmss@48304000 {
99 status = "okay";
100
101 ecap2: ecap@48304100 {
102 status = "okay";
103 pinctrl-names = "default";
104 pinctrl-0 = <&ecap2_pins>;
105 };
106 };
107 };
108
109 vbat: fixedregulator@0 { 34 vbat: fixedregulator@0 {
110 compatible = "regulator-fixed"; 35 compatible = "regulator-fixed";
111 regulator-name = "vbat"; 36 regulator-name = "vbat";
@@ -321,6 +246,79 @@
321 }; 246 };
322}; 247};
323 248
249&uart0 {
250 pinctrl-names = "default";
251 pinctrl-0 = <&uart0_pins>;
252
253 status = "okay";
254};
255
256&i2c0 {
257 pinctrl-names = "default";
258 pinctrl-0 = <&i2c0_pins>;
259
260 status = "okay";
261 clock-frequency = <400000>;
262
263 tps: tps@2d {
264 reg = <0x2d>;
265 };
266
267 lis331dlh: lis331dlh@18 {
268 compatible = "st,lis331dlh", "st,lis3lv02d";
269 reg = <0x18>;
270 Vdd-supply = <&lis3_reg>;
271 Vdd_IO-supply = <&lis3_reg>;
272
273 st,click-single-x;
274 st,click-single-y;
275 st,click-single-z;
276 st,click-thresh-x = <10>;
277 st,click-thresh-y = <10>;
278 st,click-thresh-z = <10>;
279 st,irq1-click;
280 st,irq2-click;
281 st,wakeup-x-lo;
282 st,wakeup-x-hi;
283 st,wakeup-y-lo;
284 st,wakeup-y-hi;
285 st,wakeup-z-lo;
286 st,wakeup-z-hi;
287 st,min-limit-x = <120>;
288 st,min-limit-y = <120>;
289 st,min-limit-z = <140>;
290 st,max-limit-x = <550>;
291 st,max-limit-y = <550>;
292 st,max-limit-z = <750>;
293 };
294};
295
296&usb {
297 status = "okay";
298
299 control@44e10000 {
300 status = "okay";
301 };
302
303 usb-phy@47401300 {
304 status = "okay";
305 };
306
307 usb@47401000 {
308 status = "okay";
309 };
310};
311
312&epwmss2 {
313 status = "okay";
314
315 ecap2: ecap@48304100 {
316 status = "okay";
317 pinctrl-names = "default";
318 pinctrl-0 = <&ecap2_pins>;
319 };
320};
321
324#include "tps65910.dtsi" 322#include "tps65910.dtsi"
325 323
326&tps { 324&tps {
generated by cgit v1.2.2 (git 2.25.0) at 2025-02-09 21:05:08 -0500