aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/imx23.dtsi
diff options
context:
space:
mode:
authorLothar Waßmann <LW@KARO-electronics.de>2013-09-19 02:59:48 -0400
committerShawn Guo <shawn.guo@linaro.org>2013-09-26 01:01:36 -0400
commitbc3875f1a61e30dc56b00ffbd55daabce271e2ee (patch)
tree178809cf8235854c22018bf4cb753494b9c3fde8 /arch/arm/boot/dts/imx23.dtsi
parentff04b40152d04260f04664cecae4194f4c6d399d (diff)
ARM: dts: mxs: modify mx23/mx28 dts files to use pinctrl headers
Convert mx23/mx28 dts filed to use the pinctrl header files. NOTE: During automatic conversion of these files to use the pinconfig definitions an inconsistency has been found in: arch/arm/boot/dts/imx28-apx4devkit.dts According to the comment the function for pad SSP2_SS0 should have been MX28_PAD_SSP2_SS0__GPIO_2_19, while the given value 0x2131 represents: MX28_PAD_SSP2_SS0__AUART3_TX I used the later (though probably wrong) definition because that's what is actually being used in the DTB. Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Diffstat (limited to 'arch/arm/boot/dts/imx23.dtsi')
-rw-r--r--arch/arm/boot/dts/imx23.dtsi163
1 files changed, 82 insertions, 81 deletions
diff --git a/arch/arm/boot/dts/imx23.dtsi b/arch/arm/boot/dts/imx23.dtsi
index 28b5ce289662..ff96e592ec3c 100644
--- a/arch/arm/boot/dts/imx23.dtsi
+++ b/arch/arm/boot/dts/imx23.dtsi
@@ -9,7 +9,8 @@
9 * http://www.gnu.org/copyleft/gpl.html 9 * http://www.gnu.org/copyleft/gpl.html
10 */ 10 */
11 11
12/include/ "skeleton.dtsi" 12#include "skeleton.dtsi"
13#include "imx23-pinfunc.h"
13 14
14/ { 15/ {
15 interrupt-parent = <&icoll>; 16 interrupt-parent = <&icoll>;
@@ -137,8 +138,8 @@
137 duart_pins_a: duart@0 { 138 duart_pins_a: duart@0 {
138 reg = <0>; 139 reg = <0>;
139 fsl,pinmux-ids = < 140 fsl,pinmux-ids = <
140 0x11a2 /* MX23_PAD_PWM0__DUART_RX */ 141 MX23_PAD_PWM0__DUART_RX
141 0x11b2 /* MX23_PAD_PWM1__DUART_TX */ 142 MX23_PAD_PWM1__DUART_TX
142 >; 143 >;
143 fsl,drive-strength = <0>; 144 fsl,drive-strength = <0>;
144 fsl,voltage = <1>; 145 fsl,voltage = <1>;
@@ -148,10 +149,10 @@
148 auart0_pins_a: auart0@0 { 149 auart0_pins_a: auart0@0 {
149 reg = <0>; 150 reg = <0>;
150 fsl,pinmux-ids = < 151 fsl,pinmux-ids = <
151 0x01c0 /* MX23_PAD_AUART1_RX__AUART1_RX */ 152 MX23_PAD_AUART1_RX__AUART1_RX
152 0x01d0 /* MX23_PAD_AUART1_TX__AUART1_TX */ 153 MX23_PAD_AUART1_TX__AUART1_TX
153 0x01a0 /* MX23_PAD_AUART1_CTS__AUART1_CTS */ 154 MX23_PAD_AUART1_CTS__AUART1_CTS
154 0x01b0 /* MX23_PAD_AUART1_RTS__AUART1_RTS */ 155 MX23_PAD_AUART1_RTS__AUART1_RTS
155 >; 156 >;
156 fsl,drive-strength = <0>; 157 fsl,drive-strength = <0>;
157 fsl,voltage = <1>; 158 fsl,voltage = <1>;
@@ -161,8 +162,8 @@
161 auart0_2pins_a: auart0-2pins@0 { 162 auart0_2pins_a: auart0-2pins@0 {
162 reg = <0>; 163 reg = <0>;
163 fsl,pinmux-ids = < 164 fsl,pinmux-ids = <
164 0x01e2 /* MX23_PAD_I2C_SCL__AUART1_TX */ 165 MX23_PAD_I2C_SCL__AUART1_TX
165 0x01f2 /* MX23_PAD_I2C_SDA__AUART1_RX */ 166 MX23_PAD_I2C_SDA__AUART1_RX
166 >; 167 >;
167 fsl,drive-strength = <0>; 168 fsl,drive-strength = <0>;
168 fsl,voltage = <1>; 169 fsl,voltage = <1>;
@@ -172,23 +173,23 @@
172 gpmi_pins_a: gpmi-nand@0 { 173 gpmi_pins_a: gpmi-nand@0 {
173 reg = <0>; 174 reg = <0>;
174 fsl,pinmux-ids = < 175 fsl,pinmux-ids = <
175 0x0000 /* MX23_PAD_GPMI_D00__GPMI_D00 */ 176 MX23_PAD_GPMI_D00__GPMI_D00
176 0x0010 /* MX23_PAD_GPMI_D01__GPMI_D01 */ 177 MX23_PAD_GPMI_D01__GPMI_D01
177 0x0020 /* MX23_PAD_GPMI_D02__GPMI_D02 */ 178 MX23_PAD_GPMI_D02__GPMI_D02
178 0x0030 /* MX23_PAD_GPMI_D03__GPMI_D03 */ 179 MX23_PAD_GPMI_D03__GPMI_D03
179 0x0040 /* MX23_PAD_GPMI_D04__GPMI_D04 */ 180 MX23_PAD_GPMI_D04__GPMI_D04
180 0x0050 /* MX23_PAD_GPMI_D05__GPMI_D05 */ 181 MX23_PAD_GPMI_D05__GPMI_D05
181 0x0060 /* MX23_PAD_GPMI_D06__GPMI_D06 */ 182 MX23_PAD_GPMI_D06__GPMI_D06
182 0x0070 /* MX23_PAD_GPMI_D07__GPMI_D07 */ 183 MX23_PAD_GPMI_D07__GPMI_D07
183 0x0100 /* MX23_PAD_GPMI_CLE__GPMI_CLE */ 184 MX23_PAD_GPMI_CLE__GPMI_CLE
184 0x0110 /* MX23_PAD_GPMI_ALE__GPMI_ALE */ 185 MX23_PAD_GPMI_ALE__GPMI_ALE
185 0x0130 /* MX23_PAD_GPMI_RDY0__GPMI_RDY0 */ 186 MX23_PAD_GPMI_RDY0__GPMI_RDY0
186 0x0140 /* MX23_PAD_GPMI_RDY1__GPMI_RDY1 */ 187 MX23_PAD_GPMI_RDY1__GPMI_RDY1
187 0x0170 /* MX23_PAD_GPMI_WPN__GPMI_WPN */ 188 MX23_PAD_GPMI_WPN__GPMI_WPN
188 0x0180 /* MX23_PAD_GPMI_WRN__GPMI_WRN */ 189 MX23_PAD_GPMI_WRN__GPMI_WRN
189 0x0190 /* MX23_PAD_GPMI_RDN__GPMI_RDN */ 190 MX23_PAD_GPMI_RDN__GPMI_RDN
190 0x21b0 /* MX23_PAD_GPMI_CE1N__GPMI_CE1N */ 191 MX23_PAD_GPMI_CE1N__GPMI_CE1N
191 0x21c0 /* MX23_PAD_GPMI_CE0N__GPMI_CE0N */ 192 MX23_PAD_GPMI_CE0N__GPMI_CE0N
192 >; 193 >;
193 fsl,drive-strength = <0>; 194 fsl,drive-strength = <0>;
194 fsl,voltage = <1>; 195 fsl,voltage = <1>;
@@ -197,9 +198,9 @@
197 198
198 gpmi_pins_fixup: gpmi-pins-fixup { 199 gpmi_pins_fixup: gpmi-pins-fixup {
199 fsl,pinmux-ids = < 200 fsl,pinmux-ids = <
200 0x0170 /* MX23_PAD_GPMI_WPN__GPMI_WPN */ 201 MX23_PAD_GPMI_WPN__GPMI_WPN
201 0x0180 /* MX23_PAD_GPMI_WRN__GPMI_WRN */ 202 MX23_PAD_GPMI_WRN__GPMI_WRN
202 0x0190 /* MX23_PAD_GPMI_RDN__GPMI_RDN */ 203 MX23_PAD_GPMI_RDN__GPMI_RDN
203 >; 204 >;
204 fsl,drive-strength = <2>; 205 fsl,drive-strength = <2>;
205 }; 206 };
@@ -207,12 +208,12 @@
207 mmc0_4bit_pins_a: mmc0-4bit@0 { 208 mmc0_4bit_pins_a: mmc0-4bit@0 {
208 reg = <0>; 209 reg = <0>;
209 fsl,pinmux-ids = < 210 fsl,pinmux-ids = <
210 0x2020 /* MX23_PAD_SSP1_DATA0__SSP1_DATA0 */ 211 MX23_PAD_SSP1_DATA0__SSP1_DATA0
211 0x2030 /* MX23_PAD_SSP1_DATA1__SSP1_DATA1 */ 212 MX23_PAD_SSP1_DATA1__SSP1_DATA1
212 0x2040 /* MX23_PAD_SSP1_DATA2__SSP1_DATA2 */ 213 MX23_PAD_SSP1_DATA2__SSP1_DATA2
213 0x2050 /* MX23_PAD_SSP1_DATA3__SSP1_DATA3 */ 214 MX23_PAD_SSP1_DATA3__SSP1_DATA3
214 0x2000 /* MX23_PAD_SSP1_CMD__SSP1_CMD */ 215 MX23_PAD_SSP1_CMD__SSP1_CMD
215 0x2060 /* MX23_PAD_SSP1_SCK__SSP1_SCK */ 216 MX23_PAD_SSP1_SCK__SSP1_SCK
216 >; 217 >;
217 fsl,drive-strength = <1>; 218 fsl,drive-strength = <1>;
218 fsl,voltage = <1>; 219 fsl,voltage = <1>;
@@ -222,17 +223,17 @@
222 mmc0_8bit_pins_a: mmc0-8bit@0 { 223 mmc0_8bit_pins_a: mmc0-8bit@0 {
223 reg = <0>; 224 reg = <0>;
224 fsl,pinmux-ids = < 225 fsl,pinmux-ids = <
225 0x2020 /* MX23_PAD_SSP1_DATA0__SSP1_DATA0 */ 226 MX23_PAD_SSP1_DATA0__SSP1_DATA0
226 0x2030 /* MX23_PAD_SSP1_DATA1__SSP1_DATA1 */ 227 MX23_PAD_SSP1_DATA1__SSP1_DATA1
227 0x2040 /* MX23_PAD_SSP1_DATA2__SSP1_DATA2 */ 228 MX23_PAD_SSP1_DATA2__SSP1_DATA2
228 0x2050 /* MX23_PAD_SSP1_DATA3__SSP1_DATA3 */ 229 MX23_PAD_SSP1_DATA3__SSP1_DATA3
229 0x0082 /* MX23_PAD_GPMI_D08__SSP1_DATA4 */ 230 MX23_PAD_GPMI_D08__SSP1_DATA4
230 0x0092 /* MX23_PAD_GPMI_D09__SSP1_DATA5 */ 231 MX23_PAD_GPMI_D09__SSP1_DATA5
231 0x00a2 /* MX23_PAD_GPMI_D10__SSP1_DATA6 */ 232 MX23_PAD_GPMI_D10__SSP1_DATA6
232 0x00b2 /* MX23_PAD_GPMI_D11__SSP1_DATA7 */ 233 MX23_PAD_GPMI_D11__SSP1_DATA7
233 0x2000 /* MX23_PAD_SSP1_CMD__SSP1_CMD */ 234 MX23_PAD_SSP1_CMD__SSP1_CMD
234 0x2010 /* MX23_PAD_SSP1_DETECT__SSP1_DETECT */ 235 MX23_PAD_SSP1_DETECT__SSP1_DETECT
235 0x2060 /* MX23_PAD_SSP1_SCK__SSP1_SCK */ 236 MX23_PAD_SSP1_SCK__SSP1_SCK
236 >; 237 >;
237 fsl,drive-strength = <1>; 238 fsl,drive-strength = <1>;
238 fsl,voltage = <1>; 239 fsl,voltage = <1>;
@@ -241,8 +242,8 @@
241 242
242 mmc0_pins_fixup: mmc0-pins-fixup { 243 mmc0_pins_fixup: mmc0-pins-fixup {
243 fsl,pinmux-ids = < 244 fsl,pinmux-ids = <
244 0x2010 /* MX23_PAD_SSP1_DETECT__SSP1_DETECT */ 245 MX23_PAD_SSP1_DETECT__SSP1_DETECT
245 0x2060 /* MX23_PAD_SSP1_SCK__SSP1_SCK */ 246 MX23_PAD_SSP1_SCK__SSP1_SCK
246 >; 247 >;
247 fsl,pull-up = <0>; 248 fsl,pull-up = <0>;
248 }; 249 };
@@ -250,7 +251,7 @@
250 pwm2_pins_a: pwm2@0 { 251 pwm2_pins_a: pwm2@0 {
251 reg = <0>; 252 reg = <0>;
252 fsl,pinmux-ids = < 253 fsl,pinmux-ids = <
253 0x11c0 /* MX23_PAD_PWM2__PWM2 */ 254 MX23_PAD_PWM2__PWM2
254 >; 255 >;
255 fsl,drive-strength = <0>; 256 fsl,drive-strength = <0>;
256 fsl,voltage = <1>; 257 fsl,voltage = <1>;
@@ -260,34 +261,34 @@
260 lcdif_24bit_pins_a: lcdif-24bit@0 { 261 lcdif_24bit_pins_a: lcdif-24bit@0 {
261 reg = <0>; 262 reg = <0>;
262 fsl,pinmux-ids = < 263 fsl,pinmux-ids = <
263 0x1000 /* MX23_PAD_LCD_D00__LCD_D0 */ 264 MX23_PAD_LCD_D00__LCD_D00
264 0x1010 /* MX23_PAD_LCD_D01__LCD_D1 */ 265 MX23_PAD_LCD_D01__LCD_D01
265 0x1020 /* MX23_PAD_LCD_D02__LCD_D2 */ 266 MX23_PAD_LCD_D02__LCD_D02
266 0x1030 /* MX23_PAD_LCD_D03__LCD_D3 */ 267 MX23_PAD_LCD_D03__LCD_D03
267 0x1040 /* MX23_PAD_LCD_D04__LCD_D4 */ 268 MX23_PAD_LCD_D04__LCD_D04
268 0x1050 /* MX23_PAD_LCD_D05__LCD_D5 */ 269 MX23_PAD_LCD_D05__LCD_D05
269 0x1060 /* MX23_PAD_LCD_D06__LCD_D6 */ 270 MX23_PAD_LCD_D06__LCD_D06
270 0x1070 /* MX23_PAD_LCD_D07__LCD_D7 */ 271 MX23_PAD_LCD_D07__LCD_D07
271 0x1080 /* MX23_PAD_LCD_D08__LCD_D8 */ 272 MX23_PAD_LCD_D08__LCD_D08
272 0x1090 /* MX23_PAD_LCD_D09__LCD_D9 */ 273 MX23_PAD_LCD_D09__LCD_D09
273 0x10a0 /* MX23_PAD_LCD_D10__LCD_D10 */ 274 MX23_PAD_LCD_D10__LCD_D10
274 0x10b0 /* MX23_PAD_LCD_D11__LCD_D11 */ 275 MX23_PAD_LCD_D11__LCD_D11
275 0x10c0 /* MX23_PAD_LCD_D12__LCD_D12 */ 276 MX23_PAD_LCD_D12__LCD_D12
276 0x10d0 /* MX23_PAD_LCD_D13__LCD_D13 */ 277 MX23_PAD_LCD_D13__LCD_D13
277 0x10e0 /* MX23_PAD_LCD_D14__LCD_D14 */ 278 MX23_PAD_LCD_D14__LCD_D14
278 0x10f0 /* MX23_PAD_LCD_D15__LCD_D15 */ 279 MX23_PAD_LCD_D15__LCD_D15
279 0x1100 /* MX23_PAD_LCD_D16__LCD_D16 */ 280 MX23_PAD_LCD_D16__LCD_D16
280 0x1110 /* MX23_PAD_LCD_D17__LCD_D17 */ 281 MX23_PAD_LCD_D17__LCD_D17
281 0x0081 /* MX23_PAD_GPMI_D08__LCD_D18 */ 282 MX23_PAD_GPMI_D08__LCD_D18
282 0x0091 /* MX23_PAD_GPMI_D09__LCD_D19 */ 283 MX23_PAD_GPMI_D09__LCD_D19
283 0x00a1 /* MX23_PAD_GPMI_D10__LCD_D20 */ 284 MX23_PAD_GPMI_D10__LCD_D20
284 0x00b1 /* MX23_PAD_GPMI_D11__LCD_D21 */ 285 MX23_PAD_GPMI_D11__LCD_D21
285 0x00c1 /* MX23_PAD_GPMI_D12__LCD_D22 */ 286 MX23_PAD_GPMI_D12__LCD_D22
286 0x00d1 /* MX23_PAD_GPMI_D13__LCD_D23 */ 287 MX23_PAD_GPMI_D13__LCD_D23
287 0x1160 /* MX23_PAD_LCD_DOTCK__LCD_DOTCK */ 288 MX23_PAD_LCD_DOTCK__LCD_DOTCK
288 0x1170 /* MX23_PAD_LCD_ENABLE__LCD_ENABLE */ 289 MX23_PAD_LCD_ENABLE__LCD_ENABLE
289 0x1180 /* MX23_PAD_LCD_HSYNC__LCD_HSYNC */ 290 MX23_PAD_LCD_HSYNC__LCD_HSYNC
290 0x1190 /* MX23_PAD_LCD_VSYNC__LCD_VSYNC */ 291 MX23_PAD_LCD_VSYNC__LCD_VSYNC
291 >; 292 >;
292 fsl,drive-strength = <0>; 293 fsl,drive-strength = <0>;
293 fsl,voltage = <1>; 294 fsl,voltage = <1>;
@@ -297,10 +298,10 @@
297 spi2_pins_a: spi2@0 { 298 spi2_pins_a: spi2@0 {
298 reg = <0>; 299 reg = <0>;
299 fsl,pinmux-ids = < 300 fsl,pinmux-ids = <
300 0x0182 /* MX23_PAD_GPMI_WRN__SSP2_SCK */ 301 MX23_PAD_GPMI_WRN__SSP2_SCK
301 0x0142 /* MX23_PAD_GPMI_RDY1__SSP2_CMD */ 302 MX23_PAD_GPMI_RDY1__SSP2_CMD
302 0x0002 /* MX23_PAD_GPMI_D00__SSP2_DATA0 */ 303 MX23_PAD_GPMI_D00__SSP2_DATA0
303 0x0032 /* MX23_PAD_GPMI_D03__SSP2_DATA3 */ 304 MX23_PAD_GPMI_D03__SSP2_DATA3
304 >; 305 >;
305 fsl,drive-strength = <1>; 306 fsl,drive-strength = <1>;
306 fsl,voltage = <1>; 307 fsl,voltage = <1>;
generated by cgit v1.2.2 (git 2.25.0) at 2025-02-08 13:15:40 -0500