path: root/arch/arm64/Kconfig.platforms
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2018-08-25 14:12:36 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2018-08-25 14:12:36 -0700
commitb326272010b6656210193d7ab93fa184087e8ee1 (patch)
tree5211f00b1183f3f23492234f8c7387e50e4a57df /arch/arm64/Kconfig.platforms
parent1bc276775d93faf42a3bb1c684cdb838ded8be56 (diff)
parent1aa55ca9b14af6cfd987ce4fdaf548f7067a5d07 (diff)
Merge tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC late updates from Olof Johansson: "A couple of late-merged changes that would be useful to get in this merge window: - Driver support for reset of audio complex on Meson platforms. The audio driver went in this merge window, and these changes have been in -next for a while (just not in our tree). - Power management fixes for IOMMU on Rockchip platforms, getting closer to kexec working on them, including Chromebooks. - Another pass updating "arm,psci" -> "psci" for some properties that have snuck in since last time it was done" * tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: iommu/rockchip: Move irq request past pm_runtime_enable iommu/rockchip: Handle errors returned from PM framework arm64: rockchip: Force CONFIG_PM on Rockchip systems ARM: rockchip: Force CONFIG_PM on Rockchip systems arm64: dts: Fix various entry-method properties to reflect documentation reset: imx7: Fix always writing bits as 0 reset: meson: add meson audio arb driver reset: meson: add dt-bindings for meson-axg audio arb
Diffstat (limited to 'arch/arm64/Kconfig.platforms')
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms
index 35f2e6e1be23..393d2b524284 100644
--- a/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@ -158,6 +158,7 @@ config ARCH_ROCKCHIP
select GPIOLIB
select PINCTRL
+ select PM
This enables support for the ARMv8 based Rockchip chipsets,