aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeiko Stuebner <heiko@sntech.de>2014-07-26 17:08:06 -0400
committerHeiko Stuebner <heiko@sntech.de>2014-07-26 17:19:56 -0400
commitfcbbf965254ff1693c26a5646e4e62adc3a6118d (patch)
tree61a9d5c9040507f2b65ac5c4020c8538e81c6835
parente40b43d6ea0c5c30ba3655b304d2d526539fc7ed (diff)
ARM: dts: uses handles to reference nodes for changes
Use the handles for subsequent changes to nodes, similar to like the rk3288 submission does it. Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Diffstat
-rw-r--r--arch/arm/boot/dts/rk3066a-bqcurie2.dts91
-rw-r--r--arch/arm/boot/dts/rk3066a.dtsi30
-rw-r--r--arch/arm/boot/dts/rk3188-radxarock.dts36
-rw-r--r--arch/arm/boot/dts/rk3188.dtsi36
4 files changed, 119 insertions, 74 deletions
diff --git a/arch/arm/boot/dts/rk3066a-bqcurie2.dts b/arch/arm/boot/dts/rk3066a-bqcurie2.dts
index 6131675695eb..38910f6992bf 100644
--- a/arch/arm/boot/dts/rk3066a-bqcurie2.dts
+++ b/arch/arm/boot/dts/rk3066a-bqcurie2.dts
@@ -24,24 +24,6 @@
24 reg = <0x60000000 0x40000000>; 24 reg = <0x60000000 0x40000000>;
25 }; 25 };
26 26
27 uart0: serial@10124000 {
28 status = "okay";
29 };
30
31 uart1: serial@10126000 {
32 status = "okay";
33 };
34
35 uart2: serial@20064000 {
36 pinctrl-names = "default";
37 pinctrl-0 = <&uart2_xfer>;
38 status = "okay";
39 };
40
41 uart3: serial@20068000 {
42 status = "okay";
43 };
44
45 vcc_sd0: fixed-regulator { 27 vcc_sd0: fixed-regulator {
46 compatible = "regulator-fixed"; 28 compatible = "regulator-fixed";
47 regulator-name = "sdmmc-supply"; 29 regulator-name = "sdmmc-supply";
@@ -51,36 +33,6 @@
51 startup-delay-us = <100000>; 33 startup-delay-us = <100000>;
52 }; 34 };
53 35
54 dwmmc@10214000 { /* sdmmc */
55 num-slots = <1>;
56 status = "okay";
57
58 pinctrl-names = "default";
59 pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_cd &sd0_bus4>;
60 vmmc-supply = <&vcc_sd0>;
61
62 slot@0 {
63 reg = <0>;
64 bus-width = <4>;
65 disable-wp;
66 };
67 };
68
69 dwmmc@10218000 { /* wifi */
70 num-slots = <1>;
71 status = "okay";
72 non-removable;
73
74 pinctrl-names = "default";
75 pinctrl-0 = <&sd1_clk &sd1_cmd &sd1_bus4>;
76
77 slot@0 {
78 reg = <0>;
79 bus-width = <4>;
80 disable-wp;
81 };
82 };
83
84 gpio-keys { 36 gpio-keys {
85 compatible = "gpio-keys"; 37 compatible = "gpio-keys";
86 #address-cells = <1>; 38 #address-cells = <1>;
@@ -106,3 +58,46 @@
106 /* VOL+ comes somehow thru the ADC */ 58 /* VOL+ comes somehow thru the ADC */
107 }; 59 };
108}; 60};
61
62&mmc0 { /* sdmmc */
63 num-slots = <1>;
64 status = "okay";
65 vmmc-supply = <&vcc_sd0>;
66
67 slot@0 {
68 reg = <0>;
69 bus-width = <4>;
70 disable-wp;
71 };
72};
73
74&mmc1 { /* wifi */
75 num-slots = <1>;
76 status = "okay";
77 non-removable;
78
79 pinctrl-names = "default";
80 pinctrl-0 = <&sd1_clk &sd1_cmd &sd1_bus4>;
81
82 slot@0 {
83 reg = <0>;
84 bus-width = <4>;
85 disable-wp;
86 };
87};
88
89&uart0 {
90 status = "okay";
91};
92
93&uart1 {
94 status = "okay";
95};
96
97&uart2 {
98 status = "okay";
99};
100
101&uart3 {
102 status = "okay";
103};
diff --git a/arch/arm/boot/dts/rk3066a.dtsi b/arch/arm/boot/dts/rk3066a.dtsi
index ecf722ea5982..460932b2baa8 100644
--- a/arch/arm/boot/dts/rk3066a.dtsi
+++ b/arch/arm/boot/dts/rk3066a.dtsi
@@ -291,3 +291,33 @@
291 }; 291 };
292 }; 292 };
293}; 293};
294
295&mmc0 {
296 pinctrl-names = "default";
297 pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_cd &sd0_bus4>;
298};
299
300&mmc1 {
301 pinctrl-names = "default";
302 pinctrl-0 = <&sd1_clk &sd1_cmd &sd1_cd &sd1_bus4>;
303};
304
305&uart0 {
306 pinctrl-names = "default";
307 pinctrl-0 = <&uart0_xfer>;
308};
309
310&uart1 {
311 pinctrl-names = "default";
312 pinctrl-0 = <&uart1_xfer>;
313};
314
315&uart2 {
316 pinctrl-names = "default";
317 pinctrl-0 = <&uart2_xfer>;
318};
319
320&uart3 {
321 pinctrl-names = "default";
322 pinctrl-0 = <&uart3_xfer>;
323};
diff --git a/arch/arm/boot/dts/rk3188-radxarock.dts b/arch/arm/boot/dts/rk3188-radxarock.dts
index 7a002f523ec4..241e2a4d4b99 100644
--- a/arch/arm/boot/dts/rk3188-radxarock.dts
+++ b/arch/arm/boot/dts/rk3188-radxarock.dts
@@ -23,24 +23,6 @@
23 reg = <0x60000000 0x80000000>; 23 reg = <0x60000000 0x80000000>;
24 }; 24 };
25 25
26 uart0: serial@10124000 {
27 status = "okay";
28 };
29
30 uart1: serial@10126000 {
31 status = "okay";
32 };
33
34 uart2: serial@20064000 {
35 pinctrl-names = "default";
36 pinctrl-0 = <&uart2_xfer>;
37 status = "okay";
38 };
39
40 uart3: serial@20068000 {
41 status = "okay";
42 };
43
44 gpio-keys { 26 gpio-keys {
45 compatible = "gpio-keys"; 27 compatible = "gpio-keys";
46 #address-cells = <1>; 28 #address-cells = <1>;
@@ -76,3 +58,21 @@
76 }; 58 };
77 }; 59 };
78}; 60};
61
62&uart0 {
63 status = "okay";
64};
65
66&uart1 {
67 status = "okay";
68};
69
70&uart2 {
71 pinctrl-names = "default";
72 pinctrl-0 = <&uart2_xfer>;
73 status = "okay";
74};
75
76&uart3 {
77 status = "okay";
78};
diff --git a/arch/arm/boot/dts/rk3188.dtsi b/arch/arm/boot/dts/rk3188.dtsi
index 7b631ec3102c..4a9f7020c562 100644
--- a/arch/arm/boot/dts/rk3188.dtsi
+++ b/arch/arm/boot/dts/rk3188.dtsi
@@ -52,14 +52,6 @@
52 }; 52 };
53 }; 53 };
54 54
55 global-timer@1013c200 {
56 interrupts = <GIC_PPI 11 0xf04>;
57 };
58
59 local-timer@1013c600 {
60 interrupts = <GIC_PPI 13 0xf04>;
61 };
62
63 sram: sram@10080000 { 55 sram: sram@10080000 {
64 compatible = "mmio-sram"; 56 compatible = "mmio-sram";
65 reg = <0x10080000 0x8000>; 57 reg = <0x10080000 0x8000>;
@@ -271,3 +263,31 @@
271 }; 263 };
272 }; 264 };
273}; 265};
266
267&global_timer {
268 interrupts = <GIC_PPI 11 0xf04>;
269};
270
271&local_timer {
272 interrupts = <GIC_PPI 13 0xf04>;
273};
274
275&uart0 {
276 pinctrl-names = "default";
277 pinctrl-0 = <&uart0_xfer>;
278};
279
280&uart1 {
281 pinctrl-names = "default";
282 pinctrl-0 = <&uart1_xfer>;
283};
284
285&uart2 {
286 pinctrl-names = "default";
287 pinctrl-0 = <&uart2_xfer>;
288};
289
290&uart3 {
291 pinctrl-names = "default";
292 pinctrl-0 = <&uart3_xfer>;
293};
generated by cgit v1.2.2 (git 2.25.0) at 2025-08-17 14:39:10 -0400