From 5f30db2a3d62fdd418699138c8771773cb2c97b7 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Wed, 22 Aug 2012 13:25:32 -0300 Subject: [PATCH] --- yaml --- r: 326734 b: refs/heads/master c: 74b42123f2605ab83bb264fac8ea57cd33e2580c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/boot/dts/imx23-evk.dts | 1 + trunk/arch/arm/boot/dts/imx23.dtsi | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 53c5b5ea5263..a9d8e0fe4541 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e0e35b48a81d7bf4d9894b6e506ad8fbf8abf811 +refs/heads/master: 74b42123f2605ab83bb264fac8ea57cd33e2580c diff --git a/trunk/arch/arm/boot/dts/imx23-evk.dts b/trunk/arch/arm/boot/dts/imx23-evk.dts index 1093dd55c87a..035c13f9d3c0 100644 --- a/trunk/arch/arm/boot/dts/imx23-evk.dts +++ b/trunk/arch/arm/boot/dts/imx23-evk.dts @@ -48,6 +48,7 @@ 0x1123 /* MX23_PAD_LCD_RESET__GPIO_1_18 */ 0x11d3 /* MX23_PAD_PWM3__GPIO_1_29 */ 0x11e3 /* MX23_PAD_PWM4__GPIO_1_30 */ + 0x2010 /* MX23_PAD_SSP1_DETECT__SSP1_DETECT */ >; fsl,drive-strength = <0>; fsl,voltage = <1>; diff --git a/trunk/arch/arm/boot/dts/imx23.dtsi b/trunk/arch/arm/boot/dts/imx23.dtsi index 9700872794d0..b00f3cfb3bf8 100644 --- a/trunk/arch/arm/boot/dts/imx23.dtsi +++ b/trunk/arch/arm/boot/dts/imx23.dtsi @@ -194,7 +194,6 @@ 0x2040 /* MX23_PAD_SSP1_DATA2__SSP1_DATA2 */ 0x2050 /* MX23_PAD_SSP1_DATA3__SSP1_DATA3 */ 0x2000 /* MX23_PAD_SSP1_CMD__SSP1_CMD */ - 0x2010 /* MX23_PAD_SSP1_DETECT__SSP1_DETECT */ 0x2060 /* MX23_PAD_SSP1_SCK__SSP1_SCK */ >; fsl,drive-strength = <1>;