aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2015-04-15 04:00:35 -0400
committerLinus Walleij <linus.walleij@linaro.org>2015-04-15 04:02:42 -0400
commitb99e6fb86541e4dc28f5c3ff7418347fa9d8d29c (patch)
tree82b6e7e94d338037d1f2b015afefa5b82bc01a56
parentbb0fd7ab0986105765d11baa82e619c618a235aa (diff)
pinctrl: fix allmodconfig noise
There was some mess in the dependencies in the pinctrl Kconfig for compile tests under allmodconfig. Mea Culpa. Reported-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--drivers/pinctrl/Kconfig5
-rw-r--r--drivers/pinctrl/mediatek/Kconfig3
-rw-r--r--drivers/pinctrl/nomadik/Kconfig2
3 files changed, 8 insertions, 2 deletions
diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
index c6f299ba25cb..aeb5729fbda6 100644
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@ -95,9 +95,11 @@ config PINCTRL_FALCON
95 95
96config PINCTRL_MESON 96config PINCTRL_MESON
97 bool 97 bool
98 depends on OF
98 select PINMUX 99 select PINMUX
99 select PINCONF 100 select PINCONF
100 select GENERIC_PINCONF 101 select GENERIC_PINCONF
102 select GPIOLIB
101 select OF_GPIO 103 select OF_GPIO
102 select REGMAP_MMIO 104 select REGMAP_MMIO
103 105
@@ -229,7 +231,8 @@ config PINCTRL_XWAY
229 231
230config PINCTRL_TB10X 232config PINCTRL_TB10X
231 bool 233 bool
232 depends on ARC_PLAT_TB10X 234 depends on OF && ARC_PLAT_TB10X
235 select GPIOLIB
233 236
234endmenu 237endmenu
235 238
diff --git a/drivers/pinctrl/mediatek/Kconfig b/drivers/pinctrl/mediatek/Kconfig
index 5983cf5b2c46..6b3551cad111 100644
--- a/drivers/pinctrl/mediatek/Kconfig
+++ b/drivers/pinctrl/mediatek/Kconfig
@@ -2,6 +2,7 @@ if ARCH_MEDIATEK || COMPILE_TEST
2 2
3config PINCTRL_MTK_COMMON 3config PINCTRL_MTK_COMMON
4 bool 4 bool
5 depends on OF
5 select PINMUX 6 select PINMUX
6 select GENERIC_PINCONF 7 select GENERIC_PINCONF
7 select GPIOLIB 8 select GPIOLIB
@@ -10,12 +11,14 @@ config PINCTRL_MTK_COMMON
10# For ARMv7 SoCs 11# For ARMv7 SoCs
11config PINCTRL_MT8135 12config PINCTRL_MT8135
12 bool "Mediatek MT8135 pin control" if COMPILE_TEST && !MACH_MT8135 13 bool "Mediatek MT8135 pin control" if COMPILE_TEST && !MACH_MT8135
14 depends on OF
13 default MACH_MT8135 15 default MACH_MT8135
14 select PINCTRL_MTK_COMMON 16 select PINCTRL_MTK_COMMON
15 17
16# For ARMv8 SoCs 18# For ARMv8 SoCs
17config PINCTRL_MT8173 19config PINCTRL_MT8173
18 bool "Mediatek MT8173 pin control" 20 bool "Mediatek MT8173 pin control"
21 depends on OF
19 depends on ARM64 || COMPILE_TEST 22 depends on ARM64 || COMPILE_TEST
20 default ARM64 && ARCH_MEDIATEK 23 default ARM64 && ARCH_MEDIATEK
21 select PINCTRL_MTK_COMMON 24 select PINCTRL_MTK_COMMON
diff --git a/drivers/pinctrl/nomadik/Kconfig b/drivers/pinctrl/nomadik/Kconfig
index d48a5aa24a29..f4fcebfce68c 100644
--- a/drivers/pinctrl/nomadik/Kconfig
+++ b/drivers/pinctrl/nomadik/Kconfig
@@ -30,9 +30,9 @@ if (ARCH_U8500 || ARCH_NOMADIK)
30config PINCTRL_NOMADIK 30config PINCTRL_NOMADIK
31 bool "Nomadik pin controller driver" 31 bool "Nomadik pin controller driver"
32 depends on ARCH_U8500 || ARCH_NOMADIK 32 depends on ARCH_U8500 || ARCH_NOMADIK
33 depends on OF && GPIOLIB
33 select PINMUX 34 select PINMUX
34 select PINCONF 35 select PINCONF
35 select GPIOLIB
36 select OF_GPIO 36 select OF_GPIO
37 select GPIOLIB_IRQCHIP 37 select GPIOLIB_IRQCHIP
38 38