]> git.baikalelectronics.ru Git - kernel.git/commitdiff
arm64: sunxi: always enable reset controller
authorArnd Bergmann <arnd@arndb.de>
Tue, 18 Apr 2017 13:55:51 +0000 (15:55 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 27 Apr 2017 19:58:21 +0000 (21:58 +0200)
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>
arch/arm64/Kconfig.platforms

index b3a1fb8df92599cd05cbfd6719fe75fdd73c0b39..4afcffcb46cbf097789eb75c2bab8711647e0285 100644 (file)
@@ -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.