aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2017-04-18 15:55:51 +0200
committerArnd Bergmann <arnd@arndb.de>2017-04-27 21:58:21 +0200
commit900a9020af7a023f9b64c919fddf8a7486108962 (patch)
treed6db422bc7967f8968a5b72d92c6e00bc0e7063c
parentMerge tag 'mvebu-defconfig64-4.12-2' of git://git.infradead.org/linux-mvebu into next/arm64 (diff)
downloadlinux-dev-900a9020af7a023f9b64c919fddf8a7486108962.tar.xz
linux-dev-900a9020af7a023f9b64c919fddf8a7486108962.zip
arm64: sunxi: always enable reset controller
The sunxi clk driver causes a link error when the reset controller subsystem is disabled: drivers/clk/built-in.o: In function `sun4i_ve_clk_setup': :(.init.text+0xd040): undefined reference to `reset_controller_register' drivers/clk/built-in.o: In function `sun4i_a10_display_init': :(.init.text+0xe5e0): undefined reference to `reset_controller_register' drivers/clk/built-in.o: In function `sunxi_usb_clk_setup': :(.init.text+0x10074): undefined reference to `reset_controller_register' We already force it to be enabled on arm32 and some other arm64 platforms, but not on arm64/sunxi. This adds the respective Kconfig statements to also select it here. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
-rw-r--r--arch/arm64/Kconfig.platforms2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms
index b3a1fb8df925..4afcffcb46cb 100644
--- a/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@ -2,8 +2,10 @@ menu "Platform selection"
config ARCH_SUNXI
bool "Allwinner sunxi 64-bit SoC Family"
+ select ARCH_HAS_RESET_CONTROLLER
select GENERIC_IRQ_CHIP
select PINCTRL
+ select RESET_CONTROLLER
help
This enables support for Allwinner sunxi based SoCs like the A64.