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

Commit e0246e8e authored by Kevin Hilman's avatar Kevin Hilman Committed by Tony Lindgren
Browse files

ARM: OMAP2+: fix CONFIG_CPU_IDLE dependency on CONFIG_PM 



commit 164e0cbf (ARM: OMAP3/4: consolidate cpuidle Makefile) added
an OMAP-specific dependency from CPU_IDLE to CONFIG_PM.  This causes
some randconfig warnings when CONFIG_PM has unmet dependencies:

warning: (ARCH_OMAP3 && ARCH_OMAP4) selects PM which has unmet direct dependencies (PM_SLEEP || PM_RUNTIME)
warning: (ARCH_OMAP3 && ARCH_OMAP4) selects PM which has unmet direct dependencies (PM_SLEEP || PM_RUNTIME)
warning: (ARCH_OMAP3 && ARCH_OMAP4) selects PM which has unmet direct dependencies (PM_SLEEP || PM_RUNTIME)

Fix this by making the dependency on CONFIG_PM_RUNTIME (which in turn
will enable CONFIG_PM.)

Reported-by: default avatarTony Lindgren <tony@atomide.com>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: default avatarKevin Hilman <khilman@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 0fb37842

arch/arm/mach-omap2/Kconfig

+2 −2
Original line number Original line Diff line number Diff line
@@ -35,7 +35,7 @@ config ARCH_OMAP3 
	select CPU_V7

	select CPU_V7

	select USB_ARCH_HAS_EHCI if USB_SUPPORT

	select USB_ARCH_HAS_EHCI if USB_SUPPORT

	select ARCH_HAS_OPP

	select ARCH_HAS_OPP

	select PM if CPU_IDLE

	select PM_RUNTIME if CPU_IDLE

	select PM_OPP if PM

	select PM_OPP if PM

	select ARM_CPU_SUSPEND if PM

	select ARM_CPU_SUSPEND if PM

	select MULTI_IRQ_HANDLER

	select MULTI_IRQ_HANDLER
@@ -53,7 +53,7 @@ config ARCH_OMAP4 
	select PL310_ERRATA_727915

	select PL310_ERRATA_727915

	select ARM_ERRATA_720789

	select ARM_ERRATA_720789

	select ARCH_HAS_OPP

	select ARCH_HAS_OPP

	select PM if CPU_IDLE

	select PM_RUNTIME if CPU_IDLE

	select PM_OPP if PM

	select PM_OPP if PM

	select USB_ARCH_HAS_EHCI if USB_SUPPORT

	select USB_ARCH_HAS_EHCI if USB_SUPPORT

	select ARM_CPU_SUSPEND if PM

	select ARM_CPU_SUSPEND if PM