summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Wylder <jwylder@motorola.com>2014-06-19 15:50:48 -0500
committerJames Wylder <jwylder@motorola.com>2014-06-25 16:43:00 +0000
commit714156b7861253f9ed04d7931f5f4b73332641aa (patch)
treeae7d6d9dc052f0553d5c39b32eecd2e84a482825
parent1bb5e5f3ff453b8b312b210b4e5cef50c1613d44 (diff)
downloadolio-linux-3.10-714156b7861253f9ed04d7931f5f4b73332641aa.tar.xz
olio-linux-3.10-714156b7861253f9ed04d7931f5f4b73332641aa.zip
IKXCLOCK-2469 arm: omap2: re-fix pm-debug address printing
Base addresses were not selected based on CM vs PRM module. Calculate correctly. Change-Id: Iba3a9b303999fcf07e8a1a1660ddb7fcb8da24f2 Signed-off-by: Jim Wylder <jwylder@motorola.com>
-rw-r--r--arch/arm/mach-omap2/pm-debug-regs.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/pm-debug-regs.c b/arch/arm/mach-omap2/pm-debug-regs.c
index 8f1aafd98af..b006ae80974 100644
--- a/arch/arm/mach-omap2/pm-debug-regs.c
+++ b/arch/arm/mach-omap2/pm-debug-regs.c
@@ -455,17 +455,18 @@ int pm_dbg_regs_dump_delta(int cur, int ref)
cur, ref);
while (pm_dbg_reg_modules[i].name[0] != 0) {
bool cm = pm_dbg_reg_modules[i].type == MOD_CM;
+ u32 base_addr = cm ? OMAP3430_CM_BASE : OMAP3430_PRM_BASE;
for (j = pm_dbg_reg_modules[i].low;
j <= pm_dbg_reg_modules[i].high; j += 4) {
- uint32_t addr = (u32)(OMAP3430_CM_BASE +
- pm_dbg_reg_modules[i].offset);
+ u32 addr = (u32)(base_addr + pm_dbg_reg_modules[i].offset);
+
val_cur = *(ptr_cur++);
val_ref = *(ptr_ref++);
if (val_cur != val_ref) {
pr_debug("MOD: %s_%-4s %s(%08x) "
"%02x => 0x%08lx 0x%08lx\n",
- cm ? "CM_" : "PRM_",
+ cm ? "CM" : "PRM",
pm_dbg_reg_modules[i].name,
cm ? " " : "",
addr, j, val_cur, val_ref);