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 wrong
So insted of using omap_ctrl_readl that has a different base offset,
use a correct offset using omap_readl
2) "Not yet supported" check for omap4 needs to be removed
Verified on OMAP4 SDP board
Signed-off-by: Vikram Pandita <[email protected]>
Cc: Shilimkar, Santosh <[email protected]>
---
V1: had broken mmc support
V2: No mmc break; use omap_readl to get to the right register
arch/arm/mach-omap2/id.c | 2 +-
arch/arm/plat-omap/sram.c | 4 ----
2 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
index 37b8a1a..6d47f91 100644
--- a/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@ -58,7 +58,7 @@ int omap_type(void)
} else if (cpu_is_omap34xx()) {
val = omap_ctrl_readl(OMAP343X_CONTROL_STATUS);
} else if (cpu_is_omap44xx()) {
- val = omap_ctrl_readl(OMAP44XX_CONTROL_STATUS);
+ val = omap_readl(OMAP443X_SCM_BASE + OMAP44XX_CONTROL_STATUS);
} else {
pr_err("Cannot detect omap type!\n");
goto out;
diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c
index a72b391..98c86ff 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 [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
