iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bus: brcmstb_gisb: Make the driver buildable on MIPS

Browse Source 
BCM7xxx ARM and MIPS platforms share a similar hardware block for
reporting GISB errors, so they both benefit from the use of this driver.
Conditionally compile the ARM-specific bus error handler so that the
GISB error IRQ handler works on other architectures.

Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
This commit is contained in:
Kevin Cernekee
2014-11-25 16:49:49 -08:00
committed by Florian Fainelli
parent f114040e3e
commit dd1d78a11a
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/bus/Kconfig
View File

@@ -6,7 +6,7 @@ menu "Bus devices"
config BRCMSTB_GISB_ARB config BRCMSTB_GISB_ARB
bool "Broadcom STB GISB bus arbiter" bool "Broadcom STB GISB bus arbiter"
depends on ARM depends on ARM || MIPS
help help
Driver for the Broadcom Set Top Box System-on-a-chip internal bus Driver for the Broadcom Set Top Box System-on-a-chip internal bus
arbiter. This driver provides timeout and target abort error handling arbiter. This driver provides timeout and target abort error handling

4
drivers/bus/brcmstb_gisb.c
View File

@@ -24,8 +24,10 @@
#include <linux/of.h> #include <linux/of.h>
#include <linux/bitops.h> #include <linux/bitops.h>
#ifdef CONFIG_ARM
#include <asm/bug.h> #include <asm/bug.h>
#include <asm/signal.h> #include <asm/signal.h>
#endif
#define ARB_TIMER 0x008 #define ARB_TIMER 0x008
#define ARB_ERR_CAP_CLR 0x7e4 #define ARB_ERR_CAP_CLR 0x7e4
@@ -141,6 +143,7 @@ static int brcmstb_gisb_arb_decode_addr(struct brcmstb_gisb_arb_device *gdev,
return 0; return 0;
} }
#ifdef CONFIG_ARM
static int brcmstb_bus_error_handler(unsigned long addr, unsigned int fsr, static int brcmstb_bus_error_handler(unsigned long addr, unsigned int fsr,
struct pt_regs *regs) struct pt_regs *regs)
{ {
@@ -165,6 +168,7 @@ void __init brcmstb_hook_fault_code(void)
hook_fault_code(22, brcmstb_bus_error_handler, SIGBUS, 0, hook_fault_code(22, brcmstb_bus_error_handler, SIGBUS, 0,
"imprecise external abort"); "imprecise external abort");
} }
#endif
static irqreturn_t brcmstb_gisb_timeout_handler(int irq, void *dev_id) static irqreturn_t brcmstb_gisb_timeout_handler(int irq, void *dev_id)
{ {