diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-02-05 15:26:26 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-02-18 12:20:30 +0100 |
| commit | d1bef995f61a6505a2ac69257b44fb9c59715953 (patch) | |
| tree | 4ed48ba20f4bf313a8de223df1f953e768b22fb5 /arch/arm/mach-rockchip | |
| parent | 165235180ff61f0012ea68a299e46daec43dcaa7 (diff) | |
| download | talos-obmc-linux-d1bef995f61a6505a2ac69257b44fb9c59715953.tar.gz talos-obmc-linux-d1bef995f61a6505a2ac69257b44fb9c59715953.zip | |
ARM: rockchip: force built-in regulator support for PM
The rockchips suspend/resume code requires regulators to work,
and gives a compile-time error if they are not available:
arch/arm/mach-rockchip/built-in.o: In function `rk3288_suspend_finish':
:(.text+0x146): undefined reference to `regulator_suspend_finish'
arch/arm/mach-rockchip/built-in.o: In function `rk3288_suspend_prepare':
:(.text+0x18e): undefined reference to `regulator_suspend_prepare'
To solve this, we now enable regulators whenever they are needed,
which is what we do on a lot of other platforms as well.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-rockchip')
| -rw-r--r-- | arch/arm/mach-rockchip/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig index 5078932c1683..ae4eb7cc4bcc 100644 --- a/arch/arm/mach-rockchip/Kconfig +++ b/arch/arm/mach-rockchip/Kconfig @@ -11,6 +11,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 ROCKCHIP_TIMER select ARM_GLOBAL_TIMER select CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK |
