projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'nfsd-4.4' of git://linux-nfs.org/~bfields/linux
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-bcm
/
brcmstb.c
diff --git
a/arch/arm/mach-bcm/brcmstb.c
b/arch/arm/mach-bcm/brcmstb.c
index 3a60f7ee3f0cc1583788f9cd3da81a5723354647..99a67cfb7c0d5c129dfad0ec721ba24e402171fd 100644
(file)
--- a/
arch/arm/mach-bcm/brcmstb.c
+++ b/
arch/arm/mach-bcm/brcmstb.c
@@
-12,11
+12,19
@@
*/
#include <linux/init.h>
*/
#include <linux/init.h>
+#include <linux/irqchip.h>
#include <linux/of_platform.h>
#include <linux/of_platform.h>
+#include <linux/soc/brcmstb/brcmstb.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
+static void __init brcmstb_init_irq(void)
+{
+ irqchip_init();
+ brcmstb_biuctrl_init();
+}
+
static const char *const brcmstb_match[] __initconst = {
"brcm,bcm7445",
"brcm,brcmstb",
static const char *const brcmstb_match[] __initconst = {
"brcm,bcm7445",
"brcm,brcmstb",
@@
-25,4
+33,5
@@
static const char *const brcmstb_match[] __initconst = {
DT_MACHINE_START(BRCMSTB, "Broadcom STB (Flattened Device Tree)")
.dt_compat = brcmstb_match,
DT_MACHINE_START(BRCMSTB, "Broadcom STB (Flattened Device Tree)")
.dt_compat = brcmstb_match,
+ .init_irq = brcmstb_init_irq,
MACHINE_END
MACHINE_END