diff mbox

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

Message ID 1352940867-8806-1-git-send-email-khilman@deeprootsystems.com (mailing list archive)
State New, archived
Headers show

Commit Message

Kevin Hilman Nov. 15, 2012, 12:54 a.m. UTC 
From: Kevin Hilman <khilman@ti.com>

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.

Cc: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Kevin Hilman <khilman@ti.com>
---
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(-)

Comments

Tony Lindgren Nov. 15, 2012, 1:20 a.m. UTC | #1 
* Kevin Hilman <khilman@deeprootsystems.com> [121114 16:56]:
> From: Kevin Hilman <khilman@ti.com>
> 
> 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.
> 
> Cc: Tero Kristo <t-kristo@ti.com>
> Signed-off-by: Kevin Hilman <khilman@ti.com>
> ---
> 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
diff mbox

Patch

diff --git a/arch/arm/mach-omap2/omap-smp.c b/arch/arm/mach-omap2/omap-smp.c
index 49a08df..cd42d92 100644
--- a/arch/arm/mach-omap2/omap-smp.c
+++ b/arch/arm/mach-omap2/omap-smp.c
@@ -40,6 +40,8 @@ 
 
 #define OMAP5_CORE_COUNT	0x2
 
+u16 pm44xx_errata;
+
 /* SCU base address */
 static void __iomem *scu_base;
 
diff --git a/arch/arm/mach-omap2/pm44xx.c b/arch/arm/mach-omap2/pm44xx.c
index 0adbd7d..04922d1 100644
--- a/arch/arm/mach-omap2/pm44xx.c
+++ b/arch/arm/mach-omap2/pm44xx.c
@@ -34,7 +34,6 @@  struct power_state {
 };
 
 static LIST_HEAD(pwrst_list);
-u16 pm44xx_errata;
 
 #ifdef CONFIG_SUSPEND
 static int omap4_pm_suspend(void)