[PATCH] arm64: sunxi: always enable reset controller

[PATCH] arm64: sunxi: always enable reset controller

[Arnd Bergmann]

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>
---
 arch/arm64/Kconfig.platforms | 2 ++
 1 file changed, 2 insertions(+)

I'd suggest we can pick this up in arm-soc as a non-urgent bugfix for 4.12

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.
 
-- 
2.9.0

Re: [PATCH] arm64: sunxi: always enable reset controller

[Maxime Ripard]

[-- Attachment #1: Type: text/plain, Size: 1148 bytes --]

On Wed, Apr 19, 2017 at 07:35:36PM +0200, Arnd Bergmann wrote:
> 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>
> ---
>  arch/arm64/Kconfig.platforms | 2 ++
>  1 file changed, 2 insertions(+)
> 
> I'd suggest we can pick this up in arm-soc as a non-urgent bugfix for 4.12

That works for me, you can add my Acked-by.

Thanks!
Maxime

-- 
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 801 bytes --]

Re: [PATCH] arm64: sunxi: always enable reset controller

[Arnd Bergmann]

On Thu, Apr 20, 2017 at 10:02 AM, Maxime Ripard
<maxime.ripard@free-electrons.com> wrote:
> On Wed, Apr 19, 2017 at 07:35:36PM +0200, Arnd Bergmann wrote:
>> 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>
>> ---
>>  arch/arm64/Kconfig.platforms | 2 ++
>>  1 file changed, 2 insertions(+)
>>
>> I'd suggest we can pick this up in arm-soc as a non-urgent bugfix for 4.12
>
> That works for me, you can add my Acked-by.
>

Applied now.

        Arnd