omap2: use OMAP2_SDRC_BASE in place of OMAP24XX_SDRC_BASE

Change users of OMAP24XX_SDRC_BASE to use OMAP2_SDRC_BASE.  Remove the
OMAP24XX_SDRC_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 7cb3830cb3b772fe61a1b08a3a7d132f8c5801ac..984f138361ae00fb9396e39fe870f9573005335d 100644 (file)
--- a/arch/arm/mach-omap2/prcm-regs.h
+++ b/arch/arm/mach-omap2/prcm-regs.h
@@ -199,7 +199,7 @@
 #define UART1_SYSCONFIG                __REG32(OMAP24XX_L4_IO_BASE + 0x6A054)
 #define UART2_SYSCONFIG                __REG32(OMAP24XX_L4_IO_BASE + 0x6C054)
 #define UART3_SYSCONFIG                __REG32(OMAP24XX_L4_IO_BASE + 0x6E054)
-#define SDRC_SYSCONFIG         __REG32(OMAP24XX_SDRC_BASE + 0x10)
+#define SDRC_SYSCONFIG         __REG32(OMAP2_SDRC_BASE + 0x10)
 #define OMAP24XX_SMS_BASE      (L3_24XX_BASE + 0x8000)
 #define SMS_SYSCONFIG          __REG32(OMAP24XX_SMS_BASE + 0x10)
 #define SSI_SYSCONFIG          __REG32(DISP_BASE + 0x8010)
@@ -263,12 +263,12 @@
 #define GPTIMER3_TISR          __REG32(OMAP24XX_L4_IO_BASE + 0x78018)
 
 /* SDRC */
-#define SDRC_DLLA_CTRL         __REG32(OMAP24XX_SDRC_BASE + 0x060)
-#define SDRC_DLLA_STATUS       __REG32(OMAP24XX_SDRC_BASE + 0x064)
-#define SDRC_DLLB_CTRL         __REG32(OMAP24XX_SDRC_BASE + 0x068)
-#define SDRC_DLLB_STATUS       __REG32(OMAP24XX_SDRC_BASE + 0x06C)
-#define SDRC_POWER             __REG32(OMAP24XX_SDRC_BASE + 0x070)
-#define SDRC_MR_0              __REG32(OMAP24XX_SDRC_BASE + 0x084)
+#define SDRC_DLLA_CTRL         __REG32(OMAP2_SDRC_BASE + 0x060)
+#define SDRC_DLLA_STATUS       __REG32(OMAP2_SDRC_BASE + 0x064)
+#define SDRC_DLLB_CTRL         __REG32(OMAP2_SDRC_BASE + 0x068)
+#define SDRC_DLLB_STATUS       __REG32(OMAP2_SDRC_BASE + 0x06C)
+#define SDRC_POWER             __REG32(OMAP2_SDRC_BASE + 0x070)
+#define SDRC_MR_0              __REG32(OMAP2_SDRC_BASE + 0x084)
 
 /* GPIO 1 */
 #define GPIO1_BASE             GPIOX_BASE(1)

diff --git a/arch/arm/mach-omap2/sleep.S b/arch/arm/mach-omap2/sleep.S
index a67bc1863f90785fe36381f92a110f17ec664e60..bf4d62399765873577452fd78c1b5c6ece38a08a 100644 (file)
--- a/arch/arm/mach-omap2/sleep.S
+++ b/arch/arm/mach-omap2/sleep.S
@@ -30,11 +30,13 @@
 #include <asm/arch/io.h>
 #include <asm/arch/pm.h>
 
-#define A_SDRC_DLLA_CTRL_V     IO_ADDRESS(OMAP24XX_SDRC_BASE+0x60)
-#define        A_SDRC_POWER_V          IO_ADDRESS(OMAP24XX_SDRC_BASE+0x70)
-#define A_SDRC_RFR_CTRL_V      IO_ADDRESS(OMAP24XX_SDRC_BASE+0xA4)
+#include <asm/arch/omap24xx.h>
+
+#define A_SDRC_DLLA_CTRL_V     IO_ADDRESS(OMAP2_SDRC_BASE + 0x60)
+#define        A_SDRC_POWER_V          IO_ADDRESS(OMAP2_SDRC_BASE + 0x70)
+#define A_SDRC_RFR_CTRL_V      IO_ADDRESS(OMAP2_SDRC_BASE + 0xA4)
 #define A_SDRC0_V              (0xC0000000)
-#define A_SDRC_MANUAL_V                IO_ADDRESS(OMAP24XX_SDRC_BASE+0xA8)
+#define A_SDRC_MANUAL_V                IO_ADDRESS(OMAP2_SDRC_BASE + 0xA8)
 
        .text
 

diff --git a/arch/arm/mach-omap2/sram-fn.S b/arch/arm/mach-omap2/sram-fn.S
index 9d67983afe83f0df5df27c43ca016935aed9448f..b0e8952b8dfbb8d1c439f13f9957b4127d58fa62 100644 (file)
--- a/arch/arm/mach-omap2/sram-fn.S
+++ b/arch/arm/mach-omap2/sram-fn.S
@@ -38,8 +38,8 @@
 #define CM_IDLEST_CKGEN_V      IO_ADDRESS(OMAP2_PRCM_BASE + 0x520)
 #define CM_CLKSEL1_PLL_V       IO_ADDRESS(OMAP2_PRCM_BASE + 0x540)
 
-#define SDRC_DLLA_CTRL_V       IO_ADDRESS(OMAP24XX_SDRC_BASE + 0x060)
-#define SDRC_RFR_CTRL_V                IO_ADDRESS(OMAP24XX_SDRC_BASE + 0x0a4)
+#define SDRC_DLLA_CTRL_V       IO_ADDRESS(OMAP2_SDRC_BASE + 0x060)
+#define SDRC_RFR_CTRL_V                IO_ADDRESS(OMAP2_SDRC_BASE + 0x0a4)
 
        .text
 

diff --git a/include/asm-arm/arch-omap/io.h b/include/asm-arm/arch-omap/io.h
index 28ae4d9df8367d9fc406c987f6784b04b189431a..403b70781977baddb0ad06acdcea16f32a6a31b9 100644 (file)
--- a/include/asm-arm/arch-omap/io.h
+++ b/include/asm-arm/arch-omap/io.h
@@ -80,7 +80,7 @@
 #define OMAP243X_GPMC_PHYS     OMAP243X_GPMC_BASE      /* 0x49000000 */
 #define OMAP243X_GPMC_VIRT     0xFE000000
 #define OMAP243X_GPMC_SIZE     SZ_1M
-#define OMAP243X_SDRC_PHYS     OMAP24XX_SDRC_BASE
+#define OMAP243X_SDRC_PHYS     OMAP243X_SDRC_BASE
 #define OMAP243X_SDRC_VIRT     0xFD000000
 #define OMAP243X_SDRC_SIZE     SZ_1M
 #define OMAP243X_SMS_PHYS      OMAP243X_SMS_BASE

diff --git a/include/asm-arm/arch-omap/omap24xx.h b/include/asm-arm/arch-omap/omap24xx.h
index 340c28a46e6fdb34e1258d75b5475c4ffd465cc8..b4dd3f761a1b1b64d1b95a265092f0c85eb0f600 100644 (file)
--- a/include/asm-arm/arch-omap/omap24xx.h
+++ b/include/asm-arm/arch-omap/omap24xx.h
@@ -73,7 +73,6 @@
 #endif
 
 /* Temporary defines to be cleaned up in following patches */
-#define OMAP24XX_SDRC_BASE     OMAP2_SDRC_BASE
 #define OMAP24XX_CTRL_BASE     OMAP2_CTRL_BASE
 
 #endif /* __ASM_ARCH_OMAP24XX_H */