From mboxrd@z Thu Jan 1 00:00:00 1970 From: nsekhar@ti.com (Sekhar Nori) Date: Wed, 4 Jul 2012 00:39:20 +0530 Subject: [PATCH v5 2/7] ARM: davinci, cp_intc: Add OF support for TI interrupt controller In-Reply-To: <1338373143-7467-3-git-send-email-hs@denx.de> References: <1338373143-7467-1-git-send-email-hs@denx.de> <1338373143-7467-3-git-send-email-hs@denx.de> Message-ID: <4FF34360.6030501@ti.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hi Heiko, On 5/30/2012 3:48 PM, Heiko Schocher wrote: > 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 > Cc: davinci-linux-open-source at linux.davincidsp.com > Cc: linux-arm-kernel at lists.infradead.org > Cc: devicetree-discuss at lists.ozlabs.org > Cc: Grant Likely > Cc: Sekhar Nori > Cc: Wolfgang Denk > Cc: Sergei Shtylyov > > --- > - 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 I think this file is better named cp-intc.txt since there is also an intc (a different IP) used on DaVinci platforms. > @@ -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 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 at 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 > #include > #include > +#include > +#include > +#include > > #include > #include > @@ -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); This line needs to be dropped because you are doing an ioremap again down below. > + 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); It turns out of_irq_init() does not exist on non-DT builds so this cause build breakage when DT is not being used. Looking around, other platforms are calling of_irq_init() in the generic DT board file and not in the interrupt controller code. See arch/arm/mach-at91/board-dt.c or arch/arm/mach-omap2/board-generic.c for examples. We need to adopt a similar strategy for DaVinci. To save time, I implemented these fixes and created a new patch which I will send across shortly. Please have a look at that and let me know if it works for you. I tested the patch on AM18x EVM. Thanks, Sekhar From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sekhar Nori Subject: Re: [PATCH v5 2/7] ARM: davinci, cp_intc: Add OF support for TI interrupt controller Date: Wed, 4 Jul 2012 00:39:20 +0530 Message-ID: <4FF34360.6030501@ti.com> References: <1338373143-7467-1-git-send-email-hs@denx.de> <1338373143-7467-3-git-send-email-hs@denx.de> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1338373143-7467-3-git-send-email-hs-ynQEQJNshbs@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: devicetree-discuss-bounces+gldd-devicetree-discuss=m.gmane.org-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org Sender: "devicetree-discuss" To: Heiko Schocher Cc: davinci-linux-open-source-VycZQUHpC/PFrsHnngEfi1aTQe2KTcn/@public.gmane.org, Wolfgang Denk , Sergei Shtylyov , devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org List-Id: devicetree@vger.kernel.org Hi Heiko, On 5/30/2012 3:48 PM, Heiko Schocher wrote: > 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 > 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 > Cc: Sekhar Nori > Cc: Wolfgang Denk > Cc: Sergei Shtylyov > > --- > - 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 I think this file is better named cp-intc.txt since there is also an intc (a different IP) used on DaVinci platforms. > @@ -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 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 > #include > #include > +#include > +#include > +#include > > #include > #include > @@ -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); This line needs to be dropped because you are doing an ioremap again down below. > + 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); It turns out of_irq_init() does not exist on non-DT builds so this cause build breakage when DT is not being used. Looking around, other platforms are calling of_irq_init() in the generic DT board file and not in the interrupt controller code. See arch/arm/mach-at91/board-dt.c or arch/arm/mach-omap2/board-generic.c for examples. We need to adopt a similar strategy for DaVinci. To save time, I implemented these fixes and created a new patch which I will send across shortly. Please have a look at that and let me know if it works for you. I tested the patch on AM18x EVM. Thanks, Sekhar