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

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 547b2f1a84ed6b6f676bebd8773ff65ac910c010..fa2b2f3e118de3404f9d887b7ed5f0deefa655be 100644 (file)
--- 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 7eca81b07d50a8d54ebaacf6d83c2cca274adcd4..5ee5ee2206c644f1799675f4aacb48313cff6a06 100644 (file)
--- 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;