diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2025-09-23 23:06:28 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2025-09-23 23:06:32 +0200 |
| commit | 32cdf411b4f8c23f6a5e6d897a64d1501dfaaee3 (patch) | |
| tree | 5e8c9cc1d8f3c43c84ac212637941435bab2f5d4 | |
| parent | ca8f96ffe67fa97b39ac56cec8acbe87cec299f7 (diff) | |
| parent | a1b20e062245571c128ec521c4df56ad1bff9bd0 (diff) | |
Merge tag 'v6.18-rockchip-arm32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into soc/arm
Commit d1bef995f61a ("ARM: rockchip: force built-in regulator support for PM")
introduced the REGULATOR if PM dependency for the suspend code, while
commit d1558dfd9f22 ("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: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | arch/arm/mach-rockchip/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig index b7855cc665e9..c90193dd3928 100644 --- a/arch/arm/mach-rockchip/Kconfig +++ b/arch/arm/mach-rockchip/Kconfig @@ -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 |