aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorSantosh Shilimkar <santosh.shilimkar@ti.com>2011-06-24 20:31:27 -0500
committerNishanth Menon <nm@ti.com>2011-06-29 13:30:58 -0700
commit3a147298d14dcd2e012716c403448e49a2a38874 (patch)
tree224013fedd2e0a6ad2da973cd7827a424e5a497e /arch/arm
parent306c57740db506b0fbcc113c08865f56b02b6800 (diff)
downloadkernel_samsung_tuna-3a147298d14dcd2e012716c403448e49a2a38874.zip
kernel_samsung_tuna-3a147298d14dcd2e012716c403448e49a2a38874.tar.gz
kernel_samsung_tuna-3a147298d14dcd2e012716c403448e49a2a38874.tar.bz2
OMAP4: Fix the emif and dmm virtual mapping
Fix the address overlap with Emulation domain (EMU). The previous mapping was entering into EMU mapping and was not as per comments. Fix the mapping accordingly. [girishsg@ti.com: Helped fixing comments.] Signed-off-by: Girish S G <girishsg@ti.com> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/plat-omap/include/plat/io.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-omap/include/plat/io.h b/arch/arm/plat-omap/include/plat/io.h
index d72ec85..a2f7d31 100644
--- a/arch/arm/plat-omap/include/plat/io.h
+++ b/arch/arm/plat-omap/include/plat/io.h
@@ -228,12 +228,12 @@
#define OMAP44XX_EMIF2_PHYS OMAP44XX_EMIF2_BASE
/* 0x4d000000 --> 0xfd200000 */
-#define OMAP44XX_EMIF2_VIRT (OMAP44XX_EMIF2_PHYS + OMAP4_L3_PER_IO_OFFSET)
+#define OMAP44XX_EMIF2_VIRT (OMAP44XX_EMIF1_VIRT + SZ_1M)
#define OMAP44XX_EMIF2_SIZE SZ_1M
#define OMAP44XX_DMM_PHYS OMAP44XX_DMM_BASE
/* 0x4e000000 --> 0xfd300000 */
-#define OMAP44XX_DMM_VIRT (OMAP44XX_DMM_PHYS + OMAP4_L3_PER_IO_OFFSET)
+#define OMAP44XX_DMM_VIRT (OMAP44XX_EMIF2_VIRT + SZ_1M)
#define OMAP44XX_DMM_SIZE SZ_1M
/*
* ----------------------------------------------------------------------------