diff options
| author | Philippe Langlais <philippe.langlais@linaro.org> | 2011-09-30 14:33:22 +0200 |
|---|---|---|
| committer | Robert Marklund <robert.marklund@stericsson.com> | 2011-10-05 13:09:03 +0200 |
| commit | e5fce67d437701d6c4793fa3b785a8c2cd585ade (patch) | |
| tree | 6d40044962d8ed14aa57eb1fc61303b5aa586f03 | |
| parent | 8e8bf56103e6b5c9634d0c7662e62c1d33955322 (diff) | |
mach-ux500: Re-introduce specific mmc init for Snowball boards
Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500-sdi.c | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-sdi.c b/arch/arm/mach-ux500/board-mop500-sdi.c index e33cc07eca9..48c4ad7ca53 100644 --- a/arch/arm/mach-ux500/board-mop500-sdi.c +++ b/arch/arm/mach-ux500/board-mop500-sdi.c @@ -263,13 +263,24 @@ void __init mop500_sdi_init(void) mop500_sdi2_data.capabilities |= MMC_CAP_MMC_HIGHSPEED; } - db8500_add_sdi2(&mop500_sdi2_data, periphid); + /* sdi2 on snowball is in ATL_B mode for FSMC (LAN) */ + if (!machine_is_snowball()) + db8500_add_sdi2(&mop500_sdi2_data, periphid); + + /* On-board eMMC */ db8500_add_sdi4(&mop500_sdi4_data, periphid); - if (machine_is_hrefv60()) { - mop500_sdi0_data.gpio_cd = HREFV60_SDMMC_CD_GPIO; - sdi0_en = HREFV60_SDMMC_EN_GPIO; - sdi0_vsel = HREFV60_SDMMC_1V8_3V_GPIO; + if (machine_is_hrefv60() || machine_is_snowball()) { + if (machine_is_hrefv60()) { + mop500_sdi0_data.gpio_cd = HREFV60_SDMMC_CD_GPIO; + sdi0_en = HREFV60_SDMMC_EN_GPIO; + sdi0_vsel = HREFV60_SDMMC_1V8_3V_GPIO; + } else if (machine_is_snowball()) { + mop500_sdi0_data.gpio_cd = SNOWBALL_SDMMC_CD_GPIO; + mop500_sdi0_data.cd_invert = true; + sdi0_en = SNOWBALL_SDMMC_EN_GPIO; + sdi0_vsel = SNOWBALL_SDMMC_1V8_3V_GPIO; + } sdi0_sdi1_configure(); } |