3430: Make IO mapping names consistent

Signed-off-by: Amit Kucheria <amit.kucheria@verdurent.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/include/asm-arm/arch-omap/io.h b/include/asm-arm/arch-omap/io.h
index 83b9e662c4039ec71fcdaef4fee94ade0836dd29..160578e1f5578640b16af0720d1857ad14358ef4 100644 (file)
--- a/include/asm-arm/arch-omap/io.h
+++ b/include/asm-arm/arch-omap/io.h
@@ -129,7 +129,7 @@
 #define L4_PER_34XX_VIRT       0xd9000000
 #define L4_PER_34XX_SIZE       SZ_1M
 
-#define L4_EMU_34XX_PHYS       L4_34XX_EMU_BASE /* 0x54000000 */
+#define L4_EMU_34XX_PHYS       L4_EMU_34XX_BASE /* 0x54000000 */
 #define L4_EMU_34XX_VIRT       0xe4000000
 #define L4_EMU_34XX_SIZE       SZ_64M
 

diff --git a/include/asm-arm/arch-omap/omap34xx.h b/include/asm-arm/arch-omap/omap34xx.h
index 792ee0999c542949e9181e1f2ef6b65c1d2db216..0265e3be26d031761a92784cd3d0f995315f340d 100644 (file)
--- a/include/asm-arm/arch-omap/omap34xx.h
+++ b/include/asm-arm/arch-omap/omap34xx.h
@@ -31,11 +31,11 @@
 
 #define L4_34XX_BASE           0x48000000
 #define L4_WK_34XX_BASE                0x48300000
-#define L4_WK_OMAP_BASE                L4_WK_OMAP_BASE
+#define L4_WK_OMAP_BASE                L4_WK_34XX_BASE
 #define L4_PER_34XX_BASE       0x49000000
 #define L4_PER_OMAP_BASE       L4_PER_34XX_BASE
-#define L4_34XX_EMU_BASE       0x54000000
-#define L4_EMU_BASE            L4_34XX_EMU_BASE
+#define L4_EMU_34XX_BASE       0x54000000
+#define L4_EMU_BASE            L4_EMU_34XX_BASE
 #define L3_34XX_BASE           0x68000000
 #define L3_OMAP_BASE           L3_34XX_BASE