Commit 118c565a authored by Maxime Ripard's avatar Maxime Ripard Committed by Linus Walleij
Browse files

pinctrl: sunxi: Fix recursive dependency 



Fix the following configuration error:
drivers/pinctrl/sunxi/Kconfig:3:error: recursive dependency detected!
drivers/pinctrl/sunxi/Kconfig:3:	symbol PINCTRL_SUNXI is selected by PINCTRL_SUN4I_A10
drivers/pinctrl/sunxi/Kconfig:9:	symbol PINCTRL_SUN4I_A10 default value contains PINCTRL_SUNXI

Add a new intermedia PINCTRL_SUNXI_COMMON, that superseeds the PINCTRL_SUNXI
one.

We still need to keep PINCTRL_SUNXI at the moment in order to preserve
bisectability. Indeed, during that merge window, we also introduced the
MACH_SUN* symbols. Since it's going through different trees, we can't rely on
the fact that the options will be there, while ARCH_SUNXI still select
PINCTRL_SUNXI.

Signed-off-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
Suggested-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 48b6bce3

drivers/pinctrl/sunxi/Kconfig

+15 −12
Original line number Diff line number Diff line
@@ -2,31 +2,34 @@ if ARCH_SUNXI 


config PINCTRL_SUNXI

	bool



config PINCTRL_SUNXI_COMMON

	bool

	select PINMUX

	select GENERIC_PINCONF



config PINCTRL_SUN4I_A10

	def_bool PINCTRL_SUNXI || MACH_SUN4I

       select PINCTRL_SUNXI

	select PINCTRL_SUNXI_COMMON



config PINCTRL_SUN5I_A10S

	def_bool PINCTRL_SUNXI || MACH_SUN5I

       select PINCTRL_SUNXI

	select PINCTRL_SUNXI_COMMON



config PINCTRL_SUN5I_A13

	def_bool PINCTRL_SUNXI || MACH_SUN5I

       select PINCTRL_SUNXI

	select PINCTRL_SUNXI_COMMON



config PINCTRL_SUN6I_A31

	def_bool PINCTRL_SUNXI || MACH_SUN6I

       select PINCTRL_SUNXI

	select PINCTRL_SUNXI_COMMON



config PINCTRL_SUN6I_A31_R

	def_bool PINCTRL_SUNXI || MACH_SUN6I

       select PINCTRL_SUNXI

	select PINCTRL_SUNXI_COMMON



config PINCTRL_SUN7I_A20

	def_bool PINCTRL_SUNXI || MACH_SUN7I

       select PINCTRL_SUNXI

	select PINCTRL_SUNXI_COMMON



endif

drivers/pinctrl/sunxi/Makefile

+1 −1
Original line number Diff line number Diff line 
# Core

obj-$(CONFIG_PINCTRL_SUNXI)	+= pinctrl-sunxi.o

obj-$(CONFIG_PINCTRL_SUNXI_COMMON)	+= pinctrl-sunxi.o



# SoC Drivers

obj-$(CONFIG_PINCTRL_SUN4I_A10)		+= pinctrl-sun4i-a10.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE