diff options
| author | Nishanth Menon <nm@ti.com> | 2015-09-09 16:18:11 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2015-09-14 12:14:47 -0700 |
| commit | 6d785c963a660b0279c43a2b1cd9b1c89ce5514b (patch) | |
| tree | 4f2d234c99f6c1adcaaf6b6ecc89d348b300efc1 | |
| parent | d34cf0d56658ff040c707313b4a71e86a767cbc2 (diff) | |
| download | linux-stable-6d785c963a660b0279c43a2b1cd9b1c89ce5514b.tar.gz linux-stable-6d785c963a660b0279c43a2b1cd9b1c89ce5514b.tar.bz2 linux-stable-6d785c963a660b0279c43a2b1cd9b1c89ce5514b.zip | |
ARM: OMAP4+: PM: erratum is used by OMAP5 and DRA7 as well
OMAP5 and DRA7 reuse the same pm44xx_erratum variable so, enable the
same, else PM features such as Suspend to ram is broken in a SoC only
build configuration.
Reported-by: Carlos Hernandez <ceh@ti.com>
Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
| -rw-r--r-- | arch/arm/mach-omap2/pm.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/pm.h b/arch/arm/mach-omap2/pm.h index 425bfcd67db6..b668719b9b25 100644 --- a/arch/arm/mach-omap2/pm.h +++ b/arch/arm/mach-omap2/pm.h @@ -103,7 +103,8 @@ static inline void enable_omap3630_toggle_l2_on_restore(void) { } #define PM_OMAP4_ROM_SMP_BOOT_ERRATUM_GICD (1 << 0) #define PM_OMAP4_CPU_OSWR_DISABLE (1 << 1) -#if defined(CONFIG_PM) && defined(CONFIG_ARCH_OMAP4) +#if defined(CONFIG_PM) && (defined(CONFIG_ARCH_OMAP4) ||\ + defined(CONFIG_SOC_OMAP5) || defined(CONFIG_SOC_DRA7XX)) extern u16 pm44xx_errata; #define IS_PM44XX_ERRATUM(id) (pm44xx_errata & (id)) #else |