From: Chen-Yu Tsai Date: Mon, 9 Feb 2015 10:23:20 +0000 (+0800) Subject: ARM: sunxi: Have ARCH_SUNXI select RESET_CONTROLLER for clock driver usage X-Git-Tag: v3.16.35~2396 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=06f2b0e827464fcf065138ec6bf54365ea1396b2;p=thirdparty%2Fkernel%2Fstable.git ARM: sunxi: Have ARCH_SUNXI select RESET_CONTROLLER for clock driver usage commit fdc0074c5fc8c7adb8186cbb123fe2082d9bd05f upstream. As the sunxi usb clocks all contain a reset controller, it is not possible to build the sunxi clock driver without RESET_CONTROLLER enabled. Doing so results in an undefined symbol error: drivers/built-in.o: In function `sunxi_gates_clk_setup': linux/drivers/clk/sunxi/clk-sunxi.c:1071: undefined reference to `reset_controller_register' This is possible if building a minimal kernel without PHY_SUN4I_USB. The dependency issue is made visible at compile time instead of link time by the new A80 mmc clocks, which also use a reset control itself. This patch makes ARCH_SUNXI select ARCH_HAS_RESET_CONTROLLER and RESET_CONTROLLER. Fixes: 559482d1f950 ARM: sunxi: Split the various SoCs support in Kconfig Reported-by: Lourens Rozema Acked-by: Arnd Bergmann Signed-off-by: Chen-Yu Tsai Signed-off-by: Maxime Ripard [ luis: backported to 3.16: - dropped changes to sun8i and sun9i, unsupported on 3.16 kernel ] Signed-off-by: Luis Henriques --- diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig index 0fbd4f156bfa9..b59e177488822 100644 --- a/arch/arm/mach-sunxi/Kconfig +++ b/arch/arm/mach-sunxi/Kconfig @@ -1,11 +1,13 @@ menuconfig ARCH_SUNXI bool "Allwinner SoCs" if ARCH_MULTI_V7 select ARCH_REQUIRE_GPIOLIB + select ARCH_HAS_RESET_CONTROLLER select CLKSRC_MMIO select GENERIC_IRQ_CHIP select PINCTRL select PINCTRL_SUNXI select SUN4I_TIMER + select RESET_CONTROLLER if ARCH_SUNXI @@ -21,10 +23,8 @@ config MACH_SUN5I config MACH_SUN6I bool "Allwinner A31 (sun6i) SoCs support" default ARCH_SUNXI - select ARCH_HAS_RESET_CONTROLLER select ARM_GIC select MFD_SUN6I_PRCM - select RESET_CONTROLLER select SUN5I_HSTIMER config MACH_SUN7I