tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

authored by

Maxime Ripard and committed by
Linus Walleij d9ff081d c01607c7

+6 -10
-1
arch/arm/mach-sunxi/Kconfig
··· 4 4 select CLKSRC_MMIO 5 5 select GENERIC_IRQ_CHIP 6 6 select PINCTRL 7 - select PINCTRL_SUNXI 8 7 select SUN4I_TIMER 9 8 10 9 if ARCH_SUNXI
+6 -9
drivers/pinctrl/sunxi/Kconfig
··· 1 1 if ARCH_SUNXI 2 2 3 - config PINCTRL_SUNXI 4 - bool 5 - 6 3 config PINCTRL_SUNXI_COMMON 7 4 bool 8 5 select PINMUX 9 6 select GENERIC_PINCONF 10 7 11 8 config PINCTRL_SUN4I_A10 12 - def_bool PINCTRL_SUNXI || MACH_SUN4I 9 + def_bool MACH_SUN4I 13 10 select PINCTRL_SUNXI_COMMON 14 11 15 12 config PINCTRL_SUN5I_A10S 16 - def_bool PINCTRL_SUNXI || MACH_SUN5I 13 + def_bool MACH_SUN5I 17 14 select PINCTRL_SUNXI_COMMON 18 15 19 16 config PINCTRL_SUN5I_A13 20 - def_bool PINCTRL_SUNXI || MACH_SUN5I 17 + def_bool MACH_SUN5I 21 18 select PINCTRL_SUNXI_COMMON 22 19 23 20 config PINCTRL_SUN6I_A31 24 - def_bool PINCTRL_SUNXI || MACH_SUN6I 21 + def_bool MACH_SUN6I 25 22 select PINCTRL_SUNXI_COMMON 26 23 27 24 config PINCTRL_SUN6I_A31_R 28 - def_bool PINCTRL_SUNXI || MACH_SUN6I 25 + def_bool MACH_SUN6I 29 26 depends on RESET_CONTROLLER 30 27 select PINCTRL_SUNXI_COMMON 31 28 32 29 config PINCTRL_SUN7I_A20 33 - def_bool PINCTRL_SUNXI || MACH_SUN7I 30 + def_bool MACH_SUN7I 34 31 select PINCTRL_SUNXI_COMMON 35 32 36 33 endif