From: Vladimir Ananiev <vovan888@gmail.com>
Date: Fri, 17 Nov 2006 23:38:07 +0000 (+0200)
Subject: ARM: OMAP: Basic support for siemens sx1, MMC changes
X-Git-Tag: v2.6.21-omap1~150
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=4e00bfe6056a1eab0e68be01cab5377a1959dcef;p=linux-2.6-omap-h63xx.git

ARM: OMAP: Basic support for siemens sx1, MMC changes

This adds basic support for Siemens SX1. More patches are available,
with video driver, mixer, and serial ports working. That is enough to
do gsm calls with right userland.

Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/drivers/mmc/omap.c b/drivers/mmc/omap.c
index d30540b2761..796172a26ca 100644
--- a/drivers/mmc/omap.c
+++ b/drivers/mmc/omap.c
@@ -37,6 +37,7 @@
 #include <asm/arch/mux.h>
 #include <asm/arch/fpga.h>
 #include <asm/arch/tps65010.h>
+#include <asm/arch/board-sx1.h>
 
 #define	OMAP_MMC_REG_CMD	0x00
 #define	OMAP_MMC_REG_ARGL	0x04
@@ -907,7 +908,9 @@ static void innovator_fpga_socket_power(int on)
  */
 static void mmc_omap_power(struct mmc_omap_host *host, int on)
 {
-	if (on) {
+	if (machine_is_sx1())
+		sx1_setmmcpower(on);
+	else if (on) {
 		if (machine_is_omap_innovator())
 			innovator_fpga_socket_power(1);
 		else if (machine_is_omap_h2())