Merge branch 'for_3.5/omap_misc_cleanup' of git://gitorious.org/omap-sw-develoment/linux-omap-dev into cleanup-soc

1 files changed, 0 insertions, 28 deletions

diff --git a/arch/arm/mach-omap2/iomap.h b/arch/arm/mach-omap2/iomap.h
index 0812b154f5b5..80b88921faba 100644
--- a/arch/arm/mach-omap2/iomap.h
+++ b/arch/arm/mach-omap2/iomap.h
@@ -37,9 +37,6 @@
 #define OMAP4_L3_PER_IO_OFFSET  0xb1100000
 #define OMAP4_L3_PER_IO_ADDRESS(pa)     IOMEM((pa) + OMAP4_L3_PER_IO_OFFSET)
 
-#define OMAP4_GPMC_IO_OFFSET            0xa9000000
-#define OMAP4_GPMC_IO_ADDRESS(pa)       IOMEM((pa) + OMAP4_GPMC_IO_OFFSET)
-
 #define OMAP2_EMU_IO_OFFSET             0xaa800000      /* Emulation */
 #define OMAP2_EMU_IO_ADDRESS(pa)        IOMEM((pa) + OMAP2_EMU_IO_OFFSET)
 
@@ -170,28 +167,3 @@
 #define L4_ABE_44XX_VIRT        (L4_ABE_44XX_PHYS + OMAP2_L4_IO_OFFSET)
 #define L4_ABE_44XX_SIZE        SZ_1M
 
-#define L4_EMU_44XX_PHYS        L4_EMU_44XX_BASE
-                                                /* 0x54000000 --> 0xfe800000 */
-#define L4_EMU_44XX_VIRT        (L4_EMU_44XX_PHYS + OMAP2_EMU_IO_OFFSET)
-#define L4_EMU_44XX_SIZE        SZ_8M
-
-#define OMAP44XX_GPMC_PHYS      OMAP44XX_GPMC_BASE
-                                                /* 0x50000000 --> 0xf9000000 */
-#define OMAP44XX_GPMC_VIRT      (OMAP44XX_GPMC_PHYS + OMAP4_GPMC_IO_OFFSET)
-#define OMAP44XX_GPMC_SIZE      SZ_1M
-
-
-#define OMAP44XX_EMIF1_PHYS     OMAP44XX_EMIF1_BASE
-                                                /* 0x4c000000 --> 0xfd100000 */
-#define OMAP44XX_EMIF1_VIRT     (OMAP44XX_EMIF1_PHYS + OMAP4_L3_PER_IO_OFFSET)
-#define OMAP44XX_EMIF1_SIZE     SZ_1M
-
-#define OMAP44XX_EMIF2_PHYS     OMAP44XX_EMIF2_BASE
-                                                /* 0x4d000000 --> 0xfd200000 */
-#define OMAP44XX_EMIF2_SIZE     SZ_1M
-#define OMAP44XX_EMIF2_VIRT     (OMAP44XX_EMIF1_VIRT + OMAP44XX_EMIF1_SIZE)
-
-#define OMAP44XX_DMM_PHYS       OMAP44XX_DMM_BASE
-                                                /* 0x4e000000 --> 0xfd300000 */
-#define OMAP44XX_DMM_SIZE       SZ_1M
-#define OMAP44XX_DMM_VIRT       (OMAP44XX_EMIF2_VIRT + OMAP44XX_EMIF2_SIZE)