diff options
author | Lothar Waßmann <LW@KARO-electronics.de> | 2013-09-19 02:59:48 -0400 |
---|---|---|
committer | Shawn Guo <shawn.guo@linaro.org> | 2013-09-26 01:01:36 -0400 |
commit | bc3875f1a61e30dc56b00ffbd55daabce271e2ee (patch) | |
tree | 178809cf8235854c22018bf4cb753494b9c3fde8 /arch/arm/boot/dts/imx28-cfa10036.dts | |
parent | ff04b40152d04260f04664cecae4194f4c6d399d (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/imx28-cfa10036.dts')
-rw-r--r-- | arch/arm/boot/dts/imx28-cfa10036.dts | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/imx28-cfa10036.dts b/arch/arm/boot/dts/imx28-cfa10036.dts index 1ec8c94bbac9..2474207951fb 100644 --- a/arch/arm/boot/dts/imx28-cfa10036.dts +++ b/arch/arm/boot/dts/imx28-cfa10036.dts | |||
@@ -10,7 +10,7 @@ | |||
10 | */ | 10 | */ |
11 | 11 | ||
12 | /dts-v1/; | 12 | /dts-v1/; |
13 | /include/ "imx28.dtsi" | 13 | #include "imx28.dtsi" |
14 | 14 | ||
15 | / { | 15 | / { |
16 | model = "Crystalfontz CFA-10036 Board"; | 16 | model = "Crystalfontz CFA-10036 Board"; |
@@ -26,7 +26,7 @@ | |||
26 | ssd1306_cfa10036: ssd1306-10036@0 { | 26 | ssd1306_cfa10036: ssd1306-10036@0 { |
27 | reg = <0>; | 27 | reg = <0>; |
28 | fsl,pinmux-ids = < | 28 | fsl,pinmux-ids = < |
29 | 0x2073 /* MX28_PAD_SSP0_D7__GPIO_2_7 */ | 29 | MX28_PAD_SSP0_DATA7__GPIO_2_7 |
30 | >; | 30 | >; |
31 | fsl,drive-strength = <0>; | 31 | fsl,drive-strength = <0>; |
32 | fsl,voltage = <1>; | 32 | fsl,voltage = <1>; |
@@ -36,7 +36,7 @@ | |||
36 | led_pins_cfa10036: leds-10036@0 { | 36 | led_pins_cfa10036: leds-10036@0 { |
37 | reg = <0>; | 37 | reg = <0>; |
38 | fsl,pinmux-ids = < | 38 | fsl,pinmux-ids = < |
39 | 0x3043 /* MX28_PAD_AUART1_RX__GPIO_3_4 */ | 39 | MX28_PAD_AUART1_RX__GPIO_3_4 |
40 | >; | 40 | >; |
41 | fsl,drive-strength = <0>; | 41 | fsl,drive-strength = <0>; |
42 | fsl,voltage = <1>; | 42 | fsl,voltage = <1>; |
@@ -46,7 +46,7 @@ | |||
46 | usb0_otg_cfa10036: otg-10036@0 { | 46 | usb0_otg_cfa10036: otg-10036@0 { |
47 | reg = <0>; | 47 | reg = <0>; |
48 | fsl,pinmux-ids = < | 48 | fsl,pinmux-ids = < |
49 | 0x0142 /* MX28_PAD_GPMI_READY0__USB0_ID */ | 49 | MX28_PAD_GPMI_RDY0__USB0_ID |
50 | >; | 50 | >; |
51 | fsl,drive-strength = <0>; | 51 | fsl,drive-strength = <0>; |
52 | fsl,voltage = <1>; | 52 | fsl,voltage = <1>; |