OMAP2420: CTRL: fix OMAP242X_CTRL_REGADDR macro

Conform the OMAP2420_CTRL_BASE macro name to the standard of the rest of the
OMAP*_CTRL_BASE macro names.  This fixes a bug in the OMAP2420 SCM code that
prevented OMAP242X_CTRL_REGADDR from working.

Signed-off-by: Paul Walmsley <paul@pwsan.com>

2 files changed, 2 insertions, 2 deletions

diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c
index 947de3fb93f3..cbaf14bbe197 100644
--- a/arch/arm/plat-omap/common.c
+++ b/arch/arm/plat-omap/common.c
@@ -268,7 +268,7 @@ static struct omap_globals omap242x_globals = {
         .tap    = OMAP2_L4_IO_ADDRESS(0x48014000),
         .sdrc   = OMAP2420_SDRC_BASE,
         .sms    = OMAP2420_SMS_BASE,
-        .ctrl   = OMAP2420_CTRL_BASE,
+        .ctrl   = OMAP242X_CTRL_BASE,
         .prm    = OMAP2420_PRM_BASE,
         .cm     = OMAP2420_CM_BASE,
 };
diff --git a/arch/arm/plat-omap/include/plat/omap24xx.h b/arch/arm/plat-omap/include/plat/omap24xx.h
index 7055672a8c68..92df9e27cc5c 100644
--- a/arch/arm/plat-omap/include/plat/omap24xx.h
+++ b/arch/arm/plat-omap/include/plat/omap24xx.h
@@ -40,7 +40,7 @@
 #define OMAP24XX_IC_BASE        (L4_24XX_BASE + 0xfe000)
 #define OMAP24XX_IVA_INTC_BASE  0x40000000
 
-#define OMAP2420_CTRL_BASE      L4_24XX_BASE
+#define OMAP242X_CTRL_BASE      L4_24XX_BASE
 #define OMAP2420_32KSYNCT_BASE  (L4_24XX_BASE + 0x4000)
 #define OMAP2420_PRCM_BASE      (L4_24XX_BASE + 0x8000)
 #define OMAP2420_CM_BASE        (L4_24XX_BASE + 0x8000)