From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Tue, 13 May 2014 15:23:17 +0000 (+0200)
Subject: pinctrl: sunxi: Enable the pinctrl Kconfig options by default
X-Git-Tag: firefly_0821_release~176^2~3465^2~34^2~28
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b22116b33af3834110b76e161df35df49c761d35;p=firefly-linux-kernel-4.4.55.git

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>
---

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