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

pinctrl: sunxi: guard sub-directory with CONFIG_PINCTRL_SUNXI

CONFIG_PINCTRL_SUNXI is more suitable than CONFIG_ARCH_SUNXI
to guard the drivers/pinctrl/sunxi/ directory.
(I renamed CONFIG_PINCTRL_SUNXI_COMMON to CONFIG_PINCTRL_SUNXI.)

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

authored by

Masahiro Yamada and committed by
Linus Walleij
3a42a042 411a1fb8

+17 -17
+1 -1
drivers/pinctrl/Makefile
··· 52 52 obj-$(CONFIG_PINCTRL_SH_PFC) += sh-pfc/ 53 53 obj-$(CONFIG_PINCTRL_SPEAR) += spear/ 54 54 obj-$(CONFIG_ARCH_STM32) += stm32/ 55 - obj-$(CONFIG_ARCH_SUNXI) += sunxi/ 55 + obj-$(CONFIG_PINCTRL_SUNXI) += sunxi/ 56 56 obj-$(CONFIG_PINCTRL_UNIPHIER) += uniphier/ 57 57 obj-$(CONFIG_ARCH_VT8500) += vt8500/ 58 58 obj-$(CONFIG_ARCH_MEDIATEK) += mediatek/
+15 -15
drivers/pinctrl/sunxi/Kconfig
··· 1 1 if ARCH_SUNXI 2 2 3 - config PINCTRL_SUNXI_COMMON 3 + config PINCTRL_SUNXI 4 4 bool 5 5 select PINMUX 6 6 select GENERIC_PINCONF 7 7 8 8 config PINCTRL_SUN4I_A10 9 9 def_bool MACH_SUN4I 10 - select PINCTRL_SUNXI_COMMON 10 + select PINCTRL_SUNXI 11 11 12 12 config PINCTRL_SUN5I_A10S 13 13 def_bool MACH_SUN5I 14 - select PINCTRL_SUNXI_COMMON 14 + select PINCTRL_SUNXI 15 15 16 16 config PINCTRL_SUN5I_A13 17 17 def_bool MACH_SUN5I 18 - select PINCTRL_SUNXI_COMMON 18 + select PINCTRL_SUNXI 19 19 20 20 config PINCTRL_SUN6I_A31 21 21 def_bool MACH_SUN6I 22 - select PINCTRL_SUNXI_COMMON 22 + select PINCTRL_SUNXI 23 23 24 24 config PINCTRL_SUN6I_A31S 25 25 def_bool MACH_SUN6I 26 - select PINCTRL_SUNXI_COMMON 26 + select PINCTRL_SUNXI 27 27 28 28 config PINCTRL_SUN6I_A31_R 29 29 def_bool MACH_SUN6I 30 30 depends on RESET_CONTROLLER 31 - select PINCTRL_SUNXI_COMMON 31 + select PINCTRL_SUNXI 32 32 33 33 config PINCTRL_SUN7I_A20 34 34 def_bool MACH_SUN7I 35 - select PINCTRL_SUNXI_COMMON 35 + select PINCTRL_SUNXI 36 36 37 37 config PINCTRL_SUN8I_A23 38 38 def_bool MACH_SUN8I 39 - select PINCTRL_SUNXI_COMMON 39 + select PINCTRL_SUNXI 40 40 41 41 config PINCTRL_SUN8I_A33 42 42 def_bool MACH_SUN8I 43 - select PINCTRL_SUNXI_COMMON 43 + select PINCTRL_SUNXI 44 44 45 45 config PINCTRL_SUN8I_A83T 46 46 def_bool MACH_SUN8I 47 - select PINCTRL_SUNXI_COMMON 47 + select PINCTRL_SUNXI 48 48 49 49 config PINCTRL_SUN8I_A23_R 50 50 def_bool MACH_SUN8I 51 51 depends on RESET_CONTROLLER 52 - select PINCTRL_SUNXI_COMMON 52 + select PINCTRL_SUNXI 53 53 54 54 config PINCTRL_SUN8I_H3 55 55 def_bool MACH_SUN8I 56 - select PINCTRL_SUNXI_COMMON 56 + select PINCTRL_SUNXI 57 57 58 58 config PINCTRL_SUN9I_A80 59 59 def_bool MACH_SUN9I 60 - select PINCTRL_SUNXI_COMMON 60 + select PINCTRL_SUNXI 61 61 62 62 config PINCTRL_SUN9I_A80_R 63 63 def_bool MACH_SUN9I 64 64 depends on RESET_CONTROLLER 65 - select PINCTRL_SUNXI_COMMON 65 + select PINCTRL_SUNXI 66 66 67 67 endif
+1 -1
drivers/pinctrl/sunxi/Makefile
··· 1 1 # Core 2 - obj-$(CONFIG_PINCTRL_SUNXI_COMMON) += pinctrl-sunxi.o 2 + obj-y += pinctrl-sunxi.o 3 3 4 4 # SoC Drivers 5 5 obj-$(CONFIG_PINCTRL_SUN4I_A10) += pinctrl-sun4i-a10.o