diff options
author | guoyin.chen <guoyin.chen@freescale.com> | 2013-08-16 09:22:04 +0800 |
---|---|---|
committer | guoyin.chen <guoyin.chen@freescale.com> | 2013-08-16 09:22:04 +0800 |
commit | 7faf590b972d9ca8d65183fb61a87566abfc7a45 (patch) | |
tree | f3cc5d1df19acfa37cf3174a985843c5cc4734b3 /arch | |
parent | e4acceb9671d90e973de29ea4d6e330bc97c76ec (diff) |
ENGR00275432 [Android_MX6SL_EVK] Failed to boot if extsd card attached to SD
Register boot SD's SDHC first
Make boot SD as no removeable and always present
Signed-off-by: guoyin.chen <guoyin.chen@freescale.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-mx6/board-mx6sl_evk.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-mx6/board-mx6sl_evk.c b/arch/arm/mach-mx6/board-mx6sl_evk.c index db29587e8023..7cc1d41c85b2 100644 --- a/arch/arm/mach-mx6/board-mx6sl_evk.c +++ b/arch/arm/mach-mx6/board-mx6sl_evk.c @@ -247,12 +247,14 @@ static const struct esdhc_platform_data mx6_evk_sd1_data __initconst = { }; static const struct esdhc_platform_data mx6_evk_sd2_data __initconst = { + .always_present = 1, .cd_gpio = MX6_BRD_SD2_CD, .wp_gpio = MX6_BRD_SD2_WP, .keep_power_at_suspend = 1, .delay_line = 0, .support_18v = 1, .platform_pad_change = plt_sd_pad_change, + .cd_type = ESDHC_CD_PERMANENT, }; static const struct esdhc_platform_data mx6_evk_sd3_data __initconst = { @@ -1591,8 +1593,8 @@ static void __init mx6_evk_init(void) imx6_init_fec(fec_data); platform_device_register(&evk_vmmc_reg_devices); - imx6q_add_sdhci_usdhc_imx(0, &mx6_evk_sd1_data); imx6q_add_sdhci_usdhc_imx(1, &mx6_evk_sd2_data); + imx6q_add_sdhci_usdhc_imx(0, &mx6_evk_sd1_data); imx6q_add_sdhci_usdhc_imx(2, &mx6_evk_sd3_data); mx6_evk_init_usb(); |