sunxi: Select SUN8I_RSB more carefully

SUN8I_RSB should not be selected by MACH_SUN8I, because the hardware
is not present in half of those SoCs (H3/H5, R40, and V3s). Move the
selection to the SoCs where the hardware actually exists.
As it currently stands, selecting that option also requires using it in
some way, which is not the case for one A80 board. Since we have only
three A80 boards in total, we select it their via their defconfigs.

Reviewed-by: Andre Przywara <andre.przywara@arm.com>
Signed-off-by: Samuel Holland <samuel@sholland.org>
[Andre: fixing up Sunchip_CX-A99 build]
Signed-off-by: Andre Przywara <andre.przywara@arm.com>

diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig
index 7308f977a59c8836d05ff8cf1e9a94fe86550497..03054a331aa6b0ae7833cb50d3fc4c9ab6ee2e9c 100644 (file)
--- a/arch/arm/mach-sunxi/Kconfig
+++ b/arch/arm/mach-sunxi/Kconfig
@@ -260,6 +260,7 @@ config MACH_SUN8I_A23
        select ARCH_SUPPORT_PSCI
        select DRAM_SUN8I_A23
        select PHY_SUN4I_USB
+       select SUN8I_RSB
        select SUNXI_GEN_SUN6I
        select SUPPORT_SPL
        select ARMV7_BOOT_SEC_DEFAULT if OLD_SUNXI_KERNEL_COMPAT
@@ -273,6 +274,7 @@ config MACH_SUN8I_A33
        select ARCH_SUPPORT_PSCI
        select DRAM_SUN8I_A33
        select PHY_SUN4I_USB
+       select SUN8I_RSB
        select SUNXI_GEN_SUN6I
        select SUPPORT_SPL
        select ARMV7_BOOT_SEC_DEFAULT if OLD_SUNXI_KERNEL_COMPAT
@@ -283,6 +285,7 @@ config MACH_SUN8I_A83T
        select CPU_V7A
        select DRAM_SUN8I_A83T
        select PHY_SUN4I_USB
+       select SUN8I_RSB
        select SUNXI_GEN_SUN6I
        select MMC_SUNXI_HAS_NEW_MODE
        select MMC_SUNXI_HAS_MODE_SWITCH
@@ -329,7 +332,6 @@ config MACH_SUN9I
        select DRAM_SUN9I
        select SUN6I_PRCM
        select SUNXI_GEN_SUN6I
-       select SUN8I_RSB
        select SUPPORT_SPL
 
 config MACH_SUN50I
@@ -377,7 +379,6 @@ endchoice
 # The sun8i SoCs share a lot, this helps to avoid a lot of "if A23 || A33"
 config MACH_SUN8I
        bool
-       select SUN8I_RSB
        select SUN6I_PRCM
        default y if MACH_SUN8I_A23
        default y if MACH_SUN8I_A33

diff --git a/configs/Cubieboard4_defconfig b/configs/Cubieboard4_defconfig
index c66f29e5da24a03d4119a78d0e26e816c62b5c03..0377bb83da17f18299bd7cf1a4810d335f026de1 100644 (file)
--- a/configs/Cubieboard4_defconfig
+++ b/configs/Cubieboard4_defconfig
@@ -11,5 +11,6 @@ CONFIG_USB0_VBUS_DET="AXP0-VBUS-DETECT"
 CONFIG_USB0_ID_DET="PH16"
 CONFIG_USB1_VBUS_PIN="PH14"
 CONFIG_USB3_VBUS_PIN="PH15"
+CONFIG_SUN8I_RSB=y
 CONFIG_AXP_GPIO=y
 CONFIG_AXP809_POWER=y

diff --git a/configs/Merrii_A80_Optimus_defconfig b/configs/Merrii_A80_Optimus_defconfig
index 0944e6495789c9214da3138afc65407961d698f3..8fb65042099e788bee6b0a2cc5b7765d76d2947d 100644 (file)
--- a/configs/Merrii_A80_Optimus_defconfig
+++ b/configs/Merrii_A80_Optimus_defconfig
@@ -11,5 +11,6 @@ CONFIG_USB0_VBUS_DET="AXP0-VBUS-DETECT"
 CONFIG_USB0_ID_DET="PH3"
 CONFIG_USB1_VBUS_PIN="PH4"
 CONFIG_USB3_VBUS_PIN="PH5"
+CONFIG_SUN8I_RSB=y
 CONFIG_AXP_GPIO=y
 CONFIG_AXP809_POWER=y