summaryrefslogtreecommitdiffstats
path: root/drivers/pinctrl/Kconfig
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2018-08-29 14:10:34 +0200
committerLinus Walleij <linus.walleij@linaro.org>2018-08-29 14:10:34 +0200
commit5624bf9635436bdf35eb69ef4d8196ea0e19336b (patch)
tree01056bbe2e1d6d7f65df03ae4b2e34e57b6f4964 /drivers/pinctrl/Kconfig
parentpinctrl: Convert to using %pOFn instead of device_node.name (diff)
parentpinctrl: ingenic: Include the right header (diff)
downloadlinux-5624bf9635436bdf35eb69ef4d8196ea0e19336b.tar.xz
linux-5624bf9635436bdf35eb69ef4d8196ea0e19336b.zip
Merge branch 'ib-ingenic' into devel
Diffstat (limited to 'drivers/pinctrl/Kconfig')
-rw-r--r--drivers/pinctrl/Kconfig6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
index d0bdd0eeb77f..978b2ed4d014 100644
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@ -309,12 +309,14 @@ config PINCTRL_ZYNQ
config PINCTRL_INGENIC
bool "Pinctrl driver for the Ingenic JZ47xx SoCs"
- default y
+ default MACH_INGENIC
depends on OF
- depends on MACH_INGENIC || COMPILE_TEST
+ depends on MIPS || COMPILE_TEST
select GENERIC_PINCONF
select GENERIC_PINCTRL_GROUPS
select GENERIC_PINMUX_FUNCTIONS
+ select GPIOLIB
+ select GPIOLIB_IRQCHIP
select REGMAP_MMIO
config PINCTRL_RK805