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: mediatek: guard sub-directory with CONFIG_PINCTRL_MTK

CONFIG_PINCTRL_MTK is more suitable than CONFIG_ARCH_MEDIATEK
to guard the drivers/pinctrl/mediatek/ directory.
(I renamed CONFIG_PINCTRL_MTK_COMMON to CONFIG_PINCTRL_MTK.)

This allows COMPILE_TEST to descend into drivers/pinctrl/mediatek
without CONFIG_ARCH_MEDIATEK define.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

authored by

Masahiro Yamada and committed by
Linus Walleij 4a9e0060 2f749c3a

+13 -13
+1 -1
drivers/pinctrl/Makefile
··· 50 50 obj-$(CONFIG_PINCTRL_SUNXI) += sunxi/ 51 51 obj-$(CONFIG_PINCTRL_UNIPHIER) += uniphier/ 52 52 obj-$(CONFIG_ARCH_VT8500) += vt8500/ 53 - obj-$(CONFIG_ARCH_MEDIATEK) += mediatek/ 53 + obj-$(CONFIG_PINCTRL_MTK) += mediatek/
+6 -6
drivers/pinctrl/mediatek/Kconfig
··· 1 1 if ARCH_MEDIATEK || COMPILE_TEST 2 2 3 - config PINCTRL_MTK_COMMON 3 + config PINCTRL_MTK 4 4 bool 5 5 depends on OF 6 6 select PINMUX ··· 13 13 bool "Mediatek MT2701 pin control" if COMPILE_TEST && !MACH_MT2701 14 14 depends on OF 15 15 default MACH_MT2701 16 - select PINCTRL_MTK_COMMON 16 + select PINCTRL_MTK 17 17 18 18 config PINCTRL_MT8135 19 19 bool "Mediatek MT8135 pin control" if COMPILE_TEST && !MACH_MT8135 20 20 depends on OF 21 21 default MACH_MT8135 22 - select PINCTRL_MTK_COMMON 22 + select PINCTRL_MTK 23 23 24 24 config PINCTRL_MT8127 25 25 bool "Mediatek MT8127 pin control" if COMPILE_TEST && !MACH_MT8127 26 26 depends on OF 27 27 default MACH_MT8127 28 - select PINCTRL_MTK_COMMON 28 + select PINCTRL_MTK 29 29 30 30 # For ARMv8 SoCs 31 31 config PINCTRL_MT8173 ··· 33 33 depends on OF 34 34 depends on ARM64 || COMPILE_TEST 35 35 default ARM64 && ARCH_MEDIATEK 36 - select PINCTRL_MTK_COMMON 36 + select PINCTRL_MTK 37 37 38 38 # For PMIC 39 39 config PINCTRL_MT6397 40 40 bool "Mediatek MT6397 pin control" if COMPILE_TEST && !MFD_MT6397 41 41 depends on OF 42 42 default MFD_MT6397 43 - select PINCTRL_MTK_COMMON 43 + select PINCTRL_MTK 44 44 45 45 endif
+6 -6
drivers/pinctrl/mediatek/Makefile
··· 1 1 # Core 2 - obj-$(CONFIG_PINCTRL_MTK_COMMON) += pinctrl-mtk-common.o 2 + obj-y += pinctrl-mtk-common.o 3 3 4 4 # SoC Drivers 5 - obj-$(CONFIG_PINCTRL_MT2701) += pinctrl-mt2701.o 6 - obj-$(CONFIG_PINCTRL_MT8135) += pinctrl-mt8135.o 7 - obj-$(CONFIG_PINCTRL_MT8127) += pinctrl-mt8127.o 8 - obj-$(CONFIG_PINCTRL_MT8173) += pinctrl-mt8173.o 9 - obj-$(CONFIG_PINCTRL_MT6397) += pinctrl-mt6397.o 5 + obj-$(CONFIG_PINCTRL_MT2701) += pinctrl-mt2701.o 6 + obj-$(CONFIG_PINCTRL_MT8135) += pinctrl-mt8135.o 7 + obj-$(CONFIG_PINCTRL_MT8127) += pinctrl-mt8127.o 8 + obj-$(CONFIG_PINCTRL_MT8173) += pinctrl-mt8173.o 9 + obj-$(CONFIG_PINCTRL_MT6397) += pinctrl-mt6397.o