40 lines
1.4 KiB
Diff
40 lines
1.4 KiB
Diff
|
From 900a9020af7a023f9b64c919fddf8a7486108962 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Arnd Bergmann <arnd@arndb.de>
|
||
|
|
Date: Tue, 18 Apr 2017 15:55:51 +0200
|
||
|
|
Subject: 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>
|
||
|
|
---
|
||
|
|
arch/arm64/Kconfig.platforms | 2 ++
|
||
|
|
1 file changed, 2 insertions(+)
|
||
|
|
|
||
|
|
--- a/arch/arm64/Kconfig.platforms
|
||
|
|
+++ b/arch/arm64/Kconfig.platforms
|
||
|
|
@@ -2,9 +2,11 @@ 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 PINCTRL_SUN50I_A64
|
||
|
|
+ select RESET_CONTROLLER
|
||
|
|
help
|
||
|
|
This enables support for Allwinner sunxi based SoCs like the A64.
|
||
|
|
|