aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@freescale.com>2013-08-27 01:25:57 -0400
committerNitin Garg <nitin.garg@freescale.com>2014-04-16 09:01:28 -0400
commitd171fe197f6d4fdbcb077e34c5327006908c6a32 (patch)
tree7d5656cdd75c2533a2aeac7235001d211905580b /arch
parent04ce7d02f20cf49c84755f06558f5696654f880e (diff)
ENGR00269945: ARM: imx6: sort label nodes alphabetically
Sort the label nodes alphabetically in board level dts files, so that the nodes can be located a little bit easier and new entries can find the their places for addition. Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/imx6dl-sabresd.dts17
-rw-r--r--arch/arm/boot/dts/imx6q-arm2.dts18
-rw-r--r--arch/arm/boot/dts/imx6q-sabrelite.dts78
-rw-r--r--arch/arm/boot/dts/imx6q-sabresd.dts12
-rw-r--r--arch/arm/boot/dts/imx6qdl-sabreauto.dtsi124
-rw-r--r--arch/arm/boot/dts/imx6qdl-sabresd.dtsi72
-rw-r--r--arch/arm/boot/dts/imx6sl-evk.dts22
7 files changed, 171 insertions, 172 deletions
diff --git a/arch/arm/boot/dts/imx6dl-sabresd.dts b/arch/arm/boot/dts/imx6dl-sabresd.dts
index df543836e793..305be4d563c5 100644
--- a/arch/arm/boot/dts/imx6dl-sabresd.dts
+++ b/arch/arm/boot/dts/imx6dl-sabresd.dts
@@ -16,15 +16,17 @@
16 compatible = "fsl,imx6dl-sabresd", "fsl,imx6dl"; 16 compatible = "fsl,imx6dl-sabresd", "fsl,imx6dl";
17}; 17};
18 18
19&battery {
20 offset-charger = <1485>;
21 offset-discharger = <1464>;
22 offset-usb-charger = <1285>;
23};
24
19&ldb { 25&ldb {
20 ipu_id = <0>; 26 ipu_id = <0>;
21 sec_ipu_id = <0>; 27 sec_ipu_id = <0>;
22}; 28};
23 29
24&pxp {
25 status = "okay";
26};
27
28&mxcfb1 { 30&mxcfb1 {
29 status = "okay"; 31 status = "okay";
30}; 32};
@@ -33,9 +35,6 @@
33 status = "okay"; 35 status = "okay";
34}; 36};
35 37
36&battery { 38&pxp {
37 offset-charger = <1485>; 39 status = "okay";
38 offset-discharger = <1464>;
39 offset-usb-charger = <1285>;
40}; 40};
41
diff --git a/arch/arm/boot/dts/imx6q-arm2.dts b/arch/arm/boot/dts/imx6q-arm2.dts
index c64536894b2c..7ccbf87c7a28 100644
--- a/arch/arm/boot/dts/imx6q-arm2.dts
+++ b/arch/arm/boot/dts/imx6q-arm2.dts
@@ -44,6 +44,13 @@
44 }; 44 };
45}; 45};
46 46
47&fec {
48 pinctrl-names = "default";
49 pinctrl-0 = <&pinctrl_enet_2>;
50 phy-mode = "rgmii";
51 status = "okay";
52};
53
47&gpmi { 54&gpmi {
48 pinctrl-names = "default"; 55 pinctrl-names = "default";
49 pinctrl-0 = <&pinctrl_gpmi_nand_1>; 56 pinctrl-0 = <&pinctrl_gpmi_nand_1>;
@@ -72,10 +79,9 @@
72 }; 79 };
73}; 80};
74 81
75&fec { 82&uart4 {
76 pinctrl-names = "default"; 83 pinctrl-names = "default";
77 pinctrl-0 = <&pinctrl_enet_2>; 84 pinctrl-0 = <&pinctrl_uart4_1>;
78 phy-mode = "rgmii";
79 status = "okay"; 85 status = "okay";
80}; 86};
81 87
@@ -96,9 +102,3 @@
96 pinctrl-0 = <&pinctrl_usdhc4_1>; 102 pinctrl-0 = <&pinctrl_usdhc4_1>;
97 status = "okay"; 103 status = "okay";
98}; 104};
99
100&uart4 {
101 pinctrl-names = "default";
102 pinctrl-0 = <&pinctrl_uart4_1>;
103 status = "okay";
104};
diff --git a/arch/arm/boot/dts/imx6q-sabrelite.dts b/arch/arm/boot/dts/imx6q-sabrelite.dts
index 3530280f5150..bdcabc9f5b41 100644
--- a/arch/arm/boot/dts/imx6q-sabrelite.dts
+++ b/arch/arm/boot/dts/imx6q-sabrelite.dts
@@ -65,8 +65,10 @@
65 }; 65 };
66}; 66};
67 67
68&sata { 68&audmux {
69 status = "okay"; 69 status = "okay";
70 pinctrl-names = "default";
71 pinctrl-0 = <&pinctrl_audmux_1>;
70}; 72};
71 73
72&ecspi1 { 74&ecspi1 {
@@ -83,11 +85,29 @@
83 }; 85 };
84}; 86};
85 87
86&ssi1 { 88&fec {
87 fsl,mode = "i2s-slave"; 89 pinctrl-names = "default";
90 pinctrl-0 = <&pinctrl_enet_1>;
91 phy-mode = "rgmii";
92 phy-reset-gpios = <&gpio3 23 0>;
88 status = "okay"; 93 status = "okay";
89}; 94};
90 95
96&i2c1 {
97 status = "okay";
98 clock-frequency = <100000>;
99 pinctrl-names = "default";
100 pinctrl-0 = <&pinctrl_i2c1_1>;
101
102 codec: sgtl5000@0a {
103 compatible = "fsl,sgtl5000";
104 reg = <0x0a>;
105 clocks = <&clks 201>;
106 VDDA-supply = <&reg_2p5v>;
107 VDDIO-supply = <&reg_3p3v>;
108 };
109};
110
91&iomuxc { 111&iomuxc {
92 pinctrl-names = "default"; 112 pinctrl-names = "default";
93 pinctrl-0 = <&pinctrl_hog>; 113 pinctrl-0 = <&pinctrl_hog>;
@@ -108,23 +128,30 @@
108 }; 128 };
109}; 129};
110 130
111&usbotg { 131&ssi1 {
112 vbus-supply = <&reg_usb_otg_vbus>; 132 fsl,mode = "i2s-slave";
113 pinctrl-names = "default";
114 pinctrl-0 = <&pinctrl_usbotg_1>;
115 disable-over-current;
116 status = "okay"; 133 status = "okay";
117}; 134};
118 135
136&uart2 {
137 status = "okay";
138 pinctrl-names = "default";
139 pinctrl-0 = <&pinctrl_uart2_1>;
140};
141
119&usbh1 { 142&usbh1 {
120 status = "okay"; 143 status = "okay";
121}; 144};
122 145
123&fec { 146&usbotg {
147 vbus-supply = <&reg_usb_otg_vbus>;
124 pinctrl-names = "default"; 148 pinctrl-names = "default";
125 pinctrl-0 = <&pinctrl_enet_1>; 149 pinctrl-0 = <&pinctrl_usbotg_1>;
126 phy-mode = "rgmii"; 150 disable-over-current;
127 phy-reset-gpios = <&gpio3 23 0>; 151 status = "okay";
152};
153
154&sata {
128 status = "okay"; 155 status = "okay";
129}; 156};
130 157
@@ -145,30 +172,3 @@
145 vmmc-supply = <&reg_3p3v>; 172 vmmc-supply = <&reg_3p3v>;
146 status = "okay"; 173 status = "okay";
147}; 174};
148
149&audmux {
150 status = "okay";
151 pinctrl-names = "default";
152 pinctrl-0 = <&pinctrl_audmux_1>;
153};
154
155&uart2 {
156 status = "okay";
157 pinctrl-names = "default";
158 pinctrl-0 = <&pinctrl_uart2_1>;
159};
160
161&i2c1 {
162 status = "okay";
163 clock-frequency = <100000>;
164 pinctrl-names = "default";
165 pinctrl-0 = <&pinctrl_i2c1_1>;
166
167 codec: sgtl5000@0a {
168 compatible = "fsl,sgtl5000";
169 reg = <0x0a>;
170 clocks = <&clks 201>;
171 VDDA-supply = <&reg_2p5v>;
172 VDDIO-supply = <&reg_3p3v>;
173 };
174};
diff --git a/arch/arm/boot/dts/imx6q-sabresd.dts b/arch/arm/boot/dts/imx6q-sabresd.dts
index c3dde1dc8e31..072e7d3f60d1 100644
--- a/arch/arm/boot/dts/imx6q-sabresd.dts
+++ b/arch/arm/boot/dts/imx6q-sabresd.dts
@@ -20,6 +20,12 @@
20 compatible = "fsl,imx6q-sabresd", "fsl,imx6q"; 20 compatible = "fsl,imx6q-sabresd", "fsl,imx6q";
21}; 21};
22 22
23&battery {
24 offset-charger = <1900>;
25 offset-discharger = <1694>;
26 offset-usb-charger = <1685>;
27};
28
23&mxcfb1 { 29&mxcfb1 {
24 status = "okay"; 30 status = "okay";
25}; 31};
@@ -39,9 +45,3 @@
39&sata { 45&sata {
40 status = "okay"; 46 status = "okay";
41}; 47};
42
43&battery {
44 offset-charger = <1900>;
45 offset-discharger = <1694>;
46 offset-usb-charger = <1685>;
47};
diff --git a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
index 7533fed3fd57..fa01ba422bca 100644
--- a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
@@ -22,6 +22,21 @@
22 reg = <0x10000000 0x80000000>; 22 reg = <0x10000000 0x80000000>;
23 }; 23 };
24 24
25 backlight {
26 compatible = "pwm-backlight";
27 pwms = <&pwm3 0 5000000>;
28 brightness-levels = <0 4 8 16 32 64 128 255>;
29 default-brightness-level = <7>;
30 };
31
32 clocks {
33 codec_osc: codec_osc {
34 compatible = "fixed-clock";
35 #clock-cells = <0>;
36 clock-frequency = <24576000>;
37 };
38 };
39
25 max7310_reset: max7310-reset { 40 max7310_reset: max7310-reset {
26 compatible = "gpio-reset"; 41 compatible = "gpio-reset";
27 reset-gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; 42 reset-gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
@@ -73,13 +88,6 @@
73 status = "disabled"; 88 status = "disabled";
74 }; 89 };
75 90
76 backlight {
77 compatible = "pwm-backlight";
78 pwms = <&pwm3 0 5000000>;
79 brightness-levels = <0 4 8 16 32 64 128 255>;
80 default-brightness-level = <7>;
81 };
82
83 regulators { 91 regulators {
84 compatible = "simple-bus"; 92 compatible = "simple-bus";
85 reg_audio: cs42888_supply { 93 reg_audio: cs42888_supply {
@@ -100,14 +108,6 @@
100 audio-codec = <&codec>; 108 audio-codec = <&codec>;
101 }; 109 };
102 110
103 clocks {
104 codec_osc: codec_osc {
105 compatible = "fixed-clock";
106 #clock-cells = <0>;
107 clock-frequency = <24576000>;
108 };
109 };
110
111 v4l2_out { 111 v4l2_out {
112 compatible = "fsl,mxc_v4l2_output"; 112 compatible = "fsl,mxc_v4l2_output";
113 status = "okay"; 113 status = "okay";
@@ -130,6 +130,12 @@
130 }; 130 };
131}; 131};
132 132
133&esai {
134 pinctrl-names = "default";
135 pinctrl-0 = <&pinctrl_esai_2>;
136 status = "okay";
137};
138
133&fec { 139&fec {
134 pinctrl-names = "default"; 140 pinctrl-names = "default";
135 pinctrl-0 = <&pinctrl_enet_2>; 141 pinctrl-0 = <&pinctrl_enet_2>;
@@ -137,6 +143,31 @@
137 status = "okay"; 143 status = "okay";
138}; 144};
139 145
146&gpc {
147 fsl,cpu_pupscr_sw2iso = <0xf>;
148 fsl,cpu_pupscr_sw = <0xf>;
149 fsl,cpu_pdnscr_iso2sw = <0x1>;
150 fsl,cpu_pdnscr_iso = <0x1>;
151};
152
153&hdmi_cec {
154 pinctrl-names = "default";
155 pinctrl-0 = <&pinctrl_hdmi_cec_1>;
156 status = "okay";
157};
158
159&hdmi_core {
160 ipu_id = <0>;
161 disp_id = <1>;
162 status = "okay";
163};
164
165&hdmi_video {
166 fsl,phy_reg_vlev = <0x0294>;
167 fsl,phy_reg_cksymtx = <0x800d>;
168 status = "okay";
169};
170
140&i2c2 { 171&i2c2 {
141 clock-frequency = <100000>; 172 clock-frequency = <100000>;
142 pinctrl-names = "default"; 173 pinctrl-names = "default";
@@ -238,6 +269,22 @@
238 }; 269 };
239}; 270};
240 271
272&ldb {
273 ipu_id = <1>;
274 disp_id = <0>;
275 ext_ref = <1>;
276 mode = "sep0";
277 sec_ipu_id = <1>;
278 sec_disp_id = <1>;
279 status = "okay";
280};
281
282&pwm3 {
283 pinctrl-names = "default";
284 pinctrl-0 = <&pinctrl_pwm3_1>;
285 status = "okay";
286};
287
241&uart3 { 288&uart3 {
242 pinctrl-names = "default"; 289 pinctrl-names = "default";
243 pinctrl-0 = <&pinctrl_uart3_1>; 290 pinctrl-0 = <&pinctrl_uart3_1>;
@@ -279,50 +326,3 @@
279 0x0000c000 0x1404a38e 0x00000000>; 326 0x0000c000 0x1404a38e 0x00000000>;
280 }; 327 };
281}; 328};
282
283&ldb {
284 ipu_id = <1>;
285 disp_id = <0>;
286 ext_ref = <1>;
287 mode = "sep0";
288 sec_ipu_id = <1>;
289 sec_disp_id = <1>;
290 status = "okay";
291};
292
293&pwm3 {
294 pinctrl-names = "default";
295 pinctrl-0 = <&pinctrl_pwm3_1>;
296 status = "okay";
297};
298
299&esai {
300 pinctrl-names = "default";
301 pinctrl-0 = <&pinctrl_esai_2>;
302 status = "okay";
303};
304
305&hdmi_core {
306 ipu_id = <0>;
307 disp_id = <1>;
308 status = "okay";
309};
310
311&hdmi_video {
312 fsl,phy_reg_vlev = <0x0294>;
313 fsl,phy_reg_cksymtx = <0x800d>;
314 status = "okay";
315};
316
317&hdmi_cec {
318 pinctrl-names = "default";
319 pinctrl-0 = <&pinctrl_hdmi_cec_1>;
320 status = "okay";
321};
322
323&gpc {
324 fsl,cpu_pupscr_sw2iso = <0xf>;
325 fsl,cpu_pupscr_sw = <0xf>;
326 fsl,cpu_pdnscr_iso2sw = <0x1>;
327 fsl,cpu_pdnscr_iso = <0x1>;
328};
diff --git a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
index 2ac064328d3a..7d2d7de684fc 100644
--- a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
@@ -224,6 +224,33 @@
224 status = "okay"; 224 status = "okay";
225}; 225};
226 226
227&gpc {
228 fsl,cpu_pupscr_sw2iso = <0xf>;
229 fsl,cpu_pupscr_sw = <0xf>;
230 fsl,cpu_pdnscr_iso2sw = <0x1>;
231 fsl,cpu_pdnscr_iso = <0x1>;
232};
233
234&hdmi_cec {
235 pinctrl-names = "default";
236 pinctrl-0 = <&pinctrl_hdmi_cec_2>;
237 status = "okay";
238};
239
240&hdmi_core {
241 ipu_id = <0>;
242 disp_id = <0>;
243 status = "okay";
244};
245
246&hdmi_video {
247 pinctrl-names = "default";
248 pinctrl-0 = <&pinctrl_hdmi_hdcp_1>;
249 fsl,phy_reg_vlev = <0x0294>;
250 fsl,phy_reg_cksymtx = <0x800d>;
251 status = "okay";
252};
253
227&i2c1 { 254&i2c1 {
228 clock-frequency = <100000>; 255 clock-frequency = <100000>;
229 pinctrl-names = "default"; 256 pinctrl-names = "default";
@@ -466,6 +493,15 @@
466 status = "okay"; 493 status = "okay";
467}; 494};
468 495
496&mipi_dsi {
497 dev_id = <0>;
498 disp_id = <0>;
499 lcd_panel = "TRULY-WVGA";
500 disp-power-on-supply = <&reg_mipi_dsi_pwr_on>;
501 resets = <&mipi_dsi_reset>;
502 status = "okay";
503};
504
469&pwm1 { 505&pwm1 {
470 pinctrl-names = "default"; 506 pinctrl-names = "default";
471 pinctrl-0 = <&pinctrl_pwm1_1>; 507 pinctrl-0 = <&pinctrl_pwm1_1>;
@@ -483,15 +519,6 @@
483 status = "okay"; 519 status = "okay";
484}; 520};
485 521
486&mipi_dsi {
487 dev_id = <0>;
488 disp_id = <0>;
489 lcd_panel = "TRULY-WVGA";
490 disp-power-on-supply = <&reg_mipi_dsi_pwr_on>;
491 resets = <&mipi_dsi_reset>;
492 status = "okay";
493};
494
495&usbh1 { 522&usbh1 {
496 vbus-supply = <&reg_usb_h1_vbus>; 523 vbus-supply = <&reg_usb_h1_vbus>;
497 status = "okay"; 524 status = "okay";
@@ -520,30 +547,3 @@
520 wp-gpios = <&gpio2 1 0>; 547 wp-gpios = <&gpio2 1 0>;
521 status = "okay"; 548 status = "okay";
522}; 549};
523
524&hdmi_core {
525 ipu_id = <0>;
526 disp_id = <0>;
527 status = "okay";
528};
529
530&hdmi_video {
531 pinctrl-names = "default";
532 pinctrl-0 = <&pinctrl_hdmi_hdcp_1>;
533 fsl,phy_reg_vlev = <0x0294>;
534 fsl,phy_reg_cksymtx = <0x800d>;
535 status = "okay";
536};
537
538&hdmi_cec {
539 pinctrl-names = "default";
540 pinctrl-0 = <&pinctrl_hdmi_cec_2>;
541 status = "okay";
542};
543
544&gpc {
545 fsl,cpu_pupscr_sw2iso = <0xf>;
546 fsl,cpu_pupscr_sw = <0xf>;
547 fsl,cpu_pdnscr_iso2sw = <0x1>;
548 fsl,cpu_pdnscr_iso = <0x1>;
549};
diff --git a/arch/arm/boot/dts/imx6sl-evk.dts b/arch/arm/boot/dts/imx6sl-evk.dts
index 8c8938d5cd04..ae1fa96bb49a 100644
--- a/arch/arm/boot/dts/imx6sl-evk.dts
+++ b/arch/arm/boot/dts/imx6sl-evk.dts
@@ -46,6 +46,13 @@
46 status = "okay"; 46 status = "okay";
47}; 47};
48 48
49&gpc {
50 fsl,cpu_pupscr_sw2iso = <0xf>;
51 fsl,cpu_pupscr_sw = <0xf>;
52 fsl,cpu_pdnscr_iso2sw = <0x1>;
53 fsl,cpu_pdnscr_iso = <0x1>;
54};
55
49&i2c1 { 56&i2c1 {
50 clock-frequency = <100000>; 57 clock-frequency = <100000>;
51 pinctrl-names = "default"; 58 pinctrl-names = "default";
@@ -130,6 +137,10 @@
130 status = "okay"; 137 status = "okay";
131}; 138};
132 139
140&pxp {
141 status = "okay";
142};
143
133&uart1 { 144&uart1 {
134 pinctrl-names = "default"; 145 pinctrl-names = "default";
135 pinctrl-0 = <&pinctrl_uart1_1>; 146 pinctrl-0 = <&pinctrl_uart1_1>;
@@ -159,14 +170,3 @@
159 cd-gpios = <&gpio3 22 0>; 170 cd-gpios = <&gpio3 22 0>;
160 status = "okay"; 171 status = "okay";
161}; 172};
162
163&pxp {
164 status = "okay";
165};
166
167&gpc {
168 fsl,cpu_pupscr_sw2iso = <0xf>;
169 fsl,cpu_pupscr_sw = <0xf>;
170 fsl,cpu_pdnscr_iso2sw = <0x1>;
171 fsl,cpu_pdnscr_iso = <0x1>;
172};
generated by cgit v1.2.2 (git 2.25.0) at 2025-09-01 07:25:14 -0400