pinctrl: sunxi: Remove PINCTRL_SUNXI

The PINCTRL_SUNXI configuration was kept only to deal with the introduction of
per-machine symbols and the various pintrl drivers through different tree.

Now that it's not useful anymore, we can just remove it.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
tirimbino
Maxime Ripard 11 years ago committed by Linus Walleij
parent c01607c7da
commit d9ff081d91
  1. 1
      arch/arm/mach-sunxi/Kconfig
  2. 15
      drivers/pinctrl/sunxi/Kconfig

@ -4,7 +4,6 @@ menuconfig ARCH_SUNXI
select CLKSRC_MMIO select CLKSRC_MMIO
select GENERIC_IRQ_CHIP select GENERIC_IRQ_CHIP
select PINCTRL select PINCTRL
select PINCTRL_SUNXI
select SUN4I_TIMER select SUN4I_TIMER
if ARCH_SUNXI if ARCH_SUNXI

@ -1,36 +1,33 @@
if ARCH_SUNXI if ARCH_SUNXI
config PINCTRL_SUNXI
bool
config PINCTRL_SUNXI_COMMON config PINCTRL_SUNXI_COMMON
bool 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 MACH_SUN4I
select PINCTRL_SUNXI_COMMON select PINCTRL_SUNXI_COMMON
config PINCTRL_SUN5I_A10S config PINCTRL_SUN5I_A10S
def_bool PINCTRL_SUNXI || MACH_SUN5I def_bool MACH_SUN5I
select PINCTRL_SUNXI_COMMON select PINCTRL_SUNXI_COMMON
config PINCTRL_SUN5I_A13 config PINCTRL_SUN5I_A13
def_bool PINCTRL_SUNXI || MACH_SUN5I def_bool MACH_SUN5I
select PINCTRL_SUNXI_COMMON select PINCTRL_SUNXI_COMMON
config PINCTRL_SUN6I_A31 config PINCTRL_SUN6I_A31
def_bool PINCTRL_SUNXI || MACH_SUN6I def_bool MACH_SUN6I
select PINCTRL_SUNXI_COMMON select PINCTRL_SUNXI_COMMON
config PINCTRL_SUN6I_A31_R config PINCTRL_SUN6I_A31_R
def_bool PINCTRL_SUNXI || MACH_SUN6I def_bool MACH_SUN6I
depends on RESET_CONTROLLER depends on RESET_CONTROLLER
select PINCTRL_SUNXI_COMMON select PINCTRL_SUNXI_COMMON
config PINCTRL_SUN7I_A20 config PINCTRL_SUN7I_A20
def_bool PINCTRL_SUNXI || MACH_SUN7I def_bool MACH_SUN7I
select PINCTRL_SUNXI_COMMON select PINCTRL_SUNXI_COMMON
endif endif

Loading…
Cancel
Save