From: Paul Walmsley <paul@pwsan.com>
Date: Fri, 18 Jan 2008 06:21:46 +0000 (-0700)
Subject: sram: remove SCM read from plat-omap/sram.c
X-Git-Tag: v2.6.24-omap1~57
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=184c63344f9cf1b0267ad3c9551c23e89b85c484;p=linux-2.6-omap-h63xx.git

sram: remove SCM read from plat-omap/sram.c

This patch removes the System Control Module read from
plat-omap/sram.c:is_sram_locked().  Instead, it uses the global system_reg
variable, which is initialized immediately prior to the SRAM init code.
This happens to fix the compile breakage on the current tree.

In the long term, is_sram_locked() probably should be moved out of
sram.c.

Boot-tested on N800.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c
index c377cb0ba5a..9c9b1019a9f 100644
--- a/arch/arm/plat-omap/sram.c
+++ b/arch/arm/plat-omap/sram.c
@@ -25,6 +25,8 @@
 #include <asm/arch/sram.h>
 #include <asm/arch/board.h>
 
+#include <asm/arch/control.h>
+
 #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
 # include "../mach-omap2/prm.h"
 # include "../mach-omap2/cm.h"
@@ -92,8 +94,7 @@ static int is_sram_locked(void)
 	int type = 0;
 
 	if (cpu_is_omap242x())
-		type = (ctrl_read_reg(OMAP24XX_CONTROL_STATUS) &
-			OMAP2_DEVICETYPE_MASK);
+		type = system_rev & OMAP2_DEVICETYPE_MASK;
 
 	if (type == GP_DEVICE) {
 		/* RAMFW: R/W access to all initiators for all qualifier sets */