bus: brcmstb_gisb: Rework dependencies

Do not have the machine Kconfig entry point need to select
BRCMSTB_GISB_ARB, instead, just let it be default ARCH_BRCMSTB which is
a better way to deal with this. While at it, also make it default
BMIPS_GENERIC so the legacy MIPS-based STB platforms can benefit from
the same thing.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>

diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig
index b95ea1135ef9e0ce1f3e12132372ccb6b0062e8c..68ab6412392a44b84f4519ff04d725a3505f9bcf 100644 (file)
--- a/arch/arm/mach-bcm/Kconfig
+++ b/arch/arm/mach-bcm/Kconfig
@@ -173,7 +173,6 @@ config ARCH_BRCMSTB
        select ARM_GIC
        select ARM_ERRATA_798181 if SMP
        select HAVE_ARM_ARCH_TIMER
-       select BRCMSTB_GISB_ARB
        select BRCMSTB_L2_IRQ
        select BCM7120_L2_IRQ
        select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE

diff --git a/drivers/bus/Kconfig b/drivers/bus/Kconfig
index d4a3a3133da5410cd9c75aa263557b8b8b873321..8807495e0efd38ba057db3386f9a80e04e9f09b7 100644 (file)
--- a/drivers/bus/Kconfig
+++ b/drivers/bus/Kconfig
@@ -58,6 +58,7 @@ config ARM_CCN
 config BRCMSTB_GISB_ARB
        bool "Broadcom STB GISB bus arbiter"
        depends on ARM || MIPS
+       default ARCH_BRCMSTB || BMIPS_GENERIC
        help
          Driver for the Broadcom Set Top Box System-on-a-chip internal bus
          arbiter. This driver provides timeout and target abort error handling