From 4bf6221ffae31f5e86eba8e5eb1800649c4a494c Mon Sep 17 00:00:00 2001
From: Jonas Gorski <jogo@openwrt.org>
Date: Mon, 8 Dec 2014 16:11:52 +0000
Subject: brcm63xx: fix a few issues in irq chip drivers

Fix locking and lock usage, making it compile for SMP.

Signed-off-by: Jonas Gorski <jogo@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43578 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 ...BCM63XX-register-interrupt-controllers-through-.patch | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'target/linux/brcm63xx/patches-3.14/373-MIPS-BCM63XX-register-interrupt-controllers-through-.patch')

diff --git a/target/linux/brcm63xx/patches-3.14/373-MIPS-BCM63XX-register-interrupt-controllers-through-.patch b/target/linux/brcm63xx/patches-3.14/373-MIPS-BCM63XX-register-interrupt-controllers-through-.patch
index 5a74ddb839..c8c212b08f 100644
--- a/target/linux/brcm63xx/patches-3.14/373-MIPS-BCM63XX-register-interrupt-controllers-through-.patch
+++ b/target/linux/brcm63xx/patches-3.14/373-MIPS-BCM63XX-register-interrupt-controllers-through-.patch
@@ -1,25 +1,25 @@
-From 7c22b08baba941a8c83072047b0d2b55a6b952aa Mon Sep 17 00:00:00 2001
+From 40c0e6e4f68ce0c759eb216b44cdfbe18de328b0 Mon Sep 17 00:00:00 2001
 From: Jonas Gorski <jogo@openwrt.org>
 Date: Mon, 1 Dec 2014 00:20:07 +0100
-Subject: [PATCH] MIPS: BCM63XX: register interrupt controllers through DT
+Subject: [PATCH 5/5] MIPS: BCM63XX: register interrupt controllers through DT
 
 Signed-off-by: Jonas Gorski <jogo@openwrt.org>
 ---
- arch/mips/bcm63xx/irq.c |   10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
+ arch/mips/bcm63xx/irq.c |   12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
 
 --- a/arch/mips/bcm63xx/irq.c
 +++ b/arch/mips/bcm63xx/irq.c
 @@ -15,6 +15,8 @@
  #include <linux/irqchip.h>
- #include <linux/irqchip/irq-bcm6345-ext-intc.h>
- #include <linux/irqchip/irq-bcm6345-l2-intc.h>
+ #include <linux/irqchip/irq-bcm6345-ext.h>
+ #include <linux/irqchip/irq-bcm6345-periph.h>
 +#include <linux/of.h>
 +#include <linux/of_fdt.h>
  #include <asm/irq_cpu.h>
  #include <asm/mipsregs.h>
  #include <bcm63xx_cpu.h>
-@@ -189,7 +191,15 @@ static void bcm63xx_init_irq(void)
+@@ -189,7 +191,17 @@ static void bcm63xx_init_irq(void)
  				      ext_shift);
  }
  
@@ -31,8 +31,10 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
  void __init arch_init_irq(void)
  {
 -	bcm63xx_init_irq();
++#ifdef CONFIG_OF
 +	if (initial_boot_params)
 +		irqchip_init();
 +	else
++#endif
 +		bcm63xx_init_irq();
  }
-- 
cgit v1.2.3