Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b3bf289c authored Jul 03, 2016 by Tony Lindgren

ARM: OMAP2+: Fix build with CONFIG_SMP and CONFIG_PM is not set



I found one more make randconfig build error with the recent
SMP kexec changes. We need the mpuss now always available early.

Fixes: 0573b957 ("ARM: OMAP4+: Prevent CPU1 related hang
with kexec")
Signed-off-by: Tony Lindgren <tony@atomide.com>

parent 44e7475d

arch/arm/mach-omap2/Makefile

+4 −1

Original line number	Diff line number	Diff line
		@@ -78,13 +78,16 @@ obj-$(CONFIG_ARCH_OMAP4) += opp4xxx_data.o
		endif

		# Power Management
		omap-4-5-pm-common = omap-mpuss-lowpower.o
		obj-$(CONFIG_ARCH_OMAP4) += $(omap-4-5-pm-common)
		obj-$(CONFIG_ARCH_OMAP5) += $(omap-4-5-pm-common)
		obj-$(CONFIG_OMAP_PM_NOOP) += omap-pm-noop.o

		ifeq ($(CONFIG_PM),y)
		obj-$(CONFIG_ARCH_OMAP2) += pm24xx.o
		obj-$(CONFIG_ARCH_OMAP2) += sleep24xx.o
		obj-$(CONFIG_ARCH_OMAP3) += pm34xx.o sleep34xx.o
		omap-4-5-pm-common = pm44xx.o omap-mpuss-lowpower.o
		omap-4-5-pm-common += pm44xx.o
		obj-$(CONFIG_ARCH_OMAP4) += $(omap-4-5-pm-common)
		obj-$(CONFIG_SOC_OMAP5) += $(omap-4-5-pm-common)
		obj-$(CONFIG_SOC_DRA7XX) += $(omap-4-5-pm-common)

arch/arm/mach-omap2/omap-mpuss-lowpower.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -64,7 +64,7 @@

		static void __iomem *sar_base;

		#ifdef CONFIG_SMP
		#if defined(CONFIG_PM) && defined(CONFIG_SMP)

		struct omap4_cpu_pm_info {
		struct powerdomain *pwrdm;