omap2: merge CONTROL_STATUS defines

The *_CONTROL_STATUS defines in include/asm-arm/arch-omap/omap24xx.h
are shared between 2420 and 2430, so merge and rename those
defines to reflect that.

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

diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c
index e85bbebe900cb2dc62bbab673d561ec1b8229ae4..aa5b65708e7a8fa0ac889073da597860c690e75a 100644 (file)
--- a/arch/arm/mach-omap2/board-h4.c
+++ b/arch/arm/mach-omap2/board-h4.c
@@ -265,7 +265,7 @@ static struct platform_device *h4_devices[] __initdata = {
 /* 2420 Sysboot setup (2430 is different) */
 static u32 get_sysboot_value(void)
 {
-       return (omap_readl(OMAP242X_CONTROL_STATUS) & 0xFFF);
+       return (omap_readl(OMAP24XX_CONTROL_STATUS) & 0xFFF);
 }
 
 /* FIXME: This function should be moved to some other file, gpmc.c? */

diff --git a/include/asm-arm/arch-omap/omap24xx.h b/include/asm-arm/arch-omap/omap24xx.h
index 764329c73e578d75c638eb9ce520402a4a1a1fd4..66592c8e76b696ccfb98dce997f8edbac420ead5 100644 (file)
--- a/include/asm-arm/arch-omap/omap24xx.h
+++ b/include/asm-arm/arch-omap/omap24xx.h
@@ -17,17 +17,17 @@
 #define OMAP24XX_IVA_INTC_BASE 0x40000000
 #define IRQ_SIR_IRQ            0x0040
 
+#define OMAP24XX_CONTROL_STATUS        (L4_24XX_BASE + 0x2f8)
+
 #ifdef CONFIG_ARCH_OMAP2420
 #define OMAP24XX_32KSYNCT_BASE (L4_24XX_BASE + 0x4000)
 #define OMAP24XX_PRCM_BASE     (L4_24XX_BASE + 0x8000)
 #define OMAP24XX_SDRC_BASE     (L3_24XX_BASE + 0x9000)
-#define OMAP242X_CONTROL_STATUS        (L4_24XX_BASE + 0x2f8)
 #endif
 
 #ifdef CONFIG_ARCH_OMAP2430
 #define OMAP24XX_32KSYNCT_BASE (L4_WK_243X_BASE + 0x20000)
 #define OMAP24XX_PRCM_BASE     (L4_WK_243X_BASE + 0x6000)
-#define OMAP242X_CONTROL_STATUS        (L4_24XX_BASE + 0x2f8)
 #define OMAP243X_SMS_BASE      0x6C000000
 #define OMAP24XX_SDRC_BASE     0x6D000000
 #define OMAP243X_GPMC_BASE     0x6E000000