sunxi: Backport patches needed for A64
[openwrt/staging/lynxis.git] / target / linux / sunxi / patches-4.9 / 0001-arm64-sunxi-always-enable-reset-controller.patch
1 From 900a9020af7a023f9b64c919fddf8a7486108962 Mon Sep 17 00:00:00 2001
2 From: Arnd Bergmann <arnd@arndb.de>
3 Date: Tue, 18 Apr 2017 15:55:51 +0200
4 Subject: arm64: sunxi: always enable reset controller
5
6 The sunxi clk driver causes a link error when the reset controller
7 subsystem is disabled:
8
9 drivers/clk/built-in.o: In function `sun4i_ve_clk_setup':
10 :(.init.text+0xd040): undefined reference to `reset_controller_register'
11 drivers/clk/built-in.o: In function `sun4i_a10_display_init':
12 :(.init.text+0xe5e0): undefined reference to `reset_controller_register'
13 drivers/clk/built-in.o: In function `sunxi_usb_clk_setup':
14 :(.init.text+0x10074): undefined reference to `reset_controller_register'
15
16 We already force it to be enabled on arm32 and some other arm64 platforms,
17 but not on arm64/sunxi. This adds the respective Kconfig statements to
18 also select it here.
19
20 Signed-off-by: Arnd Bergmann <arnd@arndb.de>
21 Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
22 ---
23 arch/arm64/Kconfig.platforms | 2 ++
24 1 file changed, 2 insertions(+)
25
26 --- a/arch/arm64/Kconfig.platforms
27 +++ b/arch/arm64/Kconfig.platforms
28 @@ -2,9 +2,11 @@ menu "Platform selection"
29
30 config ARCH_SUNXI
31 bool "Allwinner sunxi 64-bit SoC Family"
32 + select ARCH_HAS_RESET_CONTROLLER
33 select GENERIC_IRQ_CHIP
34 select PINCTRL
35 select PINCTRL_SUN50I_A64
36 + select RESET_CONTROLLER
37 help
38 This enables support for Allwinner sunxi based SoCs like the A64.
39