lkml.org 
[lkml]   [2015]   [Apr]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.19 014/101] ARM: sunxi: Have ARCH_SUNXI select RESET_CONTROLLER for clock driver usage
    Date
    3.19-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Chen-Yu Tsai <wens@csie.org>

    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 <ik@lourensrozema.nl>
    Acked-by: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: Chen-Yu Tsai <wens@csie.org>
    Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/arm/mach-sunxi/Kconfig | 8 ++------
    1 file changed, 2 insertions(+), 6 deletions(-)

    --- a/arch/arm/mach-sunxi/Kconfig
    +++ b/arch/arm/mach-sunxi/Kconfig
    @@ -1,10 +1,12 @@
    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 SUN4I_TIMER
    + select RESET_CONTROLLER

    if ARCH_SUNXI

    @@ -20,10 +22,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
    @@ -37,16 +37,12 @@ config MACH_SUN7I
    config MACH_SUN8I
    bool "Allwinner A23 (sun8i) SoCs support"
    default ARCH_SUNXI
    - select ARCH_HAS_RESET_CONTROLLER
    select ARM_GIC
    select MFD_SUN6I_PRCM
    - select RESET_CONTROLLER

    config MACH_SUN9I
    bool "Allwinner (sun9i) SoCs support"
    default ARCH_SUNXI
    - select ARCH_HAS_RESET_CONTROLLER
    select ARM_GIC
    - select RESET_CONTROLLER

    endif



    \
     
     \ /
      Last update: 2015-04-17 16:01    [W:3.066 / U:0.292 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site