Made a mistake of enabling PM_DEBUG without DEBUG_FS. This leads to
compile time warnings and errors.
arch/arm/mach-omap2/pm-debug.c:56: warning: 'pm_dbg_init'
declared 'static' but never defined
arch/arm/mach-omap2/built-in.o: In function `omap_sram_idle':
arch/arm/mach-omap2/pm34xx.c:442: undefined reference to
'pm_dbg_regset_save'
arch/arm/mach-omap2/built-in.o: In function `configure_vc':
arch/arm/mach-omap2/pm34xx.c:1221: undefined reference to
'pm_dbg_regset_init'
Another alternate is to link these Kconfig options; but didn't seem
intuitive.
Signed-off-by: Sanjeev Premi <premi@xxxxxx>
---
arch/arm/mach-omap2/pm-debug.c | 2 ++
arch/arm/mach-omap2/pm34xx.c | 4 ++++
2 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-omap2/pm-debug.c b/arch/arm/mach-omap2/pm-debug.c
index 1b4c160..175d461 100644
--- a/arch/arm/mach-omap2/pm-debug.c
+++ b/arch/arm/mach-omap2/pm-debug.c
@@ -53,7 +53,9 @@ int omap2_pm_debug;
regs[reg_count].name = #reg; \
regs[reg_count++].val = __raw_readl(OMAP2_IO_ADDRESS(0x480fe000 + (off)))
+#ifdef CONFIG_DEBUG_FS
static int __init pm_dbg_init(void);
+#endif
void omap2_pm_dump(int mode, int resume, unsigned int us)
{
diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c
index 7a1eb95..e3da0ab 100644
--- a/arch/arm/mach-omap2/pm34xx.c
+++ b/arch/arm/mach-omap2/pm34xx.c
@@ -438,8 +438,10 @@ void omap_sram_idle(void)
core_next_state == PWRDM_POWER_OFF)
sdrc_pwr = sdrc_read_reg(SDRC_POWER);
+#ifdef CONFIG_DEBUG_FS
if (regset_save_on_suspend)
pm_dbg_regset_save(1);
+#endif
/*
* omap3_arm_context is the location where ARM registers
@@ -1218,7 +1220,9 @@ static void __init configure_vc(void)
prm_write_mod_reg(prm_setup.voltsetup2, OMAP3430_GR_MOD,
OMAP3_PRM_VOLTSETUP2_OFFSET);
+#ifdef CONFIG_DEBUG_FS
pm_dbg_regset_init(1);
+#endif
}
static int __init omap3_pm_early_init(void)
--
1.6.2.2
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
