Skip to content

Commit

Permalink
ARM: OMAP4: PM: fix errata handling when CONFIG_PM=n
Browse files Browse the repository at this point in the history
commit c962184 (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>
  • Loading branch information
Kevin Hilman authored and Tony Lindgren committed Nov 15, 2012
1 parent b1d2037 commit 9364073
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
2 changes: 2 additions & 0 deletions arch/arm/mach-omap2/omap-smp.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@

#define OMAP5_CORE_COUNT 0x2

u16 pm44xx_errata;

/* SCU base address */
static void __iomem *scu_base;

Expand Down
1 change: 0 additions & 1 deletion arch/arm/mach-omap2/pm44xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ struct power_state {
};

static LIST_HEAD(pwrst_list);
u16 pm44xx_errata;

#ifdef CONFIG_SUSPEND
static int omap4_pm_suspend(void)
Expand Down

0 comments on commit 9364073

Please sign in to comment.