diff options
author | Philippe Langlais <philippe.langlais@linaro.org> | 2011-09-30 14:33:22 +0200 |
---|---|---|
committer | Philippe LANGLAIS <philippe.langlais@stericsson.com> | 2011-10-07 14:53:43 +0200 |
commit | e73abe1185d5abbcee765ff0d49732d9912b391b (patch) | |
tree | beb002601a1b2e33c3bc76e543b700bd7e3522d8 /arch/arm | |
parent | e32759fc6424dcbc07a07b37924c7434a01372e4 (diff) |
mach-ux500: Re-introduce specific mmc init for Snowball boards
Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
Change-Id: Ic99a3311807a0c4a0897238662773712b3524cde
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32485
Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>
Tested-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>
Diffstat (limited to 'arch/arm')
-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 b846151b468..ee49e5f7f33 100644 --- a/arch/arm/mach-ux500/board-mop500-sdi.c +++ b/arch/arm/mach-ux500/board-mop500-sdi.c @@ -275,13 +275,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(); } |