diff options
author | Fabio Estevam <fabio.estevam@freescale.com> | 2012-08-22 12:25:32 -0400 |
---|---|---|
committer | Shawn Guo <shawn.guo@linaro.org> | 2012-08-22 22:01:30 -0400 |
commit | 74b42123f2605ab83bb264fac8ea57cd33e2580c (patch) | |
tree | 1d47c7024d2b741720ab3263ad329894a1218fbf | |
parent | e0e35b48a81d7bf4d9894b6e506ad8fbf8abf811 (diff) |
ARM: mxs: Let mmc0 pin detect be generic
Instead of assigning SSP1_DETECT inside mmc0_4bit_pins_a, let the board dts
handle this setup.
Not every board will use MX23_PAD_SSP1_DETECT as SSP1 functionality.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
-rw-r--r-- | arch/arm/boot/dts/imx23-evk.dts | 1 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx23.dtsi | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/imx23-evk.dts b/arch/arm/boot/dts/imx23-evk.dts index 1093dd55c87a..035c13f9d3c0 100644 --- a/arch/arm/boot/dts/imx23-evk.dts +++ b/arch/arm/boot/dts/imx23-evk.dts | |||
@@ -48,6 +48,7 @@ | |||
48 | 0x1123 /* MX23_PAD_LCD_RESET__GPIO_1_18 */ | 48 | 0x1123 /* MX23_PAD_LCD_RESET__GPIO_1_18 */ |
49 | 0x11d3 /* MX23_PAD_PWM3__GPIO_1_29 */ | 49 | 0x11d3 /* MX23_PAD_PWM3__GPIO_1_29 */ |
50 | 0x11e3 /* MX23_PAD_PWM4__GPIO_1_30 */ | 50 | 0x11e3 /* MX23_PAD_PWM4__GPIO_1_30 */ |
51 | 0x2010 /* MX23_PAD_SSP1_DETECT__SSP1_DETECT */ | ||
51 | >; | 52 | >; |
52 | fsl,drive-strength = <0>; | 53 | fsl,drive-strength = <0>; |
53 | fsl,voltage = <1>; | 54 | fsl,voltage = <1>; |
diff --git a/arch/arm/boot/dts/imx23.dtsi b/arch/arm/boot/dts/imx23.dtsi index 9700872794d0..b00f3cfb3bf8 100644 --- a/arch/arm/boot/dts/imx23.dtsi +++ b/arch/arm/boot/dts/imx23.dtsi | |||
@@ -194,7 +194,6 @@ | |||
194 | 0x2040 /* MX23_PAD_SSP1_DATA2__SSP1_DATA2 */ | 194 | 0x2040 /* MX23_PAD_SSP1_DATA2__SSP1_DATA2 */ |
195 | 0x2050 /* MX23_PAD_SSP1_DATA3__SSP1_DATA3 */ | 195 | 0x2050 /* MX23_PAD_SSP1_DATA3__SSP1_DATA3 */ |
196 | 0x2000 /* MX23_PAD_SSP1_CMD__SSP1_CMD */ | 196 | 0x2000 /* MX23_PAD_SSP1_CMD__SSP1_CMD */ |
197 | 0x2010 /* MX23_PAD_SSP1_DETECT__SSP1_DETECT */ | ||
198 | 0x2060 /* MX23_PAD_SSP1_SCK__SSP1_SCK */ | 197 | 0x2060 /* MX23_PAD_SSP1_SCK__SSP1_SCK */ |
199 | >; | 198 | >; |
200 | fsl,drive-strength = <1>; | 199 | fsl,drive-strength = <1>; |