From 649d7b7e493459ed181e105bb5a50791b06bad7c Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Thu, 2 Dec 2010 12:05:18 +0100 Subject: [PATCH] --- yaml --- r: 226004 b: refs/heads/master c: edaa86a4142474c99e4741efb6a916067978a1ee h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-ux500/board-mop500-sdi.c | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 966bf25e0573..0601b8332d74 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a5de3dc240eb4e58f02b199ed529c17b65f9adfb +refs/heads/master: edaa86a4142474c99e4741efb6a916067978a1ee diff --git a/trunk/arch/arm/mach-ux500/board-mop500-sdi.c b/trunk/arch/arm/mach-ux500/board-mop500-sdi.c index be5e8ccb97cc..4b996676594e 100644 --- a/trunk/arch/arm/mach-ux500/board-mop500-sdi.c +++ b/trunk/arch/arm/mach-ux500/board-mop500-sdi.c @@ -137,12 +137,21 @@ static struct mmci_platform_data mop500_sdi4_data = { .gpio_wp = -1, }; -void mop500_sdi_init(void) +void __init mop500_sdi_init(void) { nmk_config_pins(mop500_sdi_pins, ARRAY_SIZE(mop500_sdi_pins)); + /* + * sdi0 will finally be added when the TC35892 initializes and calls + * mop500_sdi_tc35892_init() above. + */ + + /* PoP:ed eMMC */ if (!cpu_is_u8500ed()) { nmk_config_pins(mop500_sdi2_pins, ARRAY_SIZE(mop500_sdi2_pins)); + /* POP eMMC on v1.0 has problems with high speed */ + if (!cpu_is_u8500v10()) + mop500_sdi2_data.capabilities |= MMC_CAP_MMC_HIGHSPEED; db8500_add_sdi2(&mop500_sdi2_data); }