| Message ID | 1346247067-9632-2-git-send-email-peter.ujfalusi@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Peter, The overall series looks good to me, but I do have a couple of comments. On 08/29/2012 03:31 PM, Peter Ujfalusi wrote: > The McBSP IP within OMAP2420 and 2430 is different we need to create separate > dtsi files for them. > > Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> > --- > arch/arm/boot/dts/omap2420.dtsi | 39 ++++++++++++++++++ > arch/arm/boot/dts/omap2430.dtsi | 83 +++++++++++++++++++++++++++++++++++++++ > 2 files changed, 122 insertions(+), 0 deletions(-) > create mode 100644 arch/arm/boot/dts/omap2420.dtsi > create mode 100644 arch/arm/boot/dts/omap2430.dtsi > > diff --git a/arch/arm/boot/dts/omap2420.dtsi b/arch/arm/boot/dts/omap2420.dtsi > new file mode 100644 > index 0000000..f375c68 > --- /dev/null > +++ b/arch/arm/boot/dts/omap2420.dtsi > @@ -0,0 +1,39 @@ > +/* > + * Device Tree Source for OMAP2420 SoC > + * > + * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/ Nit: 2012 > + * > + * This file is licensed under the terms of the GNU General Public License > + * version 2. This program is licensed "as is" without any warranty of any > + * kind, whether express or implied. > + */ > + > +/include/ "omap2.dtsi" > + > +/ { > + compatible = "ti,omap2420", "ti,omap2"; > + > + ocp { > + mcbsp1: mcbsp@48074000 { > + compatible = "ti,omap2420-mcbsp"; > + reg = <0x48074000 0xff>; > + reg-names = "mpu"; > + interrupts = <0 59 0x4>, /* TX interrupt */ > + <0 60 0x4>; /* RX interrupt */ That one is not correct because it does comply with the interrupt controller specifier that require only one cell: intc: interrupt-controller@48200000 { compatible = "ti,omap2-intc"; interrupt-controller; #interrupt-cells = <1>; ... The one you are using is for GIC IRQ controller. It works probably because we are using hwmod so far :-) Didn't you get some warning? In the case of OMAP2 & 3, it is much simpler: > + interrupts = <59>, /* TX interrupt */ > + <60>; /* RX interrupt */ That comment is applicable for OMAP2420, OMAP2430, and OMAP3 in general. > + interrupt-names = "tx", "rx"; > + interrupt-parent = <&intc>; > + ti,hwmods = "mcbsp1"; > + }; > + > + mcbsp2: mcbsp@48076000 { > + compatible = "ti,omap2420-mcbsp"; > + reg = <0x48076000 0xff>; > + reg-names = "mpu"; > + interrupts = <0 62 0x4>, /* TX interrupt */ > + <0 63 0x4>; /* RX interrupt */ > + interrupt-names = "tx", "rx"; > + interrupt-parent = <&intc>; > + ti,hwmods = "mcbsp2"; > + }; > + }; > +}; > diff --git a/arch/arm/boot/dts/omap2430.dtsi b/arch/arm/boot/dts/omap2430.dtsi > new file mode 100644 > index 0000000..531e346 > --- /dev/null > +++ b/arch/arm/boot/dts/omap2430.dtsi > @@ -0,0 +1,83 @@ > +/* > + * Device Tree Source for OMAP243x SoC > + * > + * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/ 2012. Regards, Benoit
On 9/3/2012 8:16 PM, Benoit Cousson wrote: > Hi Peter, > > The overall series looks good to me, but I do have a couple of comments. > > On 08/29/2012 03:31 PM, Peter Ujfalusi wrote: >> The McBSP IP within OMAP2420 and 2430 is different we need to create separate >> dtsi files for them. >> >> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> >> --- >> arch/arm/boot/dts/omap2420.dtsi | 39 ++++++++++++++++++ >> arch/arm/boot/dts/omap2430.dtsi | 83 +++++++++++++++++++++++++++++++++++++++ >> 2 files changed, 122 insertions(+), 0 deletions(-) >> create mode 100644 arch/arm/boot/dts/omap2420.dtsi >> create mode 100644 arch/arm/boot/dts/omap2430.dtsi >> >> diff --git a/arch/arm/boot/dts/omap2420.dtsi b/arch/arm/boot/dts/omap2420.dtsi >> new file mode 100644 >> index 0000000..f375c68 >> --- /dev/null >> +++ b/arch/arm/boot/dts/omap2420.dtsi >> @@ -0,0 +1,39 @@ >> +/* >> + * Device Tree Source for OMAP2420 SoC >> + * >> + * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/ > > Nit: 2012 > >> + * >> + * This file is licensed under the terms of the GNU General Public License >> + * version 2. This program is licensed "as is" without any warranty of any >> + * kind, whether express or implied. >> + */ >> + >> +/include/ "omap2.dtsi" >> + >> +/ { >> + compatible = "ti,omap2420", "ti,omap2"; >> + >> + ocp { >> + mcbsp1: mcbsp@48074000 { >> + compatible = "ti,omap2420-mcbsp"; >> + reg = <0x48074000 0xff>; >> + reg-names = "mpu"; >> + interrupts = <0 59 0x4>, /* TX interrupt */ >> + <0 60 0x4>; /* RX interrupt */ > > That one is not correct because it does comply with the interrupt > controller specifier that require only one cell: > > intc: interrupt-controller@48200000 { > compatible = "ti,omap2-intc"; > interrupt-controller; > #interrupt-cells = <1>; > ... > > The one you are using is for GIC IRQ controller. > It works probably because we are using hwmod so far :-) > I think now we should kill the resource overwrite path, and should respect and use resources passed from DT. Benoit, Did you get a chance to validate patch submitted towards this?? https://patchwork.kernel.org/patch/1384351/ Thanks, Vaibhav > Didn't you get some warning? > > In the case of OMAP2 & 3, it is much simpler: > >> + interrupts = <59>, /* TX interrupt */ >> + <60>; /* RX interrupt */ > > That comment is applicable for OMAP2420, OMAP2430, and OMAP3 in general. > >> + interrupt-names = "tx", "rx"; >> + interrupt-parent = <&intc>; >> + ti,hwmods = "mcbsp1"; >> + }; >> + >> + mcbsp2: mcbsp@48076000 { >> + compatible = "ti,omap2420-mcbsp"; >> + reg = <0x48076000 0xff>; >> + reg-names = "mpu"; >> + interrupts = <0 62 0x4>, /* TX interrupt */ >> + <0 63 0x4>; /* RX interrupt */ >> + interrupt-names = "tx", "rx"; >> + interrupt-parent = <&intc>; >> + ti,hwmods = "mcbsp2"; >> + }; >> + }; >> +}; >> diff --git a/arch/arm/boot/dts/omap2430.dtsi b/arch/arm/boot/dts/omap2430.dtsi >> new file mode 100644 >> index 0000000..531e346 >> --- /dev/null >> +++ b/arch/arm/boot/dts/omap2430.dtsi >> @@ -0,0 +1,83 @@ >> +/* >> + * Device Tree Source for OMAP243x SoC >> + * >> + * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/ > > 2012. > > Regards, > Benoit > > _______________________________________________ > devicetree-discuss mailing list > devicetree-discuss@lists.ozlabs.org > https://lists.ozlabs.org/listinfo/devicetree-discuss >
Hi Vaibhav, On 09/04/2012 05:42 AM, Vaibhav Hiremath wrote: > On 9/3/2012 8:16 PM, Benoit Cousson wrote: >> Hi Peter, >> >> The overall series looks good to me, but I do have a couple of comments. >> >> On 08/29/2012 03:31 PM, Peter Ujfalusi wrote: >>> The McBSP IP within OMAP2420 and 2430 is different we need to create separate >>> dtsi files for them. >>> >>> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> >>> --- >>> arch/arm/boot/dts/omap2420.dtsi | 39 ++++++++++++++++++ >>> arch/arm/boot/dts/omap2430.dtsi | 83 +++++++++++++++++++++++++++++++++++++++ >>> 2 files changed, 122 insertions(+), 0 deletions(-) >>> create mode 100644 arch/arm/boot/dts/omap2420.dtsi >>> create mode 100644 arch/arm/boot/dts/omap2430.dtsi >>> >>> diff --git a/arch/arm/boot/dts/omap2420.dtsi b/arch/arm/boot/dts/omap2420.dtsi >>> new file mode 100644 >>> index 0000000..f375c68 >>> --- /dev/null >>> +++ b/arch/arm/boot/dts/omap2420.dtsi >>> @@ -0,0 +1,39 @@ >>> +/* >>> + * Device Tree Source for OMAP2420 SoC >>> + * >>> + * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/ >> >> Nit: 2012 >> >>> + * >>> + * This file is licensed under the terms of the GNU General Public License >>> + * version 2. This program is licensed "as is" without any warranty of any >>> + * kind, whether express or implied. >>> + */ >>> + >>> +/include/ "omap2.dtsi" >>> + >>> +/ { >>> + compatible = "ti,omap2420", "ti,omap2"; >>> + >>> + ocp { >>> + mcbsp1: mcbsp@48074000 { >>> + compatible = "ti,omap2420-mcbsp"; >>> + reg = <0x48074000 0xff>; >>> + reg-names = "mpu"; >>> + interrupts = <0 59 0x4>, /* TX interrupt */ >>> + <0 60 0x4>; /* RX interrupt */ >> >> That one is not correct because it does comply with the interrupt >> controller specifier that require only one cell: >> >> intc: interrupt-controller@48200000 { >> compatible = "ti,omap2-intc"; >> interrupt-controller; >> #interrupt-cells = <1>; >> ... >> >> The one you are using is for GIC IRQ controller. >> It works probably because we are using hwmod so far :-) >> > > I think now we should kill the resource overwrite path, and should > respect and use resources passed from DT. > > Benoit, > Did you get a chance to validate patch submitted towards this?? Not yet, but we discussed that with Peter and since he does have these patches for DT, he'll be able to test your series with the McBSP changes. I still want to update a couple of DTS to test that on some other IPs. Regards, Benoit
On Tue, Sep 04, 2012 at 15:47:59, Cousson, Benoit wrote: > Hi Vaibhav, > > On 09/04/2012 05:42 AM, Vaibhav Hiremath wrote: > > On 9/3/2012 8:16 PM, Benoit Cousson wrote: > >> Hi Peter, > >> > >> The overall series looks good to me, but I do have a couple of comments. > >> > >> On 08/29/2012 03:31 PM, Peter Ujfalusi wrote: > >>> The McBSP IP within OMAP2420 and 2430 is different we need to create separate > >>> dtsi files for them. > >>> > >>> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> > >>> --- > >>> arch/arm/boot/dts/omap2420.dtsi | 39 ++++++++++++++++++ > >>> arch/arm/boot/dts/omap2430.dtsi | 83 +++++++++++++++++++++++++++++++++++++++ > >>> 2 files changed, 122 insertions(+), 0 deletions(-) > >>> create mode 100644 arch/arm/boot/dts/omap2420.dtsi > >>> create mode 100644 arch/arm/boot/dts/omap2430.dtsi > >>> > >>> diff --git a/arch/arm/boot/dts/omap2420.dtsi b/arch/arm/boot/dts/omap2420.dtsi > >>> new file mode 100644 > >>> index 0000000..f375c68 > >>> --- /dev/null > >>> +++ b/arch/arm/boot/dts/omap2420.dtsi > >>> @@ -0,0 +1,39 @@ > >>> +/* > >>> + * Device Tree Source for OMAP2420 SoC > >>> + * > >>> + * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/ > >> > >> Nit: 2012 > >> > >>> + * > >>> + * This file is licensed under the terms of the GNU General Public License > >>> + * version 2. This program is licensed "as is" without any warranty of any > >>> + * kind, whether express or implied. > >>> + */ > >>> + > >>> +/include/ "omap2.dtsi" > >>> + > >>> +/ { > >>> + compatible = "ti,omap2420", "ti,omap2"; > >>> + > >>> + ocp { > >>> + mcbsp1: mcbsp@48074000 { > >>> + compatible = "ti,omap2420-mcbsp"; > >>> + reg = <0x48074000 0xff>; > >>> + reg-names = "mpu"; > >>> + interrupts = <0 59 0x4>, /* TX interrupt */ > >>> + <0 60 0x4>; /* RX interrupt */ > >> > >> That one is not correct because it does comply with the interrupt > >> controller specifier that require only one cell: > >> > >> intc: interrupt-controller@48200000 { > >> compatible = "ti,omap2-intc"; > >> interrupt-controller; > >> #interrupt-cells = <1>; > >> ... > >> > >> The one you are using is for GIC IRQ controller. > >> It works probably because we are using hwmod so far :-) > >> > > > > I think now we should kill the resource overwrite path, and should > > respect and use resources passed from DT. > > > > Benoit, > > Did you get a chance to validate patch submitted towards this?? > > Not yet, but we discussed that with Peter and since he does have these > patches for DT, he'll be able to test your series with the McBSP changes. > Great. > I still want to update a couple of DTS to test that on some other IPs. > Ohh ok. Please let me know if I can help you here by any means. I am equipped with AM37xEVM, BeagleBoard and Panda. Thanks, Vaibhav
Hi, On 09/05/2012 09:11 AM, Hiremath, Vaibhav wrote: >> Not yet, but we discussed that with Peter and since he does have these >> patches for DT, he'll be able to test your series with the McBSP changes. >> > > Great. With his series and your patch for omap-hwmod audio was probing and working on OMAP3/4/5 without issues. > >> I still want to update a couple of DTS to test that on some other IPs. >> > > Ohh ok. Please let me know if I can help you here by any means. > I am equipped with AM37xEVM, BeagleBoard and Panda. You can try this series and your patch on top of linux-next on Panda. Not all patches are in which needed for BeagleBoard at the moment.
On Wed, Sep 05, 2012 at 13:53:58, Ujfalusi, Peter wrote: > Hi, > > On 09/05/2012 09:11 AM, Hiremath, Vaibhav wrote: > >> Not yet, but we discussed that with Peter and since he does have these > >> patches for DT, he'll be able to test your series with the McBSP changes. > >> > > > > Great. > > With his series and your patch for omap-hwmod audio was probing and working on > OMAP3/4/5 without issues. > Peter, Care to provide your Tested-By?? Benoit, Can we merge this patch now? Thanks, Vaibhav
Hi Benoit, On 09/03/2012 05:46 PM, Benoit Cousson wrote: >> + * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/ > > Nit: 2012 Oh, I missed that (copy-paste of the header...) >> + * >> + * This file is licensed under the terms of the GNU General Public License >> + * version 2. This program is licensed "as is" without any warranty of any >> + * kind, whether express or implied. >> + */ >> + >> +/include/ "omap2.dtsi" >> + >> +/ { >> + compatible = "ti,omap2420", "ti,omap2"; >> + >> + ocp { >> + mcbsp1: mcbsp@48074000 { >> + compatible = "ti,omap2420-mcbsp"; >> + reg = <0x48074000 0xff>; >> + reg-names = "mpu"; >> + interrupts = <0 59 0x4>, /* TX interrupt */ >> + <0 60 0x4>; /* RX interrupt */ > > That one is not correct because it does comply with the interrupt > controller specifier that require only one cell: > > intc: interrupt-controller@48200000 { > compatible = "ti,omap2-intc"; > interrupt-controller; > #interrupt-cells = <1>; > ... > > The one you are using is for GIC IRQ controller. > It works probably because we are using hwmod so far :-) > > Didn't you get some warning? dtb compiles fine. I'll fix OMAP2 and OMAP3 as well. Will send the updated series shortly.
Hi Vaibhav, On 09/05/2012 11:15 AM, Hiremath, Vaibhav wrote: > On Wed, Sep 05, 2012 at 13:53:58, Ujfalusi, Peter wrote: >> Hi, >> >> On 09/05/2012 09:11 AM, Hiremath, Vaibhav wrote: >>>> Not yet, but we discussed that with Peter and since he does have these >>>> patches for DT, he'll be able to test your series with the McBSP changes. >>>> >>> >>> Great. >> >> With his series and your patch for omap-hwmod audio was probing and working on >> OMAP3/4/5 without issues. >> > Peter, > Care to provide your Tested-By?? > > Benoit, > Can we merge this patch now? Yes, I'll include it in the pull request along with DTS patches. I've just tested it as well on OMAP4 by hacking the DTS for GPIO. I'll try to update at least all the OMAP4 IPs as well with the proper DTS resources for 3.7. Regards, Benoit
On Wed, Sep 05, 2012 at 19:01:55, Cousson, Benoit wrote: > Hi Vaibhav, > > On 09/05/2012 11:15 AM, Hiremath, Vaibhav wrote: > > On Wed, Sep 05, 2012 at 13:53:58, Ujfalusi, Peter wrote: > >> Hi, > >> > >> On 09/05/2012 09:11 AM, Hiremath, Vaibhav wrote: > >>>> Not yet, but we discussed that with Peter and since he does have these > >>>> patches for DT, he'll be able to test your series with the McBSP changes. > >>>> > >>> > >>> Great. > >> > >> With his series and your patch for omap-hwmod audio was probing and working on > >> OMAP3/4/5 without issues. > >> > > Peter, > > Care to provide your Tested-By?? > > > > Benoit, > > Can we merge this patch now? > > Yes, I'll include it in the pull request along with DTS patches. > > I've just tested it as well on OMAP4 by hacking the DTS for GPIO. > I'll try to update at least all the OMAP4 IPs as well with the proper > DTS resources for 3.7. > Thanks Benoit, There are other patches which are pending, arm/dts: AM33XX: Convert all hex numbers to lower-case https://patchwork.kernel.org/patch/1377351/ arm/dts: AM33XX: Specify reg and interrupt property for all nodes https://patchwork.kernel.org/patch/1377361/ Probably your Ack is required for, ARM: AM33XX: clock: Add dcan clock aliases for device-tree https://patchwork.kernel.org/patch/1377061/ RTC: I am not sure how to deal with RTC DT support, as I understand the list is very unresponsive there. http://www.mail-archive.com/davinci-linux-open-source@linux.davincidsp.com/msg23253.html Thanks, Vaibhav
On 09/05/2012 04:41 PM, Hiremath, Vaibhav wrote: ... > There are other patches which are pending, > > arm/dts: AM33XX: Convert all hex numbers to lower-case > https://patchwork.kernel.org/patch/1377351/ > arm/dts: AM33XX: Specify reg and interrupt property for all nodes > https://patchwork.kernel.org/patch/1377361/ OK, so these ones are fine, you should just rebase them because theyu are conflicting with patches already inside lo/devel-dt > Probably your Ack is required for, > > ARM: AM33XX: clock: Add dcan clock aliases for device-tree > https://patchwork.kernel.org/patch/1377061/ Paul already queued this one so it is fine. > RTC: > I am not sure how to deal with RTC DT support, as I understand the list is very unresponsive there. OK, so I did have the same issue for TWL RTC since the maintainer is no longer very active. In that case you should go through Andrew Morton. Regards, Benoit > http://www.mail-archive.com/davinci-linux-open-source@linux.davincidsp.com/msg23253.html
On Wed, Sep 05, 2012 at 20:11:11, Hiremath, Vaibhav wrote: > On Wed, Sep 05, 2012 at 19:01:55, Cousson, Benoit wrote: > > Hi Vaibhav, > > > > On 09/05/2012 11:15 AM, Hiremath, Vaibhav wrote: > > > On Wed, Sep 05, 2012 at 13:53:58, Ujfalusi, Peter wrote: > > >> Hi, > > >> > > >> On 09/05/2012 09:11 AM, Hiremath, Vaibhav wrote: > > >>>> Not yet, but we discussed that with Peter and since he does have these > > >>>> patches for DT, he'll be able to test your series with the McBSP changes. > > >>>> > > >>> > > >>> Great. > > >> > > >> With his series and your patch for omap-hwmod audio was probing and working on > > >> OMAP3/4/5 without issues. > > >> > > > Peter, > > > Care to provide your Tested-By?? > > > > > > Benoit, > > > Can we merge this patch now? > > > > Yes, I'll include it in the pull request along with DTS patches. > > > > I've just tested it as well on OMAP4 by hacking the DTS for GPIO. > > I'll try to update at least all the OMAP4 IPs as well with the proper > > DTS resources for 3.7. > > > > Thanks Benoit, > > There are other patches which are pending, > > arm/dts: AM33XX: Convert all hex numbers to lower-case > https://patchwork.kernel.org/patch/1377351/ > arm/dts: AM33XX: Specify reg and interrupt property for all nodes > https://patchwork.kernel.org/patch/1377361/ > Few more DT patches which are pending arm/dts: AM33XX: Add basic pinctrl device tree data http://www.spinics.net/lists/linux-omap/msg76684.html arm/dts: AM33XX: Configure pinmuxs for user leds control on Bone http://www.spinics.net/lists/linux-omap/msg76682.html arm/dts: AM33XX: Add D_CAN device tree data http://www.spinics.net/lists/linux-omap/msg76683.html Thanks AnilKumar
Hi Anil, On 09/07/2012 07:45 AM, AnilKumar, Chimata wrote: > On Wed, Sep 05, 2012 at 20:11:11, Hiremath, Vaibhav wrote: >> On Wed, Sep 05, 2012 at 19:01:55, Cousson, Benoit wrote: >>> Hi Vaibhav, >>> >>> On 09/05/2012 11:15 AM, Hiremath, Vaibhav wrote: >>>> On Wed, Sep 05, 2012 at 13:53:58, Ujfalusi, Peter wrote: >>>>> Hi, >>>>> >>>>> On 09/05/2012 09:11 AM, Hiremath, Vaibhav wrote: >>>>>>> Not yet, but we discussed that with Peter and since he does have these >>>>>>> patches for DT, he'll be able to test your series with the McBSP changes. >>>>>>> >>>>>> >>>>>> Great. >>>>> >>>>> With his series and your patch for omap-hwmod audio was probing and working on >>>>> OMAP3/4/5 without issues. >>>>> >>>> Peter, >>>> Care to provide your Tested-By?? >>>> >>>> Benoit, >>>> Can we merge this patch now? >>> >>> Yes, I'll include it in the pull request along with DTS patches. >>> >>> I've just tested it as well on OMAP4 by hacking the DTS for GPIO. >>> I'll try to update at least all the OMAP4 IPs as well with the proper >>> DTS resources for 3.7. >>> >> >> Thanks Benoit, >> >> There are other patches which are pending, >> >> arm/dts: AM33XX: Convert all hex numbers to lower-case >> https://patchwork.kernel.org/patch/1377351/ >> arm/dts: AM33XX: Specify reg and interrupt property for all nodes >> https://patchwork.kernel.org/patch/1377361/ >> > > Few more DT patches which are pending > > arm/dts: AM33XX: Add basic pinctrl device tree data > http://www.spinics.net/lists/linux-omap/msg76684.html > arm/dts: AM33XX: Configure pinmuxs for user leds control on Bone > http://www.spinics.net/lists/linux-omap/msg76682.html > arm/dts: AM33XX: Add D_CAN device tree data > http://www.spinics.net/lists/linux-omap/msg76683.html These ones still need some acks, but looks fine to me. Can you rebase them on top of the branch that already contains some AM33xx patches from Vaibhav: git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt.git for_3.7/dts While you are rebasing, could you as well change the subject to use "ARM: dts: " prefix. It looks like everybody is using that convention now beside OMAP :-( Thanks, Benoit
+ Andrew, On Thu, Sep 06, 2012 at 20:12:07, Cousson, Benoit wrote: > > On 09/05/2012 04:41 PM, Hiremath, Vaibhav wrote: > ... > > There are other patches which are pending, > > > > arm/dts: AM33XX: Convert all hex numbers to lower-case > > https://patchwork.kernel.org/patch/1377351/ > > arm/dts: AM33XX: Specify reg and interrupt property for all nodes > > https://patchwork.kernel.org/patch/1377361/ > > OK, so these ones are fine, you should just rebase them because theyu > are conflicting with patches already inside lo/devel-dt > > > Probably your Ack is required for, > > > > ARM: AM33XX: clock: Add dcan clock aliases for device-tree > > https://patchwork.kernel.org/patch/1377061/ > > Paul already queued this one so it is fine. > > > RTC: > > I am not sure how to deal with RTC DT support, as I understand the list is very unresponsive there. > > OK, so I did have the same issue for TWL RTC since the maintainer is no > longer very active. In that case you should go through Andrew Morton. > Andrew, Can you please merge these omap-rtc patches, there are no review comments so far and I believe it should be safe now to merge. Thanks, Vaiibhav > Regards, > Benoit > > > http://www.mail-archive.com/davinci-linux-open-source@linux.davincidsp.com/msg23253.html > >
diff --git a/arch/arm/boot/dts/omap2420.dtsi b/arch/arm/boot/dts/omap2420.dtsi new file mode 100644 index 0000000..f375c68 --- /dev/null +++ b/arch/arm/boot/dts/omap2420.dtsi @@ -0,0 +1,39 @@ +/* + * Device Tree Source for OMAP2420 SoC + * + * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/ + * + * This file is licensed under the terms of the GNU General Public License + * version 2. This program is licensed "as is" without any warranty of any + * kind, whether express or implied. + */ + +/include/ "omap2.dtsi" + +/ { + compatible = "ti,omap2420", "ti,omap2"; + + ocp { + mcbsp1: mcbsp@48074000 { + compatible = "ti,omap2420-mcbsp"; + reg = <0x48074000 0xff>; + reg-names = "mpu"; + interrupts = <0 59 0x4>, /* TX interrupt */ + <0 60 0x4>; /* RX interrupt */ + interrupt-names = "tx", "rx"; + interrupt-parent = <&intc>; + ti,hwmods = "mcbsp1"; + }; + + mcbsp2: mcbsp@48076000 { + compatible = "ti,omap2420-mcbsp"; + reg = <0x48076000 0xff>; + reg-names = "mpu"; + interrupts = <0 62 0x4>, /* TX interrupt */ + <0 63 0x4>; /* RX interrupt */ + interrupt-names = "tx", "rx"; + interrupt-parent = <&intc>; + ti,hwmods = "mcbsp2"; + }; + }; +}; diff --git a/arch/arm/boot/dts/omap2430.dtsi b/arch/arm/boot/dts/omap2430.dtsi new file mode 100644 index 0000000..531e346 --- /dev/null +++ b/arch/arm/boot/dts/omap2430.dtsi @@ -0,0 +1,83 @@ +/* + * Device Tree Source for OMAP243x SoC + * + * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/ + * + * This file is licensed under the terms of the GNU General Public License + * version 2. This program is licensed "as is" without any warranty of any + * kind, whether express or implied. + */ + +/include/ "omap2.dtsi" + +/ { + compatible = "ti,omap2430", "ti,omap2"; + + ocp { + mcbsp1: mcbsp@48074000 { + compatible = "ti,omap2430-mcbsp"; + reg = <0x48074000 0xff>; + reg-names = "mpu"; + interrupts = <0 64 0x4>, /* OCP compliant interrupt */ + <0 59 0x4>, /* TX interrupt */ + <0 60 0x4>, /* RX interrupt */ + <0 61 0x4>; /* RX overflow interrupt */ + interrupt-names = "common", "tx", "rx", "rx_overflow"; + interrupt-parent = <&intc>; + ti,buffer-size = <128>; + ti,hwmods = "mcbsp1"; + }; + + mcbsp2: mcbsp@48076000 { + compatible = "ti,omap2430-mcbsp"; + reg = <0x48076000 0xff>; + reg-names = "mpu"; + interrupts = <0 16 0x4>, /* OCP compliant interrupt */ + <0 62 0x4>, /* TX interrupt */ + <0 63 0x4>; /* RX interrupt */ + interrupt-names = "common", "tx", "rx"; + interrupt-parent = <&intc>; + ti,buffer-size = <128>; + ti,hwmods = "mcbsp2"; + }; + + mcbsp3: mcbsp@4808c000 { + compatible = "ti,omap2430-mcbsp"; + reg = <0x4808c000 0xff>; + reg-names = "mpu"; + interrupts = <0 17 0x4>, /* OCP compliant interrupt */ + <0 89 0x4>, /* TX interrupt */ + <0 90 0x4>; /* RX interrupt */ + interrupt-names = "common", "tx", "rx"; + interrupt-parent = <&intc>; + ti,buffer-size = <128>; + ti,hwmods = "mcbsp3"; + }; + + mcbsp4: mcbsp@4808e000 { + compatible = "ti,omap2430-mcbsp"; + reg = <0x4808e000 0xff>; + reg-names = "mpu"; + interrupts = <0 18 0x4>, /* OCP compliant interrupt */ + <0 54 0x4>, /* TX interrupt */ + <0 55 0x4>; /* RX interrupt */ + interrupt-names = "common", "tx", "rx"; + interrupt-parent = <&intc>; + ti,buffer-size = <128>; + ti,hwmods = "mcbsp4"; + }; + + mcbsp5: mcbsp@48096000 { + compatible = "ti,omap2430-mcbsp"; + reg = <0x48096000 0xff>; + reg-names = "mpu"; + interrupts = <0 19 0x4>, /* OCP compliant interrupt */ + <0 81 0x4>, /* TX interrupt */ + <0 82 0x4>; /* RX interrupt */ + interrupt-names = "common", "tx", "rx"; + interrupt-parent = <&intc>; + ti,buffer-size = <128>; + ti,hwmods = "mcbsp5"; + }; + }; +};
The McBSP IP within OMAP2420 and 2430 is different we need to create separate dtsi files for them. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> --- arch/arm/boot/dts/omap2420.dtsi | 39 ++++++++++++++++++ arch/arm/boot/dts/omap2430.dtsi | 83 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 122 insertions(+), 0 deletions(-) create mode 100644 arch/arm/boot/dts/omap2420.dtsi create mode 100644 arch/arm/boot/dts/omap2430.dtsi