summaryrefslogtreecommitdiffstats
path: root/drivers/pinctrl
diff options
context:
space:
mode:
authorMaxime Ripard <maxime.ripard@free-electrons.com>2014-05-13 17:23:17 +0200
committerLinus Walleij <linus.walleij@linaro.org>2014-05-23 00:01:50 +0200
commitb22116b33af3834110b76e161df35df49c761d35 (patch)
treeacb291a12fa854671b99ff2342e29890a174aaa2 /drivers/pinctrl
parentdt-bindings: adapt rockchip-pinctrl doc to changed bindings (diff)
downloadlinux-b22116b33af3834110b76e161df35df49c761d35.tar.xz
linux-b22116b33af3834110b76e161df35df49c761d35.zip
pinctrl: sunxi: Enable the pinctrl Kconfig options by default
Enable the freshly introduced Kconfig options whenever their matching architecture is enabled. Since the Kconfig symbols for these machines are going through a different tree, keep PINCTRL_SUNXI around for the moment to avoid breaking the defconfig. It should be removed eventually. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl')
-rw-r--r--drivers/pinctrl/sunxi/Kconfig12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/pinctrl/sunxi/Kconfig b/drivers/pinctrl/sunxi/Kconfig
index 3940d098d6cb..2007327e0c48 100644
--- a/drivers/pinctrl/sunxi/Kconfig
+++ b/drivers/pinctrl/sunxi/Kconfig
@@ -6,27 +6,27 @@ config PINCTRL_SUNXI
select GENERIC_PINCONF
config PINCTRL_SUN4I_A10
- bool
+ def_bool PINCTRL_SUNXI || MACH_SUN4I
select PINCTRL_SUNXI
config PINCTRL_SUN5I_A10S
- bool
+ def_bool PINCTRL_SUNXI || MACH_SUN5I
select PINCTRL_SUNXI
config PINCTRL_SUN5I_A13
- bool
+ def_bool PINCTRL_SUNXI || MACH_SUN5I
select PINCTRL_SUNXI
config PINCTRL_SUN6I_A31
- bool
+ def_bool PINCTRL_SUNXI || MACH_SUN6I
select PINCTRL_SUNXI
config PINCTRL_SUN6I_A31_R
- bool
+ def_bool PINCTRL_SUNXI || MACH_SUN6I
select PINCTRL_SUNXI
config PINCTRL_SUN7I_A20
- bool
+ def_bool PINCTRL_SUNXI || MACH_SUN7I
select PINCTRL_SUNXI
endif