From 1e43316cb9cd7663cf901b2828d4c26e5913effe Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Wed, 4 Nov 2015 11:33:16 +0000 Subject: [PATCH] brcm63xx: fix brcm, bcm6345-ext-intc interrupt controller MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit brcm,field-width is read but unused Signed-off-by: Álvaro Fernández Rojas Signed-off-by: Jonas Gorski SVN-Revision: 47379 --- ...chip-add-support-for-bcm6345-style-external-inter.patch | 7 ++++--- ...chip-add-support-for-bcm6345-style-external-inter.patch | 7 ++++--- 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 + +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 +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 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 + } + + 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 + +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 +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 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 + } + + data->reg = reg; ++ data->shift = shift; + + data->chip.name = "bcm6345-ext-intc"; + data->chip.irq_ack = bcm6345_ext_intc_irq_ack;