kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

pinctrl: sunxi: Fix recursive dependency

Browse source 
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: Maxime Ripard <maxime.ripard@free-electrons.com>
Suggested-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Maxime Ripard 2014-05-22 16:47:12 +02:00 committed by Linus Walleij
parent 48b6bce352
commit 118c565a8f
2 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
drivers/pinctrl/sunxi/Kconfig
View file

@ -2,31 +2,34 @@ if ARCH_SUNXI
config PINCTRL_SUNXI config PINCTRL_SUNXI
bool bool
config PINCTRL_SUNXI_COMMON
bool
select PINMUX select PINMUX
select GENERIC_PINCONF select GENERIC_PINCONF
config PINCTRL_SUN4I_A10 config PINCTRL_SUN4I_A10
def_bool PINCTRL_SUNXI || MACH_SUN4I def_bool PINCTRL_SUNXI || MACH_SUN4I
select PINCTRL_SUNXI select PINCTRL_SUNXI_COMMON
config PINCTRL_SUN5I_A10S config PINCTRL_SUN5I_A10S
def_bool PINCTRL_SUNXI || MACH_SUN5I def_bool PINCTRL_SUNXI || MACH_SUN5I
select PINCTRL_SUNXI select PINCTRL_SUNXI_COMMON
config PINCTRL_SUN5I_A13 config PINCTRL_SUN5I_A13
def_bool PINCTRL_SUNXI || MACH_SUN5I def_bool PINCTRL_SUNXI || MACH_SUN5I
select PINCTRL_SUNXI select PINCTRL_SUNXI_COMMON
config PINCTRL_SUN6I_A31 config PINCTRL_SUN6I_A31
def_bool PINCTRL_SUNXI || MACH_SUN6I def_bool PINCTRL_SUNXI || MACH_SUN6I
select PINCTRL_SUNXI select PINCTRL_SUNXI_COMMON
config PINCTRL_SUN6I_A31_R config PINCTRL_SUN6I_A31_R
def_bool PINCTRL_SUNXI || MACH_SUN6I def_bool PINCTRL_SUNXI || MACH_SUN6I
select PINCTRL_SUNXI select PINCTRL_SUNXI_COMMON
config PINCTRL_SUN7I_A20 config PINCTRL_SUN7I_A20
def_bool PINCTRL_SUNXI || MACH_SUN7I def_bool PINCTRL_SUNXI || MACH_SUN7I
select PINCTRL_SUNXI select PINCTRL_SUNXI_COMMON
endif endif

2
drivers/pinctrl/sunxi/Makefile
View file

@ -1,5 +1,5 @@
# Core # Core
obj-$(CONFIG_PINCTRL_SUNXI) += pinctrl-sunxi.o obj-$(CONFIG_PINCTRL_SUNXI_COMMON) += pinctrl-sunxi.o
# SoC Drivers # SoC Drivers
obj-$(CONFIG_PINCTRL_SUN4I_A10) += pinctrl-sun4i-a10.o obj-$(CONFIG_PINCTRL_SUN4I_A10) += pinctrl-sun4i-a10.o