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@xxxxxxxxx>
---
arch/arm/plat-omap/sram.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
Index: linux-omap/arch/arm/plat-omap/sram.c
===================================================================
--- linux-omap.orig/arch/arm/plat-omap/sram.c 2007-12-27 13:47:06.000000000 -0700
+++ linux-omap/arch/arm/plat-omap/sram.c 2007-12-27 13:47:13.000000000 -0700
@@ -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 @@
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 */
-
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
