domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

brcm63xx: fix brcm, bcm6345-ext-intc interrupt controller

Browse Source 
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
This commit is contained in:
Jonas Gorski
2015-11-04 11:33:16 +00:00
parent 64af3295cd
commit 1e43316cb9
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
target/linux/brcm63xx/patches-3.18/321-irqchip-add-support-for-bcm6345-style-external-inter.patch
View File

@@ -23,7 +23,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
+ +
+Required properties: +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. +- reg: Specifies the base physical addresses and size of the registers.
+- interrupt-controller: identifies the node as an interrupt controller. +- interrupt-controller: identifies the node as an interrupt controller.
+- #interrupt-cells: Specifies the number of cells needed to encode an interrupt +- #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: +Example:
+ +
+ext_intc: interrupt-controller@10000018 { +ext_intc: interrupt-controller@10000018 {
+ compatible = "brcm,bcm6345-l2-intc"; + compatible = "brcm,bcm6345-ext-intc";
+ interrupt-parent = <&periph_intc>; + interrupt-parent = <&periph_intc>;
+ #interrupt-cells = <2>; + #interrupt-cells = <2>;
+ reg = <0x10000018 0x4>; + reg = <0x10000018 0x4>;
@@ -73,7 +73,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
obj-$(CONFIG_METAG) += irq-metag-ext.o obj-$(CONFIG_METAG) += irq-metag-ext.o
--- /dev/null --- /dev/null
+++ b/drivers/irqchip/irq-bcm6345-ext.c +++ 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 + * 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 + * 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->reg = reg;
+ data->shift = shift;
+ +
+ data->chip.name = "bcm6345-ext-intc"; + data->chip.name = "bcm6345-ext-intc";
+ data->chip.irq_ack = bcm6345_ext_intc_irq_ack; + data->chip.irq_ack = bcm6345_ext_intc_irq_ack;

7
target/linux/brcm63xx/patches-4.1/321-irqchip-add-support-for-bcm6345-style-external-inter.patch
View File

@@ -23,7 +23,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
+ +
+Required properties: +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. +- reg: Specifies the base physical addresses and size of the registers.
+- interrupt-controller: identifies the node as an interrupt controller. +- interrupt-controller: identifies the node as an interrupt controller.
+- #interrupt-cells: Specifies the number of cells needed to encode an interrupt +- #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: +Example:
+ +
+ext_intc: interrupt-controller@10000018 { +ext_intc: interrupt-controller@10000018 {
+ compatible = "brcm,bcm6345-l2-intc"; + compatible = "brcm,bcm6345-ext-intc";
+ interrupt-parent = <&periph_intc>; + interrupt-parent = <&periph_intc>;
+ #interrupt-cells = <2>; + #interrupt-cells = <2>;
+ reg = <0x10000018 0x4>; + reg = <0x10000018 0x4>;
@@ -73,7 +73,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
obj-$(CONFIG_METAG) += irq-metag-ext.o obj-$(CONFIG_METAG) += irq-metag-ext.o
--- /dev/null --- /dev/null
+++ b/drivers/irqchip/irq-bcm6345-ext.c +++ 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 + * 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 + * 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->reg = reg;
+ data->shift = shift;
+ +
+ data->chip.name = "bcm6345-ext-intc"; + data->chip.name = "bcm6345-ext-intc";
+ data->chip.irq_ack = bcm6345_ext_intc_irq_ack; + data->chip.irq_ack = bcm6345_ext_intc_irq_ack;