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

9 files changed, 11 insertions, 9 deletions

diff --git a/target/linux/brcm63xx/dts/bcm6318.dtsi b/target/linux/brcm63xx/dts/bcm6318.dtsi
index 723c488f20..97bdea7b5b 100644
--- a/target/linux/brcm63xx/dts/bcm6318.dtsi
+++ b/target/linux/brcm63xx/dts/bcm6318.dtsi
@@ -42,7 +42,7 @@
 		};
 
 		periph_intc: interrupt-controller@10000020 {
-			compatible = "brcm,bcm6345-l2-intc";
+			compatible = "brcm,bcm6345-periph-intc";
 			reg = <0x10000020 0x20>;
 
 			interrupt-controller;
diff --git a/target/linux/brcm63xx/dts/bcm63268.dtsi b/target/linux/brcm63xx/dts/bcm63268.dtsi
index 214cd6266c..bc80d70575 100644
--- a/target/linux/brcm63xx/dts/bcm63268.dtsi
+++ b/target/linux/brcm63xx/dts/bcm63268.dtsi
@@ -48,7 +48,7 @@
 		};
 
 		periph_intc: interrupt-controller@10000020 {
-			compatible = "brcm,bcm6345-l2-intc";
+			compatible = "brcm,bcm6345-periph-intc";
 			reg = <0x10000020 0x20>,
 			      <0x10000040 0x20>;
 
diff --git a/target/linux/brcm63xx/dts/bcm6328.dtsi b/target/linux/brcm63xx/dts/bcm6328.dtsi
index 0ed186e185..53f96ff009 100644
--- a/target/linux/brcm63xx/dts/bcm6328.dtsi
+++ b/target/linux/brcm63xx/dts/bcm6328.dtsi
@@ -42,7 +42,7 @@
 		};
 
 		periph_intc: interrupt-controller@10000020 {
-			compatible = "brcm,bcm6345-l2-intc";
+			compatible = "brcm,bcm6345-periph-intc";
 			reg = <0x10000020 0x10>;
 
 			interrupt-controller;
diff --git a/target/linux/brcm63xx/dts/bcm6338.dtsi b/target/linux/brcm63xx/dts/bcm6338.dtsi
index b527781060..c1980f4036 100644
--- a/target/linux/brcm63xx/dts/bcm6338.dtsi
+++ b/target/linux/brcm63xx/dts/bcm6338.dtsi
@@ -45,7 +45,7 @@
 		compatible = "simple-bus";
 
 		periph_intc: interrupt-controller@fffe000c {
-			compatible = "brcm,bcm6345-l2-intc";
+			compatible = "brcm,bcm6345-periph-intc";
 			reg = <0xfffe000c 0x8>;
 
 			interrupt-controller;
diff --git a/target/linux/brcm63xx/dts/bcm6345.dtsi b/target/linux/brcm63xx/dts/bcm6345.dtsi
index 16ba8bd6c0..e8e7016ff7 100644
--- a/target/linux/brcm63xx/dts/bcm6345.dtsi
+++ b/target/linux/brcm63xx/dts/bcm6345.dtsi
@@ -45,7 +45,7 @@
 		compatible = "simple-bus";
 
 		periph_intc: interrupt-controller@fffe000c {
-			compatible = "brcm,bcm6345-l2-intc";
+			compatible = "brcm,bcm6345-periph-intc";
 			reg = <0xfffe000c 0x9>;
 
 			interrupt-controller;
diff --git a/target/linux/brcm63xx/dts/bcm6348.dtsi b/target/linux/brcm63xx/dts/bcm6348.dtsi
index 06ecbaa1f9..7dd423b9ca 100644
--- a/target/linux/brcm63xx/dts/bcm6348.dtsi
+++ b/target/linux/brcm63xx/dts/bcm6348.dtsi
@@ -45,7 +45,7 @@
 		compatible = "simple-bus";
 
 		periph_intc: interrupt-controller@fffe000c {
-			compatible = "brcm,bcm6345-l2-intc";
+			compatible = "brcm,bcm6345-periph-intc";
 			reg = <0xfffe000c 0x8>;
 
 			interrupt-controller;
@@ -64,6 +64,8 @@
 
 			interrupt-parent = <&cpu_intc>;
 			interrupts = <3>, <4>, <5>, <6>;
+
+			brcm,field-width = <5>;
 		};
 	};
 };
diff --git a/target/linux/brcm63xx/dts/bcm6358.dtsi b/target/linux/brcm63xx/dts/bcm6358.dtsi
index a4af2144a8..7217b8db6e 100644
--- a/target/linux/brcm63xx/dts/bcm6358.dtsi
+++ b/target/linux/brcm63xx/dts/bcm6358.dtsi
@@ -51,7 +51,7 @@
 		compatible = "simple-bus";
 
 		periph_intc: interrupt-controller@fffe000c {
-			compatible = "brcm,bcm6345-l2-intc";
+			compatible = "brcm,bcm6345-periph-intc";
 			reg = <0xfffe000c 0x8>,
 			      <0xfffe0038 0x8>;
 
diff --git a/target/linux/brcm63xx/dts/bcm6362.dtsi b/target/linux/brcm63xx/dts/bcm6362.dtsi
index 36765b0eba..4e2e41d5d4 100644
--- a/target/linux/brcm63xx/dts/bcm6362.dtsi
+++ b/target/linux/brcm63xx/dts/bcm6362.dtsi
@@ -48,7 +48,7 @@
 		};
 
 		periph_intc: interrupt-controller@10000020 {
-			compatible = "brcm,bcm6345-l2-intc";
+			compatible = "brcm,bcm6345-periph-intc";
 			reg = <0x10000020 0x10>,
 			      <0x10000030 0x10>;
 
diff --git a/target/linux/brcm63xx/dts/bcm6368.dtsi b/target/linux/brcm63xx/dts/bcm6368.dtsi
index dcbbdbfe81..27b9f62b69 100644
--- a/target/linux/brcm63xx/dts/bcm6368.dtsi
+++ b/target/linux/brcm63xx/dts/bcm6368.dtsi
@@ -63,7 +63,7 @@
 		};
 
 		periph_intc: interrupt-controller@10000020 {
-			compatible = "brcm,bcm6345-l2-intc";
+			compatible = "brcm,bcm6345-periph-intc";
 			reg = <0x10000020 0x10>,
 			      <0x10000030 0x10>;