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-m28evk.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-m28evk.dts')
-rw-r--r-- | arch/arm/boot/dts/imx28-m28evk.dts | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/boot/dts/imx28-m28evk.dts b/arch/arm/boot/dts/imx28-m28evk.dts index 0d322a2bebaf..9f3271dcc7d9 100644 --- a/arch/arm/boot/dts/imx28-m28evk.dts +++ b/arch/arm/boot/dts/imx28-m28evk.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 = "DENX M28EVK"; | 16 | model = "DENX M28EVK"; |
@@ -92,11 +92,11 @@ | |||
92 | hog_pins_a: hog@0 { | 92 | hog_pins_a: hog@0 { |
93 | reg = <0>; | 93 | reg = <0>; |
94 | fsl,pinmux-ids = < | 94 | fsl,pinmux-ids = < |
95 | 0x31c3 /* MX28_PAD_PWM3__GPIO_3_28 */ | 95 | MX28_PAD_PWM3__GPIO_3_28 |
96 | 0x30a3 /* MX28_PAD_AUART2_CTS__GPIO_3_10 */ | 96 | MX28_PAD_AUART2_CTS__GPIO_3_10 |
97 | 0x30b3 /* MX28_PAD_AUART2_RTS__GPIO_3_11 */ | 97 | MX28_PAD_AUART2_RTS__GPIO_3_11 |
98 | 0x30c3 /* MX28_PAD_AUART3_RX__GPIO_3_12 */ | 98 | MX28_PAD_AUART3_RX__GPIO_3_12 |
99 | 0x30d3 /* MX28_PAD_AUART3_TX__GPIO_3_13 */ | 99 | MX28_PAD_AUART3_TX__GPIO_3_13 |
100 | >; | 100 | >; |
101 | fsl,drive-strength = <0>; | 101 | fsl,drive-strength = <0>; |
102 | fsl,voltage = <1>; | 102 | fsl,voltage = <1>; |
@@ -106,8 +106,8 @@ | |||
106 | lcdif_pins_m28: lcdif-m28@0 { | 106 | lcdif_pins_m28: lcdif-m28@0 { |
107 | reg = <0>; | 107 | reg = <0>; |
108 | fsl,pinmux-ids = < | 108 | fsl,pinmux-ids = < |
109 | 0x11e0 /* MX28_PAD_LCD_DOTCLK__LCD_DOTCLK */ | 109 | MX28_PAD_LCD_DOTCLK__LCD_DOTCLK |
110 | 0x11f0 /* MX28_PAD_LCD_ENABLE__LCD_ENABLE */ | 110 | MX28_PAD_LCD_ENABLE__LCD_ENABLE |
111 | >; | 111 | >; |
112 | fsl,drive-strength = <0>; | 112 | fsl,drive-strength = <0>; |
113 | fsl,voltage = <1>; | 113 | fsl,voltage = <1>; |