Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-23 12:42:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

OMAP2420: CTRL: fix OMAP242X_CTRL_REGADDR macro

Browse Source 
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>
This commit is contained in:
Paul Walmsley 2010-10-08 11:40:17 -06:00
parent 6515e48932
commit 54164bb292
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/plat-omap/common.c
View File

@ -268,7 +268,7 @@ static struct omap_globals omap242x_globals = {
.tap = OMAP2_L4_IO_ADDRESS(0x48014000), .tap = OMAP2_L4_IO_ADDRESS(0x48014000),
.sdrc = OMAP2420_SDRC_BASE, .sdrc = OMAP2420_SDRC_BASE,
.sms = OMAP2420_SMS_BASE, .sms = OMAP2420_SMS_BASE,
.ctrl = OMAP2420_CTRL_BASE, .ctrl = OMAP242X_CTRL_BASE,
.prm = OMAP2420_PRM_BASE, .prm = OMAP2420_PRM_BASE,
.cm = OMAP2420_CM_BASE, .cm = OMAP2420_CM_BASE,
}; };

2
arch/arm/plat-omap/include/plat/omap24xx.h
View File

@ -40,7 +40,7 @@
#define OMAP24XX_IC_BASE (L4_24XX_BASE + 0xfe000) #define OMAP24XX_IC_BASE (L4_24XX_BASE + 0xfe000)
#define OMAP24XX_IVA_INTC_BASE 0x40000000 #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_32KSYNCT_BASE (L4_24XX_BASE + 0x4000)
#define OMAP2420_PRCM_BASE (L4_24XX_BASE + 0x8000) #define OMAP2420_PRCM_BASE (L4_24XX_BASE + 0x8000)
#define OMAP2420_CM_BASE (L4_24XX_BASE + 0x8000) #define OMAP2420_CM_BASE (L4_24XX_BASE + 0x8000)