From: Linus Walleij <linus.walleij@stericsson.com>
Date: Thu, 2 Dec 2010 11:05:18 +0000 (+0100)
Subject: ux500: minor revision to the eMMC/SD config
X-Git-Tag: v2.6.38-rc1~471^2^2~1^2~29
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=edaa86a4142474c99e4741efb6a916067978a1ee;p=~shefty%2Frdma-dev.git

ux500: minor revision to the eMMC/SD config

A small fixup for the v1(.0) ASIC.

Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
---

diff --git a/arch/arm/mach-ux500/board-mop500-sdi.c b/arch/arm/mach-ux500/board-mop500-sdi.c
index be5e8ccb97c..4b996676594 100644
--- a/arch/arm/mach-ux500/board-mop500-sdi.c
+++ b/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);
 	}