diff options
| author |   Vikram Pandita <vikram.pandita@ti.com> | 2010-09-16 18:19:24 +0530 |
|---|---|---|
| committer |   Santosh Shilimkar <santosh.shilimkar@ti.com> | 2010-09-24 11:30:17 +0530 |
| commit | 2a27753fdc2ab046c754e3e203953dd0d4c1611b (patch) | |
| tree | f93cf6e41e70b897c63ef9848266658da1eef0a6 /arch/arm/plat-omap/sram.c | |
| parent | Linux 2.6.36-rc5 (diff) | |
| download | linux-dev-2a27753fdc2ab046c754e3e203953dd0d4c1611b.tar.xz linux-dev-2a27753fdc2ab046c754e3e203953dd0d4c1611b.zip | |
omap: sram: fix is_sram_locked check
For OMAP24xx/34xx/44xx: omap_type() returns the correct type:
OMAP2_DEVICE_TYPE_TEST
OMAP2_DEVICE_TYPE_EMU
OMAP2_DEVICE_TYPE_SEC
OMAP2_DEVICE_TYPE_GP
OMAP2_DEVICE_TYPE_BAD
In current implementation there are two problems:
Problem 1:
For 34xx, the current if check will never return true.
Problem 2:
For 24xx the correct type check should be with omap_type() function
Verified by checking the TRM 24xx for CONTROL_STATUS register bits
Signed-off-by: Vikram Pandita <vikram.pandita@ti.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Diffstat (limited to 'arch/arm/plat-omap/sram.c')
| -rw-r--r-- | arch/arm/plat-omap/sram.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c index 226b2e858d6c..112b80753ee2 100644 --- a/arch/arm/plat-omap/sram.c +++ b/arch/arm/plat-omap/sram.c @@ -93,16 +93,7 @@ extern unsigned long omapfb_reserve_sram(unsigned long sram_pstart, */ static int is_sram_locked(void) { - int type = 0; - - if (cpu_is_omap44xx()) - /* Not yet supported */ - return 0; - - if (cpu_is_omap242x()) - type = omap_rev() & OMAP2_DEVICETYPE_MASK; - - if (type == GP_DEVICE) { + if (OMAP2_DEVICE_TYPE_GP == omap_type()) { /* RAMFW: R/W access to all initiators for all qualifier sets */ if (cpu_is_omap242x()) { __raw_writel(0xFF, OMAP24XX_VA_REQINFOPERM0); /* all q-vects */ |