summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/mach-mx25_3ds.c
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2011-06-21 22:41:51 +0800
committerShawn Guo <shawn.guo@linaro.org>2011-07-27 09:31:14 +0800
commit913413c307c919f8b21edccea23a9fd9d9d49a64 (patch)
treef36a4cf7e1f2111d4bdf14253476d115b5110f1f /arch/arm/mach-imx/mach-mx25_3ds.c
parentca2cc333920690db87a03c2ee3bd6f43adb3e7fb (diff)
downloadlinux-913413c307c919f8b21edccea23a9fd9d9d49a64.tar.gz
linux-913413c307c919f8b21edccea23a9fd9d9d49a64.tar.bz2
linux-913413c307c919f8b21edccea23a9fd9d9d49a64.zip
mmc: sdhci-esdhc-imx: extend card_detect and write_protect support for mx5
The patch extends card_detect and write_protect support to get mx5 family and more scenarios supported. The changes include: * Turn platform_data from optional to mandatory * Add cd_types and wp_types into platform_data to cover more use cases * Remove the use of flag ESDHC_FLAG_GPIO_FOR_CD * Adjust some machine codes to adopt the platform_data changes * Work around the issue that software reset will get card detection circuit stop working With this patch, card_detect and write_protect gets supported on mx5 based platforms. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Cc: Chris Ball <cjb@laptop.org> Acked-by: Wolfram Sang <w.sang@pengutronix.de> Tested-by: Arnaud Patard <arnaud.patard@rtp-net.org> Acked-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'arch/arm/mach-imx/mach-mx25_3ds.c')
-rw-r--r--arch/arm/mach-imx/mach-mx25_3ds.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/mach-mx25_3ds.c b/arch/arm/mach-imx/mach-mx25_3ds.c
index 01534bb61305..7f66a91df361 100644
--- a/arch/arm/mach-imx/mach-mx25_3ds.c
+++ b/arch/arm/mach-imx/mach-mx25_3ds.c
@@ -215,6 +215,8 @@ static const struct imxi2c_platform_data mx25_3ds_i2c0_data __initconst = {
static const struct esdhc_platform_data mx25pdk_esdhc_pdata __initconst = {
.wp_gpio = SD1_GPIO_WP,
.cd_gpio = SD1_GPIO_CD,
+ .wp_type = ESDHC_WP_GPIO,
+ .cd_type = ESDHC_CD_GPIO,
};
static void __init mx25pdk_init(void)