From: Arun K S <arunks@mistralsolutions.com>
Date: Mon, 28 Jan 2008 15:04:57 +0000 (+0530)
Subject: omap2430sdp_mmc_fix
X-Git-Tag: v2.6.24-omap1~10
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=3887ae26bc85264be4827968d9c496445d334e4f;p=linux-2.6-omap-h63xx.git

omap2430sdp_mmc_fix

The PRCM (0x490022E8)register was overwritten by the MMC code
which made the other peripherals like USB etc to stop working.
The following patch fixes the modification of PRCM register by
the MMC code. This patch is tested here on the OMAP2430 SDP board.

Signed-off-by: Arun K S <arunks@mistralsolutions.com>
Ack-by: Madhusudhan Chikkature Rajashekar" <madhu.cr@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/arch/arm/mach-omap2/board-sdp-hsmmc.c b/arch/arm/mach-omap2/board-sdp-hsmmc.c
index 4bf8165063e..90e8def5517 100644
--- a/arch/arm/mach-omap2/board-sdp-hsmmc.c
+++ b/arch/arm/mach-omap2/board-sdp-hsmmc.c
@@ -176,7 +176,7 @@ static int sdp_mmc_set_power(struct device *dev, int slot, int power_on,
 		case MMC_VDD_32_33:
 			vdd_sel = VSEL_3V;
 			if (cpu_is_omap24xx())
-				devconf = (reg | (1 << 31));
+				devconf = (devconf | (1 << 31));
 			break;
 		case MMC_VDD_165_195:
 			vdd_sel = VSEL_18V;