Skip to contentSkip to conversation

ARM: OMAP4: PM: fix errata handling when CONFIG_PM=n

PATCH New Kevin Hilman 2 participants 2 messages Nov 15, 2012

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

PATCH 1/1 ARM: OMAP4: PM: fix errata handling when CONFIG_PM=n

From: Kevin Hilman <[email protected]>

commit c9621844 (ARM: OMAP4: PM: add errata support) introduced errata handling for OMAP4, but was broken when CONFIG_PM=n.

When CONFIG_PM=n, pm44xx.c is not compiled, yet that is where pm44xx_errata is defined. However, these errata are needed for the SMP boot/hotplug case also, and are primarily used in omap-smp.c.

Move the definition of pm44xx_errata to omap-smp.c so that it's available even in the CONFIG_PM=n case.

---
This patch applies on top of Tony's fixes-non-critical-part-2.
The bug was introduced in my for_3.8-fixes-pm tag (now included in Tony's fixes-non-critical-part2.)

 arch/arm/mach-omap2/omap-smp.c | 2 ++
 arch/arm/mach-omap2/pm44xx.c   | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)
arch/arm/mach-omap2/omap-smp.c +2 -0
index 49a08df..cd42d92 100644
@@ -40,6 +40,8 @@
 
 #define OMAP5_CORE_COUNT	0x2
 
+u16 pm44xx_errata;
+
 /* SCU base address */
 static void __iomem *scu_base;
 
arch/arm/mach-omap2/pm44xx.c +0 -1
index 0adbd7d..04922d1 100644
@@ -34,7 +34,6 @@ struct power_state {
 };
 
 static LIST_HEAD(pwrst_list);
-u16 pm44xx_errata;
 
 #ifdef CONFIG_SUSPEND
 static int omap4_pm_suspend(void)
Signature · 1 line
1.8.0
maintainer Applied
#1 lore raw

PATCH 1/1 ARM: OMAP4: PM: fix errata handling when CONFIG_PM=n

Quoted 9 lines · Kevin Hilman

From: Kevin Hilman <[email protected]>

commit c9621844 (ARM: OMAP4: PM: add errata support) introduced errata handling for OMAP4, but was broken when CONFIG_PM=n.

When CONFIG_PM=n, pm44xx.c is not compiled, yet that is where pm44xx_errata is defined. However, these errata are needed for the SMP boot/hotplug case also, and are primarily used in omap-smp.c.

Quoted 8 lines

Move the definition of pm44xx_errata to omap-smp.c so that it's available even in the CONFIG_PM=n case.

---
This patch applies on top of Tony's fixes-non-critical-part-2.
The bug was introduced in my for_3.8-fixes-pm tag (now included in Tony's fixes-non-critical-part2.)

Thanks applied to omap-for-v3.8/fixes-non-critical-v2 and pushed out.

Tony