[PATCH v5 2/7] ARM: davinci, cp_intc: Add OF support for TI interrupt controller
From: Heiko Schocher <hidden>
Date: 2012-05-30 10:18:58
Also in:
linux-arm-kernel
Subsystem:
arm port, open firmware and flattened device tree bindings, the rest, ti davinci machine support · Maintainers:
Russell King, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Linus Torvalds, Bartosz Golaszewski
Possibly related (same subject, not in this thread)
- 2012-07-03 · Re: [PATCH v5 2/7] ARM: davinci, cp_intc: Add OF support for TI interrupt controller · Sekhar Nori <hidden>
Add a function to initialize the Common Platform Interrupt Controller
(cp_intc) from TI used on OMAP-L1x SoCs using a device tree node.
Signed-off-by: Heiko Schocher <redacted>
Cc: davinci-linux-open-source-VycZQUHpC/PFrsHnngEfi1aTQe2KTcn/@public.gmane.org
Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
Cc: devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org
Cc: Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>
Cc: Sekhar Nori <redacted>
Cc: Wolfgang Denk <redacted>
Cc: Sergei Shtylyov <redacted>
---
- changes for v4
- split patch in 2 patches, one for irq_domain adaption
one for DT enhancement, as Nori Sekhar suggested.
- add comment from Grant Likely for the DT part:
remove if/else clause, not needed.
Make use of DT runtime configurable
- changes for v5:
add comments from Sergei Shtylyov:
- s/intc/cp_intc in commit subject
add comments from Grant Likely:
- rename compatible" prop to "ti,cp-intc"
.../devicetree/bindings/arm/davinci/intc.txt | 27 ++++++++++++++++++++
arch/arm/mach-davinci/cp_intc.c | 24 ++++++++++++++++-
2 files changed, 49 insertions(+), 2 deletions(-)
create mode 100644 Documentation/devicetree/bindings/arm/davinci/intc.txt
diff --git a/Documentation/devicetree/bindings/arm/davinci/intc.txt b/Documentation/devicetree/bindings/arm/davinci/intc.txt
new file mode 100644
index 0000000..597e8a0
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/davinci/intc.txt@@ -0,0 +1,27 @@ +* TI Common Platform Interrupt Controller + +Common Platform Interrupt Controller (cp_intc) is used on +OMAP-L1x SoCs and can support several configurable number +of interrupts. + +Main node required properties: + +- compatible : should be: + "ti,cp-intc" +- interrupt-controller : Identifies the node as an interrupt controller +- #interrupt-cells : Specifies the number of cells needed to encode an + interrupt source. The type shall be a <u32> and the value shall be 1. + + The cell contains the interrupt number in the range [0-128]. +- ti,intc-size: Number of interrupts handled by the interrupt controller. +- reg: physical base address and size of the intc registers map. + +Example: + + intc: interrupt-controller@1 { + compatible = "ti,cp-intc"; + interrupt-controller; + #interrupt-cells = <1>; + ti,intc-size = <101>; + reg = <0xfffee000 0x2000>; + };
diff --git a/arch/arm/mach-davinci/cp_intc.c b/arch/arm/mach-davinci/cp_intc.c
index 45d5256..d1bef55 100644
--- a/arch/arm/mach-davinci/cp_intc.c
+++ b/arch/arm/mach-davinci/cp_intc.c@@ -14,6 +14,9 @@ #include <linux/irq.h> #include <linux/irqdomain.h> #include <linux/io.h> +#include <linux/of.h> +#include <linux/of_address.h> +#include <linux/of_irq.h> #include <mach/common.h> #include <mach/cp_intc.h>
@@ -119,7 +122,7 @@ static const struct irq_domain_ops cp_intc_host_ops = { .xlate = irq_domain_xlate_onetwocell, }; -int __init __cp_intc_init(struct device_node *node) +int __init __cp_intc_init(struct device_node *node, struct device_node *parent) { u32 num_irq = davinci_soc_info.intc_irq_num; u8 *irq_prio = davinci_soc_info.intc_irq_prios;
@@ -129,6 +132,15 @@ int __init __cp_intc_init(struct device_node *node) davinci_intc_type = DAVINCI_INTC_TYPE_CP_INTC; davinci_intc_base = ioremap(davinci_soc_info.intc_base, SZ_8K); + if (node) { + davinci_intc_base = of_iomap(node, 0); + if (of_property_read_u32(node, "ti,intc-size", &num_irq)) + pr_warn("unable to get intc-size, default to %d\n", + num_irq); + } else { + davinci_intc_base = ioremap(davinci_soc_info.intc_base, + SZ_8K); + } if (WARN_ON(!davinci_intc_base)) return -EINVAL;
@@ -206,7 +218,15 @@ int __init __cp_intc_init(struct device_node *node) return 0; } +static struct of_device_id irq_match[] __initdata = { + { .compatible = "ti,cp-intc", .data = __cp_intc_init, }, + { } +}; + void __init cp_intc_init(void) { - __cp_intc_init(NULL); + if (!of_find_compatible_node(NULL, NULL, "ti,cp-intc")) + __cp_intc_init(NULL, NULL); + else + of_irq_init(irq_match); }
--
1.7.7.6