omap2: use OMAP2_CTRL_BASE in place of OMAP24XX_CTRL_BASE

Change users of OMAP24XX_CTRL_BASE to use OMAP2_CTRL_BASE.  Remove the
OMAP24XX_CTRL_BASE define.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/mach-omap2/prcm-regs.h b/arch/arm/mach-omap2/prcm-regs.h
index 984f138361ae00fb9396e39fe870f9573005335d..38ef271dacd14b4f0c6009546dba9fa92f3e7f2c 100644 (file)
--- a/arch/arm/mach-omap2/prcm-regs.h
+++ b/arch/arm/mach-omap2/prcm-regs.h
@@ -350,7 +350,7 @@
 #endif
 
 /* IO CONFIG */
-#define CONTROL_REG32(offset)          __REG32(OMAP24XX_CTRL_BASE + (offset))
+#define CONTROL_REG32(offset)          __REG32(OMAP2_CTRL_BASE + (offset))
 #define CONTROL_PADCONF_SPI1_NCS2      CONTROL_REG32(0x104)
 #define CONTROL_PADCONF_SYS_XTALOUT    CONTROL_REG32(0x134)
 #define CONTROL_PADCONF_UART1_RX       CONTROL_REG32(0x0C8)

diff --git a/arch/arm/plat-omap/mux.c b/arch/arm/plat-omap/mux.c
index 8b987b45a0a7509653b8eec25180163ccf00c00f..3e1ab20a633d451215bd39e000e8553d4ac0714d 100644 (file)
--- a/arch/arm/plat-omap/mux.c
+++ b/arch/arm/plat-omap/mux.c
@@ -85,7 +85,7 @@ int __init_or_module omap_cfg_reg(const unsigned long index)
                        reg |= OMAP24XX_PULL_UP;
 #if defined(CONFIG_OMAP_MUX_DEBUG) || defined(CONFIG_OMAP_MUX_WARNINGS)
                {
-                       u8 orig = omap_readb(OMAP24XX_CTRL_BASE + cfg->mux_reg);
+                       u8 orig = omap_readb(OMAP2_CTRL_BASE + cfg->mux_reg);
                        u8 debug = 0;
 
 #ifdef CONFIG_OMAP_MUX_DEBUG
@@ -95,11 +95,11 @@ int __init_or_module omap_cfg_reg(const unsigned long index)
                        if (debug || warn)
                                printk("MUX: setup %s (0x%08x): 0x%02x -> 0x%02x\n",
                                                cfg->name,
-                                               OMAP24XX_CTRL_BASE + cfg->mux_reg,
+                                               OMAP2_CTRL_BASE + cfg->mux_reg,
                                                orig, reg);
                }
 #endif
-               omap_writeb(reg, OMAP24XX_CTRL_BASE + cfg->mux_reg);
+               omap_writeb(reg, OMAP2_CTRL_BASE + cfg->mux_reg);
 
                return 0;
        }

diff --git a/include/asm-arm/arch-omap/omap24xx.h b/include/asm-arm/arch-omap/omap24xx.h
index b4dd3f761a1b1b64d1b95a265092f0c85eb0f600..174a3213fc0b0e8b3d7c8adce3b471080a2a977a 100644 (file)
--- a/include/asm-arm/arch-omap/omap24xx.h
+++ b/include/asm-arm/arch-omap/omap24xx.h
@@ -72,8 +72,5 @@
 #error "Unknown architecture"
 #endif
 
-/* Temporary defines to be cleaned up in following patches */
-#define OMAP24XX_CTRL_BASE     OMAP2_CTRL_BASE
-
 #endif /* __ASM_ARCH_OMAP24XX_H */