diff options
author | Kevin Hilman <khilman@ti.com> | 2012-11-14 19:54:27 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-11-14 20:06:20 -0500 |
commit | 936407358759adb302df93ab61fa68141897270c (patch) | |
tree | ade92c2f6db1f68ffaab6bd5be4227c63b3c3ba4 | |
parent | b1d2037a6c3c754ef7f527249ab2e1dee51e73dd (diff) |
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>
-rw-r--r-- | arch/arm/mach-omap2/omap-smp.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-omap2/pm44xx.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/omap-smp.c b/arch/arm/mach-omap2/omap-smp.c index 49a08dfe8d88..cd42d921940d 100644 --- a/arch/arm/mach-omap2/omap-smp.c +++ b/arch/arm/mach-omap2/omap-smp.c | |||
@@ -40,6 +40,8 @@ | |||
40 | 40 | ||
41 | #define OMAP5_CORE_COUNT 0x2 | 41 | #define OMAP5_CORE_COUNT 0x2 |
42 | 42 | ||
43 | u16 pm44xx_errata; | ||
44 | |||
43 | /* SCU base address */ | 45 | /* SCU base address */ |
44 | static void __iomem *scu_base; | 46 | static void __iomem *scu_base; |
45 | 47 | ||
diff --git a/arch/arm/mach-omap2/pm44xx.c b/arch/arm/mach-omap2/pm44xx.c index 0adbd7d81ce8..04922d149068 100644 --- a/arch/arm/mach-omap2/pm44xx.c +++ b/arch/arm/mach-omap2/pm44xx.c | |||
@@ -34,7 +34,6 @@ struct power_state { | |||
34 | }; | 34 | }; |
35 | 35 | ||
36 | static LIST_HEAD(pwrst_list); | 36 | static LIST_HEAD(pwrst_list); |
37 | u16 pm44xx_errata; | ||
38 | 37 | ||
39 | #ifdef CONFIG_SUSPEND | 38 | #ifdef CONFIG_SUSPEND |
40 | static int omap4_pm_suspend(void) | 39 | static int omap4_pm_suspend(void) |