diff options
| author | Philippe Langlais <philippe.langlais@linaro.org> | 2012-03-09 08:22:48 +0100 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@linaro.org> | 2012-03-19 08:56:55 +0100 |
| commit | 285f0b3fe3a59c56db9ae68e6a1ae0e2a67b72f9 (patch) | |
| tree | b2f53758c02bf4259863a0e2ac1537c837a50259 | |
| parent | dc84273d06bd9a78f951ac56509df64f3581996b (diff) | |
mmc: mach-ux500: Update U8520 SD-card GPIO pins
ST-Ericsson ID: 371953
Signed-off-by: Bengt Jonsson <bengt.g.jonsson@stericsson.com>
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500-sdi.c | 13 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500.c | 5 |
2 files changed, 17 insertions, 1 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-sdi.c b/arch/arm/mach-ux500/board-mop500-sdi.c index 118d29b863f..e043a31ce25 100644 --- a/arch/arm/mach-ux500/board-mop500-sdi.c +++ b/arch/arm/mach-ux500/board-mop500-sdi.c @@ -316,3 +316,16 @@ void __init hrefv60_sdi_init(void) sdi0_vsel = HREFV60_SDMMC_1V8_3V_GPIO; sdi0_sdi1_configure(); } + +void __init mach_u8520_sdi_init(void) +{ + /* PoP:ed eMMC */ + db8500_add_sdi2(&mop500_sdi2_data, U8500_SDI_V2_PERIPHID); + /* On-board eMMC */ + db8500_add_sdi4(&mop500_sdi4_data, U8500_SDI_V2_PERIPHID); + /* External Micro SD slot */ + mop500_sdi0_data.gpio_cd = U8520_SDMMC_CD_GPIO; + sdi0_en = U8520_SDMMC_EN_GPIO; + sdi0_vsel = U8520_SDMMC_1V8_3V_GPIO; + sdi0_sdi1_configure(); +} diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index 5c00712907d..09a3729995b 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -673,7 +673,10 @@ static void __init hrefv60_init_machine(void) ARRAY_SIZE(mop500_platform_devs)); mop500_i2c_init(); - hrefv60_sdi_init(); + if (machine_is_u8520()) + mach_u8520_sdi_init(); + else + hrefv60_sdi_init(); mop500_spi_init(); mop500_uart_init(); |