Skip to contentSkip to conversation

ARM: OMAP: compile-fixes for PM debug

PATCH In review Kevin Hilman 3 participants 5 messages Oct 30, 2007 – Nov 1, 2007

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: OMAP: compile-fixes for PM debug

Fix compile problems in omap2_pm_debug()

---
 arch/arm/mach-omap2/pm.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/mach-omap2/pm.c +3 -3
Index: dev/arch/arm/mach-omap2/pm.c
===================================================================
@@ -240,15 +240,15 @@ static void omap2_pm_dump(int mode, int 
 #endif
 #if 0
 		DUMP_CM_MOD_REG(CORE_MOD, CM_FCLKEN1);
-		DUMP_CM_MOD_REG(CORE_MOD, CM_FCLKEN2);
+		DUMP_CM_MOD_REG(CORE_MOD, OMAP24XX_CM_FCLKEN2);
 		DUMP_CM_MOD_REG(WKUP_MOD, CM_FCLKEN);
 		DUMP_CM_MOD_REG(CORE_MOD, CM_ICLKEN1);
 		DUMP_CM_MOD_REG(CORE_MOD, CM_ICLKEN2);
 		DUMP_CM_MOD_REG(WKUP_MOD, CM_ICLKEN);
-		DUMP_CM_MOD_REG(PLL_MOD, CM_CLKEN_PLL);
+		DUMP_CM_MOD_REG(PLL_MOD, CM_CLKEN);
 		DUMP_PRM_REG(OMAP24XX_PRCM_CLKEMUL_CTRL);
 		DUMP_CM_MOD_REG(PLL_MOD, CM_AUTOIDLE);
-		DUMP_PRM_MOD_REG(CORE_REG, PM_PWSTST);
+		DUMP_PRM_MOD_REG(CORE_MOD, PM_PWSTST);
 		DUMP_PRM_REG(OMAP24XX_PRCM_CLKSRC_CTRL);
 #endif
 #if 0

--

#1 lore raw

Hi,

Quoted 12 lines · Kevin Hilman

Fix compile problems in omap2_pm_debug()

---
 arch/arm/mach-omap2/pm.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Index: dev/arch/arm/mach-omap2/pm.c
===================================================================

arch/arm/mach-omap2/pm.c static void omap2_pm_dump(int mode, int · line 243

Quoted 5 lines
arch/arm/mach-omap2/pm.c +1 -1
@@ -240,15 +240,15 @@ static void omap2_pm_dump(int mode, int
 #endif
 #if 0
                DUMP_CM_MOD_REG(CORE_MOD, CM_FCLKEN1);
-               DUMP_CM_MOD_REG(CORE_MOD, CM_FCLKEN2);
+               DUMP_CM_MOD_REG(CORE_MOD, OMAP24XX_CM_FCLKEN2);

Are you sure this is needed? This code is commented.

Quoted 19 lines
arch/arm/mach-omap2/pm.c +2 -3
                DUMP_CM_MOD_REG(WKUP_MOD, CM_FCLKEN);
                DUMP_CM_MOD_REG(CORE_MOD, CM_ICLKEN1);
                DUMP_CM_MOD_REG(CORE_MOD, CM_ICLKEN2);
                DUMP_CM_MOD_REG(WKUP_MOD, CM_ICLKEN);
-               DUMP_CM_MOD_REG(PLL_MOD, CM_CLKEN_PLL);
+               DUMP_CM_MOD_REG(PLL_MOD, CM_CLKEN);
                DUMP_PRM_REG(OMAP24XX_PRCM_CLKEMUL_CTRL);
                DUMP_CM_MOD_REG(PLL_MOD, CM_AUTOIDLE);
-               DUMP_PRM_MOD_REG(CORE_REG, PM_PWSTST);
+               DUMP_PRM_MOD_REG(CORE_MOD, PM_PWSTST);
                DUMP_PRM_REG(OMAP24XX_PRCM_CLKSRC_CTRL);
 #endif
 #if 0
--

_______________________________________________
Linux-omap-open-source mailing list
[email protected]
http://linux.omap.com/mailman/listinfo/linux-omap-open-source

Signature · 4 lines
Best Regards,

Felipe Balbi
[email protected]
#2 lore raw
Quoted 10 lines · Felipe Balbi

Hi,

Quoted 7 lines · Kevin Hilman

Fix compile problems in omap2_pm_debug()

---
 arch/arm/mach-omap2/pm.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
Quoted 13 lines

arch/arm/mach-omap2/pm.c static void omap2_pm_dump(int mode, int · line 243

Quoted 10 lines

Index: dev/arch/arm/mach-omap2/pm.c
===================================================================

arch/arm/mach-omap2/pm.c +1 -1
@@ -240,15 +240,15 @@ static void omap2_pm_dump(int mode, int
 #endif
 #if 0
                DUMP_CM_MOD_REG(CORE_MOD, CM_FCLKEN1);
-               DUMP_CM_MOD_REG(CORE_MOD, CM_FCLKEN2);
+               DUMP_CM_MOD_REG(CORE_MOD, OMAP24XX_CM_FCLKEN2);

Are you sure this is needed? This code is commented.

It is needed when the code is uncommented, which is used for debugging suspend/resume and sleep-when-idle.

Kevin

#3 lore raw

On 10/30/07, Kevin Hilman <[email protected]> wrote:

<snip>

Quoted 2 lines

It is needed when the code is uncommented, which is used for debugging suspend/resume and sleep-when-idle.

ok... ack

Quoted 3 lines

Kevin

Signature · 4 lines
Best Regards,

Felipe Balbi
[email protected]
maintainer
#4 lore raw
Quoted 8 lines · Felipe Balbi

On 10/30/07, Kevin Hilman <[email protected]> wrote:

<snip>

Quoted 2 lines

It is needed when the code is uncommented, which is used for debugging suspend/resume and sleep-when-idle.

ok... ack

Pushing Kevin's patch today.

Tony