Unverified Commit 32cdf411 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v6.18-rockchip-arm32-1' of... 

Merge tag 'v6.18-rockchip-arm32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into soc/arm

Commit d1bef995 ("ARM: rockchip: force built-in regulator support for PM")
introduced the REGULATOR if PM dependency for the suspend code, while
commit d1558dfd ("ARM: rockchip: Force CONFIG_PM on Rockchip systems")
later always enabled PM.

So we can simplify the REGULATOR dependency by dropping the if PM.

* tag 'v6.18-rockchip-arm32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: rockchip: remove REGULATOR conditional to PM

Link: https://lore.kernel.org/r/6025175.zQ0Gbyo6oJ@diego


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents ca8f96ff a1b20e06

arch/arm/mach-rockchip/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ config ARCH_ROCKCHIP 
	select HAVE_ARM_SCU if SMP

	select HAVE_ARM_TWD if SMP

	select DW_APB_TIMER_OF

	select REGULATOR if PM

	select REGULATOR

	select ROCKCHIP_TIMER

	select ARM_GLOBAL_TIMER

	select CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK