Browse Source

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

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>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Kevin Hilman 12 years ago
parent
commit
9364073587
2 changed files with 2 additions and 1 deletions
  1. 2 0
      arch/arm/mach-omap2/omap-smp.c
  2. 0 1
      arch/arm/mach-omap2/pm44xx.c

+ 2 - 0
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;
 

+ 0 - 1
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)