diff options
author | Peter Chen <peter.chen@freescale.com> | 2015-02-26 03:28:29 -0500 |
---|---|---|
committer | Shawn Guo <shawn.guo@linaro.org> | 2015-03-30 04:38:50 -0400 |
commit | 1bb733f64f2abdf5bf113244ace3e4083bac4f91 (patch) | |
tree | d3fc66df50a3c7dce3912a60568feea4d7da07c8 /arch/arm/boot/dts | |
parent | 9fca015177f9c8ecf4a25805b69c046867e7d53e (diff) |
ARM: imx6sx-sdb: change default board as reva board
The imx6sx sdb board has two revisions, the current mainline one
is reva which is experimental and mainly for internal use. In
this commit, we rename imx6sx-sdb.dts to imx6sx-sdb.dtsi, and
move the reva dedicated contents to imx6sx-sdb-reva.dts.
Signed-off-by: Peter Chen <peter.chen@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Diffstat (limited to 'arch/arm/boot/dts')
-rw-r--r-- | arch/arm/boot/dts/Makefile | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx6sx-sdb-reva.dts | 143 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx6sx-sdb.dtsi (renamed from arch/arm/boot/dts/imx6sx-sdb.dts) | 130 |
3 files changed, 144 insertions, 131 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index a1c776b8dcec..92d0389e3092 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile | |||
@@ -302,7 +302,7 @@ dtb-$(CONFIG_SOC_IMX6SL) += \ | |||
302 | imx6sl-evk.dtb | 302 | imx6sl-evk.dtb |
303 | dtb-$(CONFIG_SOC_IMX6SX) += \ | 303 | dtb-$(CONFIG_SOC_IMX6SX) += \ |
304 | imx6sx-sabreauto.dtb \ | 304 | imx6sx-sabreauto.dtb \ |
305 | imx6sx-sdb.dtb | 305 | imx6sx-sdb-reva.dtb |
306 | dtb-$(CONFIG_SOC_LS1021A) += \ | 306 | dtb-$(CONFIG_SOC_LS1021A) += \ |
307 | ls1021a-qds.dtb \ | 307 | ls1021a-qds.dtb \ |
308 | ls1021a-twr.dtb | 308 | ls1021a-twr.dtb |
diff --git a/arch/arm/boot/dts/imx6sx-sdb-reva.dts b/arch/arm/boot/dts/imx6sx-sdb-reva.dts new file mode 100644 index 000000000000..c76b87cba275 --- /dev/null +++ b/arch/arm/boot/dts/imx6sx-sdb-reva.dts | |||
@@ -0,0 +1,143 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2015 Freescale Semiconductor, Inc. | ||
3 | * | ||
4 | * This program is free software; you can redistribute it and/or modify | ||
5 | * it under the terms of the GNU General Public License version 2 as | ||
6 | * published by the Free Software Foundation. | ||
7 | */ | ||
8 | |||
9 | #include "imx6sx-sdb.dtsi" | ||
10 | |||
11 | / { | ||
12 | model = "Freescale i.MX6 SoloX SDB RevA Board"; | ||
13 | }; | ||
14 | |||
15 | &i2c1 { | ||
16 | clock-frequency = <100000>; | ||
17 | pinctrl-names = "default"; | ||
18 | pinctrl-0 = <&pinctrl_i2c1>; | ||
19 | status = "okay"; | ||
20 | |||
21 | pmic: pfuze100@08 { | ||
22 | compatible = "fsl,pfuze100"; | ||
23 | reg = <0x08>; | ||
24 | |||
25 | regulators { | ||
26 | sw1a_reg: sw1ab { | ||
27 | regulator-min-microvolt = <300000>; | ||
28 | regulator-max-microvolt = <1875000>; | ||
29 | regulator-boot-on; | ||
30 | regulator-always-on; | ||
31 | regulator-ramp-delay = <6250>; | ||
32 | }; | ||
33 | |||
34 | sw1c_reg: sw1c { | ||
35 | regulator-min-microvolt = <300000>; | ||
36 | regulator-max-microvolt = <1875000>; | ||
37 | regulator-boot-on; | ||
38 | regulator-always-on; | ||
39 | regulator-ramp-delay = <6250>; | ||
40 | }; | ||
41 | |||
42 | sw2_reg: sw2 { | ||
43 | regulator-min-microvolt = <800000>; | ||
44 | regulator-max-microvolt = <3300000>; | ||
45 | regulator-boot-on; | ||
46 | regulator-always-on; | ||
47 | }; | ||
48 | |||
49 | sw3a_reg: sw3a { | ||
50 | regulator-min-microvolt = <400000>; | ||
51 | regulator-max-microvolt = <1975000>; | ||
52 | regulator-boot-on; | ||
53 | regulator-always-on; | ||
54 | }; | ||
55 | |||
56 | sw3b_reg: sw3b { | ||
57 | regulator-min-microvolt = <400000>; | ||
58 | regulator-max-microvolt = <1975000>; | ||
59 | regulator-boot-on; | ||
60 | regulator-always-on; | ||
61 | }; | ||
62 | |||
63 | sw4_reg: sw4 { | ||
64 | regulator-min-microvolt = <800000>; | ||
65 | regulator-max-microvolt = <3300000>; | ||
66 | }; | ||
67 | |||
68 | swbst_reg: swbst { | ||
69 | regulator-min-microvolt = <5000000>; | ||
70 | regulator-max-microvolt = <5150000>; | ||
71 | }; | ||
72 | |||
73 | snvs_reg: vsnvs { | ||
74 | regulator-min-microvolt = <1000000>; | ||
75 | regulator-max-microvolt = <3000000>; | ||
76 | regulator-boot-on; | ||
77 | regulator-always-on; | ||
78 | }; | ||
79 | |||
80 | vref_reg: vrefddr { | ||
81 | regulator-boot-on; | ||
82 | regulator-always-on; | ||
83 | }; | ||
84 | |||
85 | vgen1_reg: vgen1 { | ||
86 | regulator-min-microvolt = <800000>; | ||
87 | regulator-max-microvolt = <1550000>; | ||
88 | regulator-always-on; | ||
89 | }; | ||
90 | |||
91 | vgen2_reg: vgen2 { | ||
92 | regulator-min-microvolt = <800000>; | ||
93 | regulator-max-microvolt = <1550000>; | ||
94 | }; | ||
95 | |||
96 | vgen3_reg: vgen3 { | ||
97 | regulator-min-microvolt = <1800000>; | ||
98 | regulator-max-microvolt = <3300000>; | ||
99 | regulator-always-on; | ||
100 | }; | ||
101 | |||
102 | vgen4_reg: vgen4 { | ||
103 | regulator-min-microvolt = <1800000>; | ||
104 | regulator-max-microvolt = <3300000>; | ||
105 | regulator-always-on; | ||
106 | }; | ||
107 | |||
108 | vgen5_reg: vgen5 { | ||
109 | regulator-min-microvolt = <1800000>; | ||
110 | regulator-max-microvolt = <3300000>; | ||
111 | regulator-always-on; | ||
112 | }; | ||
113 | |||
114 | vgen6_reg: vgen6 { | ||
115 | regulator-min-microvolt = <1800000>; | ||
116 | regulator-max-microvolt = <3300000>; | ||
117 | regulator-always-on; | ||
118 | }; | ||
119 | }; | ||
120 | }; | ||
121 | }; | ||
122 | |||
123 | &qspi2 { | ||
124 | pinctrl-names = "default"; | ||
125 | pinctrl-0 = <&pinctrl_qspi2>; | ||
126 | status = "okay"; | ||
127 | |||
128 | flash0: s25fl128s@0 { | ||
129 | reg = <0>; | ||
130 | #address-cells = <1>; | ||
131 | #size-cells = <1>; | ||
132 | compatible = "spansion,s25fl128s"; | ||
133 | spi-max-frequency = <66000000>; | ||
134 | }; | ||
135 | |||
136 | flash1: s25fl128s@1 { | ||
137 | reg = <1>; | ||
138 | #address-cells = <1>; | ||
139 | #size-cells = <1>; | ||
140 | compatible = "spansion,s25fl128s"; | ||
141 | spi-max-frequency = <66000000>; | ||
142 | }; | ||
143 | }; | ||
diff --git a/arch/arm/boot/dts/imx6sx-sdb.dts b/arch/arm/boot/dts/imx6sx-sdb.dtsi index 32f07d6b4042..cef04cef3a80 100644 --- a/arch/arm/boot/dts/imx6sx-sdb.dts +++ b/arch/arm/boot/dts/imx6sx-sdb.dtsi | |||
@@ -184,114 +184,6 @@ | |||
184 | status = "okay"; | 184 | status = "okay"; |
185 | }; | 185 | }; |
186 | 186 | ||
187 | &i2c1 { | ||
188 | clock-frequency = <100000>; | ||
189 | pinctrl-names = "default"; | ||
190 | pinctrl-0 = <&pinctrl_i2c1>; | ||
191 | status = "okay"; | ||
192 | |||
193 | pmic: pfuze100@08 { | ||
194 | compatible = "fsl,pfuze100"; | ||
195 | reg = <0x08>; | ||
196 | |||
197 | regulators { | ||
198 | sw1a_reg: sw1ab { | ||
199 | regulator-min-microvolt = <300000>; | ||
200 | regulator-max-microvolt = <1875000>; | ||
201 | regulator-boot-on; | ||
202 | regulator-always-on; | ||
203 | regulator-ramp-delay = <6250>; | ||
204 | }; | ||
205 | |||
206 | sw1c_reg: sw1c { | ||
207 | regulator-min-microvolt = <300000>; | ||
208 | regulator-max-microvolt = <1875000>; | ||
209 | regulator-boot-on; | ||
210 | regulator-always-on; | ||
211 | regulator-ramp-delay = <6250>; | ||
212 | }; | ||
213 | |||
214 | sw2_reg: sw2 { | ||
215 | regulator-min-microvolt = <800000>; | ||
216 | regulator-max-microvolt = <3300000>; | ||
217 | regulator-boot-on; | ||
218 | regulator-always-on; | ||
219 | }; | ||
220 | |||
221 | sw3a_reg: sw3a { | ||
222 | regulator-min-microvolt = <400000>; | ||
223 | regulator-max-microvolt = <1975000>; | ||
224 | regulator-boot-on; | ||
225 | regulator-always-on; | ||
226 | }; | ||
227 | |||
228 | sw3b_reg: sw3b { | ||
229 | regulator-min-microvolt = <400000>; | ||
230 | regulator-max-microvolt = <1975000>; | ||
231 | regulator-boot-on; | ||
232 | regulator-always-on; | ||
233 | }; | ||
234 | |||
235 | sw4_reg: sw4 { | ||
236 | regulator-min-microvolt = <800000>; | ||
237 | regulator-max-microvolt = <3300000>; | ||
238 | }; | ||
239 | |||
240 | swbst_reg: swbst { | ||
241 | regulator-min-microvolt = <5000000>; | ||
242 | regulator-max-microvolt = <5150000>; | ||
243 | }; | ||
244 | |||
245 | snvs_reg: vsnvs { | ||
246 | regulator-min-microvolt = <1000000>; | ||
247 | regulator-max-microvolt = <3000000>; | ||
248 | regulator-boot-on; | ||
249 | regulator-always-on; | ||
250 | }; | ||
251 | |||
252 | vref_reg: vrefddr { | ||
253 | regulator-boot-on; | ||
254 | regulator-always-on; | ||
255 | }; | ||
256 | |||
257 | vgen1_reg: vgen1 { | ||
258 | regulator-min-microvolt = <800000>; | ||
259 | regulator-max-microvolt = <1550000>; | ||
260 | regulator-always-on; | ||
261 | }; | ||
262 | |||
263 | vgen2_reg: vgen2 { | ||
264 | regulator-min-microvolt = <800000>; | ||
265 | regulator-max-microvolt = <1550000>; | ||
266 | }; | ||
267 | |||
268 | vgen3_reg: vgen3 { | ||
269 | regulator-min-microvolt = <1800000>; | ||
270 | regulator-max-microvolt = <3300000>; | ||
271 | regulator-always-on; | ||
272 | }; | ||
273 | |||
274 | vgen4_reg: vgen4 { | ||
275 | regulator-min-microvolt = <1800000>; | ||
276 | regulator-max-microvolt = <3300000>; | ||
277 | regulator-always-on; | ||
278 | }; | ||
279 | |||
280 | vgen5_reg: vgen5 { | ||
281 | regulator-min-microvolt = <1800000>; | ||
282 | regulator-max-microvolt = <3300000>; | ||
283 | regulator-always-on; | ||
284 | }; | ||
285 | |||
286 | vgen6_reg: vgen6 { | ||
287 | regulator-min-microvolt = <1800000>; | ||
288 | regulator-max-microvolt = <3300000>; | ||
289 | regulator-always-on; | ||
290 | }; | ||
291 | }; | ||
292 | }; | ||
293 | }; | ||
294 | |||
295 | &i2c4 { | 187 | &i2c4 { |
296 | clock-frequency = <100000>; | 188 | clock-frequency = <100000>; |
297 | pinctrl-names = "default"; | 189 | pinctrl-names = "default"; |
@@ -355,28 +247,6 @@ | |||
355 | status = "okay"; | 247 | status = "okay"; |
356 | }; | 248 | }; |
357 | 249 | ||
358 | &qspi2 { | ||
359 | pinctrl-names = "default"; | ||
360 | pinctrl-0 = <&pinctrl_qspi2>; | ||
361 | status = "okay"; | ||
362 | |||
363 | flash0: s25fl128s@0 { | ||
364 | reg = <0>; | ||
365 | #address-cells = <1>; | ||
366 | #size-cells = <1>; | ||
367 | compatible = "spansion,s25fl128s"; | ||
368 | spi-max-frequency = <66000000>; | ||
369 | }; | ||
370 | |||
371 | flash1: s25fl128s@1 { | ||
372 | reg = <1>; | ||
373 | #address-cells = <1>; | ||
374 | #size-cells = <1>; | ||
375 | compatible = "spansion,s25fl128s"; | ||
376 | spi-max-frequency = <66000000>; | ||
377 | }; | ||
378 | }; | ||
379 | |||
380 | &ssi2 { | 250 | &ssi2 { |
381 | status = "okay"; | 251 | status = "okay"; |
382 | }; | 252 | }; |