| From 2ae95e2be90b6bb10a218996291ea8260e40d618 Mon Sep 17 00:00:00 2001 |
| From: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> |
| Date: Mon, 1 Feb 2016 18:01:29 +0100 |
| Subject: ARM: 8510/1: rework ARM_CPU_SUSPEND dependencies |
| |
| [ Upstream commit 1b9bdf5c1661873a10e193b8cbb803a87fe5c4a1 ] |
| |
| The code enabled by the ARM_CPU_SUSPEND config option is used by |
| kernel subsystems for purposes that go beyond system suspend so its |
| config entry should be augmented to take more default options into |
| account and avoid forcing its selection to prevent dependencies |
| override. |
| |
| To achieve this goal, this patch reworks the ARM_CPU_SUSPEND config |
| entry and updates its default config value (by adding the BL_SWITCHER |
| option to it) and its dependencies (ARCH_SUSPEND_POSSIBLE), so that the |
| symbol is still selected by default by the subsystems requiring it and |
| at the same time enforcing the dependencies correctly. |
| |
| Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> |
| Cc: Nicolas Pitre <nico@fluxnic.net> |
| Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| arch/arm/Kconfig | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig |
| index bd3a806df001..ee9acbfa7a1d 100644 |
| --- a/arch/arm/Kconfig |
| +++ b/arch/arm/Kconfig |
| @@ -1433,7 +1433,6 @@ config BIG_LITTLE |
| config BL_SWITCHER |
| bool "big.LITTLE switcher support" |
| depends on BIG_LITTLE && MCPM && HOTPLUG_CPU && ARM_GIC |
| - select ARM_CPU_SUSPEND |
| select CPU_PM |
| help |
| The big.LITTLE "switcher" provides the core functionality to |
| @@ -2153,7 +2152,8 @@ config ARCH_SUSPEND_POSSIBLE |
| def_bool y |
| |
| config ARM_CPU_SUSPEND |
| - def_bool PM_SLEEP |
| + def_bool PM_SLEEP || BL_SWITCHER |
| + depends on ARCH_SUSPEND_POSSIBLE |
| |
| config ARCH_HIBERNATION_POSSIBLE |
| bool |
| -- |
| 2.19.1 |
| |