Following patch added the omap_type() functionality for omap4
737daa03: omap4: Fix omap_type() for omap4
However the omap_type() function would not work as:
1) the base address for CONTROL_STATUS register is wrongly mapped
2) "Not yet supported" check for omap4 needs to be removed
Verified on OMAP4 SDP board
Signed-off-by: Vikram Pandita <vikram.pandita@xxxxxx>
---
arch/arm/plat-omap/include/plat/omap44xx.h | 2 +-
arch/arm/plat-omap/sram.c | 4 ----
2 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/arch/arm/plat-omap/include/plat/omap44xx.h b/arch/arm/plat-omap/include/plat/omap44xx.h
index 8b3f12f..2075856 100644
--- a/arch/arm/plat-omap/include/plat/omap44xx.h
+++ b/arch/arm/plat-omap/include/plat/omap44xx.h
@@ -33,7 +33,7 @@
#define OMAP4430_PRCM_MPU_BASE 0x48243000
#define OMAP44XX_GPMC_BASE 0x50000000
#define OMAP443X_SCM_BASE 0x4a002000
-#define OMAP443X_CTRL_BASE 0x4a100000
+#define OMAP443X_CTRL_BASE 0x4a002000
#define OMAP44XX_IC_BASE 0x48200000
#define OMAP44XX_IVA_INTC_BASE 0x40000000
#define IRQ_SIR_IRQ 0x0040
diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c
index 2eb5a27..112b807 100644
--- a/arch/arm/plat-omap/sram.c
+++ b/arch/arm/plat-omap/sram.c
@@ -93,10 +93,6 @@ extern unsigned long omapfb_reserve_sram(unsigned long sram_pstart,
*/
static int is_sram_locked(void)
{
- if (cpu_is_omap44xx())
- /* Not yet supported */
- return 0;
-
if (OMAP2_DEVICE_TYPE_GP == omap_type()) {
/* RAMFW: R/W access to all initiators for all qualifier sets */
if (cpu_is_omap242x()) {
--
1.6.6.1
--
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
