summary refs log tree commit diff
path: root/arch/arm
diff options
context:
space:
mode:
authorMarc Zyngier <marc.zyngier@arm.com>2018-08-24 16:06:34 +0100
committerOlof Johansson <olof@lixom.net>2018-08-24 08:50:23 -0700
commitd1558dfd9f22c99a5b8e1354ad881ee40749da89 (patch)
tree67de6f0f85dbc11916b7f848a8613cebeacb3221 /arch/arm
parente9880240e4f4efe40bb47aba3b6602cff2a76b1e (diff)
downloadlinux-d1558dfd9f22c99a5b8e1354ad881ee40749da89.tar.gz
ARM: rockchip: Force CONFIG_PM on Rockchip systems
A number of the Rockchip-specific drivers (IOMMU, display controllers)
are now assuming that CONFIG_PM is set, and may completely misbehave
if that's not the case.

Since there is hardly any reason for this configuration option not
to be selected anyway, let's require it (in the same way Tegra already
does).

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-rockchip/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig
index fafd3d7f9f8c..8ca926522026 100644
--- a/arch/arm/mach-rockchip/Kconfig
+++ b/arch/arm/mach-rockchip/Kconfig
@@ -17,6 +17,7 @@ config ARCH_ROCKCHIP
 	select ARM_GLOBAL_TIMER
 	select CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK
 	select ZONE_DMA if ARM_LPAE
+	select PM
 	help
 	  Support for Rockchip's Cortex-A9 Single-to-Quad-Core-SoCs
 	  containing the RK2928, RK30xx and RK31xx series.