pinctrl: sunxi: refactor pinctrl choice selecting for ARM64

ARM64 Allwinner SoCs used to have every pinctrl driver selected in
ARCH_SUNXI. Change this to make their default value to (ARM64 &&
ARCH_SUNXI).

Signed-off-by: Icenowy Zheng <icenowy@aosc.xyz>
Reviewed-by: Andre Przywara <andre.przywara@arm.com>
Acked-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 816015c..a84bfa7 100644 (file)
--- a/drivers/pinctrl/sunxi/Kconfig
+++ b/drivers/pinctrl/sunxi/Kconfig
@@ -48,8 +48,8 @@ config PINCTRL_SUN8I_H3
        select PINCTRL_SUNXI
 
 config PINCTRL_SUN8I_H3_R
-       def_bool MACH_SUN8I
-       select PINCTRL_SUNXI_COMMON
+       def_bool MACH_SUN8I || (ARM64 && ARCH_SUNXI)
+       select PINCTRL_SUNXI
 
 config PINCTRL_SUN8I_V3S
        def_bool MACH_SUN8I
@@ -65,11 +65,11 @@ config PINCTRL_SUN9I_A80_R
        select PINCTRL_SUNXI
 
 config PINCTRL_SUN50I_A64
-       bool
+       def_bool ARM64 && ARCH_SUNXI
        select PINCTRL_SUNXI
 
 config PINCTRL_SUN50I_H5
-       bool
+       def_bool ARM64 && ARCH_SUNXI
        select PINCTRL_SUNXI
 
 endif