Commit 8d582b94 authored by Linus Torvalds's avatar Linus Torvalds

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
parents e98bf5ce b99e6fb8
...@@ -95,9 +95,11 @@ config PINCTRL_FALCON ...@@ -95,9 +95,11 @@ config PINCTRL_FALCON
config PINCTRL_MESON config PINCTRL_MESON
bool bool
depends on OF
select PINMUX select PINMUX
select PINCONF select PINCONF
select GENERIC_PINCONF select GENERIC_PINCONF
select GPIOLIB
select OF_GPIO select OF_GPIO
select REGMAP_MMIO select REGMAP_MMIO
...@@ -229,7 +231,8 @@ config PINCTRL_XWAY ...@@ -229,7 +231,8 @@ config PINCTRL_XWAY
config PINCTRL_TB10X config PINCTRL_TB10X
bool bool
depends on ARC_PLAT_TB10X depends on OF && ARC_PLAT_TB10X
select GPIOLIB
endmenu endmenu
......
...@@ -2,6 +2,7 @@ if ARCH_MEDIATEK || COMPILE_TEST ...@@ -2,6 +2,7 @@ if ARCH_MEDIATEK || COMPILE_TEST
config PINCTRL_MTK_COMMON config PINCTRL_MTK_COMMON
bool bool
depends on OF
select PINMUX select PINMUX
select GENERIC_PINCONF select GENERIC_PINCONF
select GPIOLIB select GPIOLIB
...@@ -10,12 +11,14 @@ config PINCTRL_MTK_COMMON ...@@ -10,12 +11,14 @@ config PINCTRL_MTK_COMMON
# For ARMv7 SoCs # For ARMv7 SoCs
config PINCTRL_MT8135 config PINCTRL_MT8135
bool "Mediatek MT8135 pin control" if COMPILE_TEST && !MACH_MT8135 bool "Mediatek MT8135 pin control" if COMPILE_TEST && !MACH_MT8135
depends on OF
default MACH_MT8135 default MACH_MT8135
select PINCTRL_MTK_COMMON select PINCTRL_MTK_COMMON
# For ARMv8 SoCs # For ARMv8 SoCs
config PINCTRL_MT8173 config PINCTRL_MT8173
bool "Mediatek MT8173 pin control" bool "Mediatek MT8173 pin control"
depends on OF
depends on ARM64 || COMPILE_TEST depends on ARM64 || COMPILE_TEST
default ARM64 && ARCH_MEDIATEK default ARM64 && ARCH_MEDIATEK
select PINCTRL_MTK_COMMON select PINCTRL_MTK_COMMON
......
...@@ -30,9 +30,9 @@ if (ARCH_U8500 || ARCH_NOMADIK) ...@@ -30,9 +30,9 @@ if (ARCH_U8500 || ARCH_NOMADIK)
config PINCTRL_NOMADIK config PINCTRL_NOMADIK
bool "Nomadik pin controller driver" bool "Nomadik pin controller driver"
depends on ARCH_U8500 || ARCH_NOMADIK depends on ARCH_U8500 || ARCH_NOMADIK
depends on OF && GPIOLIB
select PINMUX select PINMUX
select PINCONF select PINCONF
select GPIOLIB
select OF_GPIO select OF_GPIO
select GPIOLIB_IRQCHIP select GPIOLIB_IRQCHIP
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment