Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753242Ab2KKMy5 (ORCPT ); Sun, 11 Nov 2012 07:54:57 -0500 Received: from mail-bk0-f46.google.com ([209.85.214.46]:45333 "EHLO mail-bk0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753114Ab2KKMul (ORCPT ); Sun, 11 Nov 2012 07:50:41 -0500 From: Jonas Gorski To: linux-mips@linux-mips.org Cc: Ralf Baechle , John Crispin , Maxime Bizon , Florian Fainelli , Kevin Cernekee , devicetree-discuss@lists.ozlabs.org, linux-kernel@vger.kernel.org Subject: [RFC] MIPS: BCM63XX: add Device Tree glue code for IRQ handling Date: Sun, 11 Nov 2012 13:50:38 +0100 Message-Id: <1352638249-29298-5-git-send-email-jonas.gorski@gmail.com> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1352638249-29298-1-git-send-email-jonas.gorski@gmail.com> References: <1352638249-29298-1-git-send-email-jonas.gorski@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 8203 Lines: 288 Register IRQ domains through Device Tree for the internal and external interrupt controllers. Register the same IRQ ranges as previously to provide backward compatibility for non-DT drivers. Signed-off-by: Jonas Gorski --- .../devicetree/bindings/mips/bcm63xx/epic.txt | 20 ++++++++++++ .../devicetree/bindings/mips/bcm63xx/ipic.txt | 18 +++++++++++ arch/mips/bcm63xx/dts/bcm6328.dtsi | 16 ++++++++++ arch/mips/bcm63xx/dts/bcm6338.dtsi | 16 ++++++++++ arch/mips/bcm63xx/dts/bcm6345.dtsi | 16 ++++++++++ arch/mips/bcm63xx/dts/bcm6348.dtsi | 16 ++++++++++ arch/mips/bcm63xx/dts/bcm6358.dtsi | 16 ++++++++++ arch/mips/bcm63xx/dts/bcm6368.dtsi | 16 ++++++++++ arch/mips/bcm63xx/irq.c | 32 ++++++++++++++++++++ 9 files changed, 166 insertions(+), 0 deletions(-) create mode 100644 Documentation/devicetree/bindings/mips/bcm63xx/epic.txt create mode 100644 Documentation/devicetree/bindings/mips/bcm63xx/ipic.txt diff --git a/Documentation/devicetree/bindings/mips/bcm63xx/epic.txt b/Documentation/devicetree/bindings/mips/bcm63xx/epic.txt new file mode 100644 index 0000000..4fc74e8 --- /dev/null +++ b/Documentation/devicetree/bindings/mips/bcm63xx/epic.txt @@ -0,0 +1,20 @@ +* Broadcom BCM63XX External Interrupt Controller + +Properties: +- compatible: "brcm,bcm63xx-epic" + Compatible with all bcm63xx SoCs. + +- interrupt-controller: This is an interrupt controller. + +- #interrupt-cells: <2> + This controller supports level and edge triggered interrupts. The + first cell is the interrupt number, the second is a 1:1 mapping to + the linux interrupt flags. + +Example: + + epic: interrupt-controller@18 { + compatible = "brcm,bcm63xx-epic"; + interrupt-controller; + #interrupt-cells = <2>; + } diff --git a/Documentation/devicetree/bindings/mips/bcm63xx/ipic.txt b/Documentation/devicetree/bindings/mips/bcm63xx/ipic.txt new file mode 100644 index 0000000..1cbabf90 --- /dev/null +++ b/Documentation/devicetree/bindings/mips/bcm63xx/ipic.txt @@ -0,0 +1,18 @@ +* BCM63XX Internal Interrupt Controller + +Properties: +- compatible: "brcm,bcm63xx-ipic" + Compatible with all bcm63xx SoCs. + +- interrupt-controller: This is an interrupt controller. + +- #interrupt-cells: <1> + This controller supports only level interrupts. + +Example: + + ipic: interrupt-controller@20 { + compatible = "brcm,bcm63xx-ipic"; + interrupt-controller; + #interrupt-cells = <1>; + } diff --git a/arch/mips/bcm63xx/dts/bcm6328.dtsi b/arch/mips/bcm63xx/dts/bcm6328.dtsi index a0e1835..a41033a 100644 --- a/arch/mips/bcm63xx/dts/bcm6328.dtsi +++ b/arch/mips/bcm63xx/dts/bcm6328.dtsi @@ -26,5 +26,21 @@ #size-cells = <1>; ranges = <0 0x10000000 0x20000>; compatible = "simple-bus"; + + interrupt-parent = <&ipic>; + + perf@0 { + epic: interrupt-controller@18 { + compatible = "brcm,bcm63xx-epic"; + interrupt-controller; + #interrupt-cells = <2>; + }; + + ipic: interrupt-controller@20 { + compatible = "brcm,bcm63xx-ipic"; + interrupt-controller; + #interrupt-cells = <1>; + }; + }; }; }; diff --git a/arch/mips/bcm63xx/dts/bcm6338.dtsi b/arch/mips/bcm63xx/dts/bcm6338.dtsi index 21772d9..8ecbc4f 100644 --- a/arch/mips/bcm63xx/dts/bcm6338.dtsi +++ b/arch/mips/bcm63xx/dts/bcm6338.dtsi @@ -26,5 +26,21 @@ #size-cells = <1>; ranges = <0 0xfffe0000 0x20000>; compatible = "simple-bus"; + + interrupt-parent = <&ipic>; + + perf@0 { + ipic: interrupt-controller@c { + compatible = "brcm,bcm63xx-ipic"; + interrupt-controller; + #interrupt-cells = <1>; + }; + + epic: interrupt-controller@14 { + compatible = "brcm,bcm63xx-epic"; + interrupt-controller; + #interrupt-cells = <2>; + }; + }; }; }; diff --git a/arch/mips/bcm63xx/dts/bcm6345.dtsi b/arch/mips/bcm63xx/dts/bcm6345.dtsi index f1e7153..ed17c12 100644 --- a/arch/mips/bcm63xx/dts/bcm6345.dtsi +++ b/arch/mips/bcm63xx/dts/bcm6345.dtsi @@ -26,5 +26,21 @@ #size-cells = <1>; ranges = <0 0xfffe0000 0x20000>; compatible = "simple-bus"; + + interrupt-parent = <&ipic>; + + perf@0 { + ipic: interrupt-controller@c { + compatible = "brcm,bcm63xx-ipic"; + interrupt-controller; + #interrupt-cells = <1>; + }; + + epic: interrupt-controller@14 { + compatible = "brcm,bcm63xx-epic"; + interrupt-controller; + #interrupt-cells = <2>; + }; + }; }; }; diff --git a/arch/mips/bcm63xx/dts/bcm6348.dtsi b/arch/mips/bcm63xx/dts/bcm6348.dtsi index 8a5a2dc..d54cf20 100644 --- a/arch/mips/bcm63xx/dts/bcm6348.dtsi +++ b/arch/mips/bcm63xx/dts/bcm6348.dtsi @@ -26,5 +26,21 @@ #size-cells = <1>; ranges = <0 0xfffe0000 0x20000>; compatible = "simple-bus"; + + interrupt-parent = <&ipic>; + + perf@0 { + ipic: interrupt-controller@c { + compatible = "brcm,bcm63xx-ipic"; + interrupt-controller; + #interrupt-cells = <1>; + }; + + epic: interrupt-controller@14 { + compatible = "brcm,bcm63xx-epic"; + interrupt-controller; + #interrupt-cells = <2>; + }; + }; }; }; diff --git a/arch/mips/bcm63xx/dts/bcm6358.dtsi b/arch/mips/bcm63xx/dts/bcm6358.dtsi index 1d3f20f..6ef283f 100644 --- a/arch/mips/bcm63xx/dts/bcm6358.dtsi +++ b/arch/mips/bcm63xx/dts/bcm6358.dtsi @@ -29,5 +29,21 @@ #size-cells = <1>; ranges = <0 0xfffe0000 0x20000>; compatible = "simple-bus"; + + interrupt-parent = <&ipic>; + + perf@0 { + epic: interrupt-controller@18 { + compatible = "brcm,bcm63xx-epic"; + interrupt-controller; + #interrupt-cells = <2>; + }; + + ipic: interrupt-controller@20 { + compatible = "brcm,bcm63xx-ipic"; + interrupt-controller; + #interrupt-cells = <1>; + }; + }; }; }; diff --git a/arch/mips/bcm63xx/dts/bcm6368.dtsi b/arch/mips/bcm63xx/dts/bcm6368.dtsi index a7624b9..ae1b584 100644 --- a/arch/mips/bcm63xx/dts/bcm6368.dtsi +++ b/arch/mips/bcm63xx/dts/bcm6368.dtsi @@ -29,5 +29,21 @@ #size-cells = <1>; ranges = <0 0x10000000 0x20000>; compatible = "simple-bus"; + + interrupt-parent = <&ipic>; + + perf@0 { + epic: interrupt-controller@18 { + compatible = "brcm,bcm63xx-epic"; + interrupt-controller; + #interrupt-cells = <2>; + }; + + ipic: interrupt-controller@20 { + compatible = "brcm,bcm63xx-ipic"; + interrupt-controller; + #interrupt-cells = <1>; + }; + }; }; }; diff --git a/arch/mips/bcm63xx/irq.c b/arch/mips/bcm63xx/irq.c index da24c2b..3b64066 100644 --- a/arch/mips/bcm63xx/irq.c +++ b/arch/mips/bcm63xx/irq.c @@ -12,6 +12,8 @@ #include #include #include +#include +#include #include #include #include @@ -515,6 +517,34 @@ static struct irqaction cpu_ext_cascade_action = { .flags = IRQF_NO_THREAD, }; +static int __init bcm63xx_ipic_of_init(struct device_node *node, + struct device_node *parent) +{ + if (!irq_domain_add_simple(node, + IRQ_EXTERNAL_BASE - IRQ_INTERNAL_BASE, + IRQ_INTERNAL_BASE, &irq_domain_simple_ops, + NULL)) + panic("unable to add ipic domain!\n"); + + return 0; +} + +static int __init bcm63xx_epic_of_init(struct device_node *node, + struct device_node *parent) +{ + if (!irq_domain_add_simple(node, ext_irq_count, IRQ_EXTERNAL_BASE, + &irq_domain_simple_ops, NULL)) + panic("unable to add epic domain!\n"); + + return 0; +} + +static const struct of_device_id bcm63xx_pic_of_match[] __initconst = { + { .compatible = "brcm,bcm63xx-ipic", .data = bcm63xx_ipic_of_init }, + { .compatible = "brcm,bcm63xx-epic", .data = bcm63xx_epic_of_init }, + { }, +}; + void __init arch_init_irq(void) { int i; @@ -535,4 +565,6 @@ void __init arch_init_irq(void) } setup_irq(MIPS_CPU_IRQ_BASE + 2, &cpu_ip2_cascade_action); + + of_irq_init(bcm63xx_pic_of_match); } -- 1.7.2.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/