* [PATCH] ARM: imx: fix imx51 babbage SD2 CD/WP
@ 2012-08-24 3:33 Shawn Guo
2012-08-28 8:06 ` Sascha Hauer
0 siblings, 1 reply; 2+ messages in thread
From: Shawn Guo @ 2012-08-24 3:33 UTC (permalink / raw)
To: linux-arm-kernel
Pads GPIO1_6 and GPIO1_5 are used as SD2 CD/WP on imx51 babbage board.
Before commit 5d23b39 (ARM: i.MX51 iomux: add missed definitions for
SION-bit and mode for some pads) gets in, we use the pad settings
configured by bootloader with NO_PAD_CTRL and SD2 CD/WP just works.
The commit changes the pad settings and causes SD2 CD/WP stop working.
Set up pads GPIO1_6 and GPIO1_5 in the configuation that bootloader
uses on imx51 babbage board to fix the SD2 CD/WP regression.
Cc: <stable@vger.kernel.org>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---
arch/arm/mach-imx/mach-mx51_babbage.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-imx/mach-mx51_babbage.c b/arch/arm/mach-imx/mach-mx51_babbage.c
index 7b31cbd..83f49c4 100644
--- a/arch/arm/mach-imx/mach-mx51_babbage.c
+++ b/arch/arm/mach-imx/mach-mx51_babbage.c
@@ -154,8 +154,8 @@ static iomux_v3_cfg_t mx51babbage_pads[] = {
MX51_PAD_SD2_DATA2__SD2_DATA2,
MX51_PAD_SD2_DATA3__SD2_DATA3,
/* CD/WP gpio */
- MX51_PAD_GPIO1_6__GPIO1_6,
- MX51_PAD_GPIO1_5__GPIO1_5,
+ NEW_PAD_CTRL(MX51_PAD_GPIO1_6__GPIO1_6, PAD_CTL_HYS),
+ NEW_PAD_CTRL(MX51_PAD_GPIO1_5__GPIO1_5, PAD_CTL_HYS),
/* eCSPI1 */
MX51_PAD_CSPI1_MISO__ECSPI1_MISO,
--
1.7.5.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH] ARM: imx: fix imx51 babbage SD2 CD/WP
2012-08-24 3:33 [PATCH] ARM: imx: fix imx51 babbage SD2 CD/WP Shawn Guo
@ 2012-08-28 8:06 ` Sascha Hauer
0 siblings, 0 replies; 2+ messages in thread
From: Sascha Hauer @ 2012-08-28 8:06 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Aug 24, 2012 at 11:33:47AM +0800, Shawn Guo wrote:
> Pads GPIO1_6 and GPIO1_5 are used as SD2 CD/WP on imx51 babbage board.
> Before commit 5d23b39 (ARM: i.MX51 iomux: add missed definitions for
> SION-bit and mode for some pads) gets in, we use the pad settings
> configured by bootloader with NO_PAD_CTRL and SD2 CD/WP just works.
> The commit changes the pad settings and causes SD2 CD/WP stop working.
>
> Set up pads GPIO1_6 and GPIO1_5 in the configuation that bootloader
> uses on imx51 babbage board to fix the SD2 CD/WP regression.
>
> Cc: <stable@vger.kernel.org>
> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
> ---
> arch/arm/mach-imx/mach-mx51_babbage.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-imx/mach-mx51_babbage.c b/arch/arm/mach-imx/mach-mx51_babbage.c
> index 7b31cbd..83f49c4 100644
> --- a/arch/arm/mach-imx/mach-mx51_babbage.c
> +++ b/arch/arm/mach-imx/mach-mx51_babbage.c
> @@ -154,8 +154,8 @@ static iomux_v3_cfg_t mx51babbage_pads[] = {
> MX51_PAD_SD2_DATA2__SD2_DATA2,
> MX51_PAD_SD2_DATA3__SD2_DATA3,
> /* CD/WP gpio */
> - MX51_PAD_GPIO1_6__GPIO1_6,
> - MX51_PAD_GPIO1_5__GPIO1_5,
> + NEW_PAD_CTRL(MX51_PAD_GPIO1_6__GPIO1_6, PAD_CTL_HYS),
> + NEW_PAD_CTRL(MX51_PAD_GPIO1_5__GPIO1_5, PAD_CTL_HYS),
>
> /* eCSPI1 */
> MX51_PAD_CSPI1_MISO__ECSPI1_MISO,
> --
> 1.7.5.4
>
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-08-28 8:06 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-08-24 3:33 [PATCH] ARM: imx: fix imx51 babbage SD2 CD/WP Shawn Guo
2012-08-28 8:06 ` Sascha Hauer
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.