diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-21 09:31:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-21 09:31:26 -0700 |
| commit | 8d582b94291b40dbb5961f99172ee8ebfafd4c9c (patch) | |
| tree | eb5fff3f7ae11ce99477d8ad67d2af010bc4ce15 | |
| parent | e98bf5cedf25eb32f8f224e8dff9845f0856d18f (diff) | |
| parent | b99e6fb86541e4dc28f5c3ff7418347fa9d8d29c (diff) | |
| download | blackbird-op-linux-8d582b94291b40dbb5961f99172ee8ebfafd4c9c.tar.gz blackbird-op-linux-8d582b94291b40dbb5961f99172ee8ebfafd4c9c.zip | |
Merge tag 'pinctrl-v4.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl
Pull pincontrol Kconfig fix from Linus Walleij:
"This fixes the annoying Kconfig noise from pin control. Mea Culpa"
* tag 'pinctrl-v4.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
pinctrl: fix allmodconfig noise
| -rw-r--r-- | drivers/pinctrl/Kconfig | 5 | ||||
| -rw-r--r-- | drivers/pinctrl/mediatek/Kconfig | 3 | ||||
| -rw-r--r-- | drivers/pinctrl/nomadik/Kconfig | 2 |
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 config PINCTRL_MESON bool + depends on OF select PINMUX select PINCONF select GENERIC_PINCONF + select GPIOLIB select OF_GPIO select REGMAP_MMIO @@ -229,7 +231,8 @@ config PINCTRL_XWAY config PINCTRL_TB10X bool - depends on ARC_PLAT_TB10X + depends on OF && ARC_PLAT_TB10X + select GPIOLIB endmenu 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 config PINCTRL_MTK_COMMON bool + depends on OF select PINMUX select GENERIC_PINCONF select GPIOLIB @@ -10,12 +11,14 @@ config PINCTRL_MTK_COMMON # For ARMv7 SoCs config PINCTRL_MT8135 bool "Mediatek MT8135 pin control" if COMPILE_TEST && !MACH_MT8135 + depends on OF default MACH_MT8135 select PINCTRL_MTK_COMMON # For ARMv8 SoCs config PINCTRL_MT8173 bool "Mediatek MT8173 pin control" + depends on OF depends on ARM64 || COMPILE_TEST default ARM64 && ARCH_MEDIATEK 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) config PINCTRL_NOMADIK bool "Nomadik pin controller driver" depends on ARCH_U8500 || ARCH_NOMADIK + depends on OF && GPIOLIB select PINMUX select PINCONF - select GPIOLIB select OF_GPIO select GPIOLIB_IRQCHIP |
