aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Fainelli <f.fainelli@gmail.com>2016-04-16 16:46:14 -0400
committerFlorian Fainelli <f.fainelli@gmail.com>2016-04-18 17:20:30 -0400
commitb0ec633c28d42281c03b41dbc92a4448a481f2f3 (patch)
tree9f9c69b14c245559cbae4df2f925ba96ca7598e5
parentcef4bafcea2c33b0c296595cebd95f0cfd99f278 (diff)
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>
-rw-r--r--arch/arm/mach-bcm/Kconfig1
-rw-r--r--drivers/bus/Kconfig1
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig
index b95ea1135ef9..68ab6412392a 100644
--- a/arch/arm/mach-bcm/Kconfig
+++ b/arch/arm/mach-bcm/Kconfig
@@ -173,7 +173,6 @@ config ARCH_BRCMSTB
173 select ARM_GIC 173 select ARM_GIC
174 select ARM_ERRATA_798181 if SMP 174 select ARM_ERRATA_798181 if SMP
175 select HAVE_ARM_ARCH_TIMER 175 select HAVE_ARM_ARCH_TIMER
176 select BRCMSTB_GISB_ARB
177 select BRCMSTB_L2_IRQ 176 select BRCMSTB_L2_IRQ
178 select BCM7120_L2_IRQ 177 select BCM7120_L2_IRQ
179 select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE 178 select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
diff --git a/drivers/bus/Kconfig b/drivers/bus/Kconfig
index d4a3a3133da5..8807495e0efd 100644
--- a/drivers/bus/Kconfig
+++ b/drivers/bus/Kconfig
@@ -58,6 +58,7 @@ config ARM_CCN
58config BRCMSTB_GISB_ARB 58config BRCMSTB_GISB_ARB
59 bool "Broadcom STB GISB bus arbiter" 59 bool "Broadcom STB GISB bus arbiter"
60 depends on ARM || MIPS 60 depends on ARM || MIPS
61 default ARCH_BRCMSTB || BMIPS_GENERIC
61 help 62 help
62 Driver for the Broadcom Set Top Box System-on-a-chip internal bus 63 Driver for the Broadcom Set Top Box System-on-a-chip internal bus
63 arbiter. This driver provides timeout and target abort error handling 64 arbiter. This driver provides timeout and target abort error handling