Skip to content

Commit 54164bb

Browse files
author
Paul Walmsley
committed
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 <[email protected]>
1 parent 6515e48 commit 54164bb

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

arch/arm/plat-omap/common.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ static struct omap_globals omap242x_globals = {
268268
.tap = OMAP2_L4_IO_ADDRESS(0x48014000),
269269
.sdrc = OMAP2420_SDRC_BASE,
270270
.sms = OMAP2420_SMS_BASE,
271-
.ctrl = OMAP2420_CTRL_BASE,
271+
.ctrl = OMAP242X_CTRL_BASE,
272272
.prm = OMAP2420_PRM_BASE,
273273
.cm = OMAP2420_CM_BASE,
274274
};

arch/arm/plat-omap/include/plat/omap24xx.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
#define OMAP24XX_IC_BASE (L4_24XX_BASE + 0xfe000)
4141
#define OMAP24XX_IVA_INTC_BASE 0x40000000
4242

43-
#define OMAP2420_CTRL_BASE L4_24XX_BASE
43+
#define OMAP242X_CTRL_BASE L4_24XX_BASE
4444
#define OMAP2420_32KSYNCT_BASE (L4_24XX_BASE + 0x4000)
4545
#define OMAP2420_PRCM_BASE (L4_24XX_BASE + 0x8000)
4646
#define OMAP2420_CM_BASE (L4_24XX_BASE + 0x8000)

0 commit comments

Comments
 (0)