summaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2015-11-04 11:33:16 +0000
committerJonas Gorski <jogo@openwrt.org>2015-11-04 11:33:16 +0000
commit1e43316cb9cd7663cf901b2828d4c26e5913effe (patch)
treeec7a7d95eea65ddbbf0593f0b56b7db36ae17c33 /target/linux/brcm63xx
parent64af3295cdd04b7e9d0753a9a39c69ffa3abb387 (diff)
downloadmaster-31e0f0ae-1e43316cb9cd7663cf901b2828d4c26e5913effe.tar.gz
master-31e0f0ae-1e43316cb9cd7663cf901b2828d4c26e5913effe.tar.bz2
master-31e0f0ae-1e43316cb9cd7663cf901b2828d4c26e5913effe.zip
brcm63xx: fix brcm, bcm6345-ext-intc interrupt controller
brcm,field-width is read but unused Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com> Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 47379
Diffstat (limited to 'target/linux/brcm63xx')
-rw-r--r--target/linux/brcm63xx/patches-3.18/321-irqchip-add-support-for-bcm6345-style-external-inter.patch7
-rw-r--r--target/linux/brcm63xx/patches-4.1/321-irqchip-add-support-for-bcm6345-style-external-inter.patch7
2 files changed, 8 insertions, 6 deletions
diff --git a/target/linux/brcm63xx/patches-3.18/321-irqchip-add-support-for-bcm6345-style-external-inter.patch b/target/linux/brcm63xx/patches-3.18/321-irqchip-add-support-for-bcm6345-style-external-inter.patch
index 547b2f1a84..fa2b2f3e11 100644
--- a/target/linux/brcm63xx/patches-3.18/321-irqchip-add-support-for-bcm6345-style-external-inter.patch
+++ b/target/linux/brcm63xx/patches-3.18/321-irqchip-add-support-for-bcm6345-style-external-inter.patch
@@ -23,7 +23,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
+
+Required properties:
+
-+- compatible: Should be "brcm,bcm6345-l2-intc".
++- compatible: Should be "brcm,bcm6345-ext-intc".
+- reg: Specifies the base physical addresses and size of the registers.
+- interrupt-controller: identifies the node as an interrupt controller.
+- #interrupt-cells: Specifies the number of cells needed to encode an interrupt
@@ -41,7 +41,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
+Example:
+
+ext_intc: interrupt-controller@10000018 {
-+ compatible = "brcm,bcm6345-l2-intc";
++ compatible = "brcm,bcm6345-ext-intc";
+ interrupt-parent = <&periph_intc>;
+ #interrupt-cells = <2>;
+ reg = <0x10000018 0x4>;
@@ -73,7 +73,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
obj-$(CONFIG_METAG) += irq-metag-ext.o
--- /dev/null
+++ b/drivers/irqchip/irq-bcm6345-ext.c
-@@ -0,0 +1,287 @@
+@@ -0,0 +1,288 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License. See the file "COPYING" in the main directory of this archive
@@ -283,6 +283,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
+ }
+
+ data->reg = reg;
++ data->shift = shift;
+
+ data->chip.name = "bcm6345-ext-intc";
+ data->chip.irq_ack = bcm6345_ext_intc_irq_ack;
diff --git a/target/linux/brcm63xx/patches-4.1/321-irqchip-add-support-for-bcm6345-style-external-inter.patch b/target/linux/brcm63xx/patches-4.1/321-irqchip-add-support-for-bcm6345-style-external-inter.patch
index 7eca81b07d..5ee5ee2206 100644
--- a/target/linux/brcm63xx/patches-4.1/321-irqchip-add-support-for-bcm6345-style-external-inter.patch
+++ b/target/linux/brcm63xx/patches-4.1/321-irqchip-add-support-for-bcm6345-style-external-inter.patch
@@ -23,7 +23,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
+
+Required properties:
+
-+- compatible: Should be "brcm,bcm6345-l2-intc".
++- compatible: Should be "brcm,bcm6345-ext-intc".
+- reg: Specifies the base physical addresses and size of the registers.
+- interrupt-controller: identifies the node as an interrupt controller.
+- #interrupt-cells: Specifies the number of cells needed to encode an interrupt
@@ -41,7 +41,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
+Example:
+
+ext_intc: interrupt-controller@10000018 {
-+ compatible = "brcm,bcm6345-l2-intc";
++ compatible = "brcm,bcm6345-ext-intc";
+ interrupt-parent = <&periph_intc>;
+ #interrupt-cells = <2>;
+ reg = <0x10000018 0x4>;
@@ -73,7 +73,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
obj-$(CONFIG_METAG) += irq-metag-ext.o
--- /dev/null
+++ b/drivers/irqchip/irq-bcm6345-ext.c
-@@ -0,0 +1,287 @@
+@@ -0,0 +1,288 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License. See the file "COPYING" in the main directory of this archive
@@ -283,6 +283,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
+ }
+
+ data->reg = reg;
++ data->shift = shift;
+
+ data->chip.name = "bcm6345-ext-intc";
+ data->chip.irq_ack = bcm6345_ext_intc_irq_ack;