ARM/dts: OMAP audio related updates for OMAP2/3/4/5
v2 cover ARM/dts: OMAP audio related updates for OMAP2/3/4/5
Hello,
I have extended and rebased the previous set:
'ARM/dts: omap McBSP and audio support for BeagleBoard'
Changes since v1:
- Rebased on current l-o:devel-dt branch
- Two new patch, one for OMAP4 to add reg-names for the mem areas, one for OMAP5 to add McPDM and DMIC section
The rest of the series remaind the same: adds the McBSP sections to OMAP2/3/4/5 and also enable the audio support for BeagleBoard when booting with DT.
Regards,
Peter
---
Peter Ujfalusi (8):
ARM/dts: OMAP2: Add McBSP entries for OMAP2420 and OMAP2430 SoC ARM/dts: omap2420-h4: Include omap2420.dtsi file instead the common
omap2
ARM/dts: OMAP3: Add McBSP entries
ARM/dts: OMAP4: Add McBSP entries
ARM/dts: OMAP5: Add McBSP entries
ARM/dts: omap3-beagle: Enable audio support
ARM/dts: omap4: Add reg-names for McPDM and DMIC ARM/dts: omap5: Add McPDM and DMIC section to the dtsi file
arch/arm/boot/dts/omap2420-h4.dts | 2 +- arch/arm/boot/dts/omap2420.dtsi | 39 +++++++++++++++++ arch/arm/boot/dts/omap2430.dtsi | 83 ++++++++++++++++++++++++++++++++++++ arch/arm/boot/dts/omap3-beagle.dts | 14 ++++++ arch/arm/boot/dts/omap3.dtsi | 69 ++++++++++++++++++++++++++++++ arch/arm/boot/dts/omap4.dtsi | 49 +++++++++++++++++++++ arch/arm/boot/dts/omap5.dtsi | 56 ++++++++++++++++++++++++ 7 files changed, 311 insertions(+), 1 deletions(-) create mode 100644 arch/arm/boot/dts/omap2420.dtsi create mode 100644 arch/arm/boot/dts/omap2430.dtsi
Signature · 1 line
1.7.8.6
PATCH v2 1/8 ARM/dts: OMAP2: Add McBSP entries for OMAP2420 and OMAP2430 SoC
The McBSP IP within OMAP2420 and 2430 is different we need to create separate dtsi files for them.
--- 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
arch/arm/boot/dts/omap2420.dtsi new file +39 -0
@@ -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 at 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 at 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"; + }; + }; +};
arch/arm/boot/dts/omap2430.dtsi new file +83 -0
83 lines not on this page · raw message
Signature · 1 line
1.7.8.6
PATCH v2 1/8 ARM/dts: OMAP2: Add McBSP entries for OMAP2420 and OMAP2430 SoC
Hi Peter,
The overall series looks good to me, but I do have a couple of comments.
Quoted 17 lines · Peter Ujfalusi
The McBSP IP within OMAP2420 and 2430 is different we need to create separate dtsi files for them.
Signed-off-by Peter Ujfalusi <[email protected]>--- 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.dtsiarch/arm/boot/dts/omap2420.dtsi new file +0
-0
arch/arm/boot/dts/omap2420.dtsi line 4
Quoted 4 lines
arch/arm/boot/dts/omap2420.dtsi new file +4
-0@@ -0,0 +1,39 @@ +/* + * Device Tree Source for OMAP2420 SoC + * + * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
Nit: 2012
Quoted 8 lines
arch/arm/boot/dts/omap2420.dtsi new file +8
-0+ * + * 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" +
arch/arm/boot/dts/omap2420.dtsi line 22
Quoted 10 lines
arch/arm/boot/dts/omap2420.dtsi new file +10
-0+/ { + compatible = "ti,omap2420", "ti,omap2"; + + ocp { + mcbsp1: mcbsp at 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 at 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:
arch/arm/boot/dts/omap2420.dtsi line 24
Quoted 2 lines
arch/arm/boot/dts/omap2420.dtsi new file +2
-0+ interrupts = <59>, /* TX interrupt */ + <60>; /* RX interrupt */
That comment is applicable for OMAP2420, OMAP2430, and OMAP3 in general.
Quoted 23 lines
arch/arm/boot/dts/omap2420.dtsi new file +17
-0+ interrupt-names = "tx", "rx"; + interrupt-parent = <&intc>; + ti,hwmods = "mcbsp1"; + }; + + mcbsp2: mcbsp at 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"; + }; + }; +};arch/arm/boot/dts/omap2430.dtsi new file +0
-0
arch/arm/boot/dts/omap2430.dtsi line 4
Quoted 4 lines
arch/arm/boot/dts/omap2430.dtsi new file +4
-0@@ -0,0 +1,83 @@ +/* + * Device Tree Source for OMAP243x SoC + * + * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
2012.
Regards,
Benoit
PATCH v2 1/8 ARM/dts: OMAP2: Add McBSP entries for OMAP2420 and OMAP2430 SoC
Quoted 51 lines · Benoit Cousson
Hi Peter,
The overall series looks good to me, but I do have a couple of comments.
Quoted 17 lines · Peter Ujfalusi
The McBSP IP within OMAP2420 and 2430 is different we need to create separate dtsi files for them.
Signed-off-by Peter Ujfalusi <[email protected]>--- 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.dtsiarch/arm/boot/dts/omap2420.dtsi new file +0
-0arch/arm/boot/dts/omap2420.dtsi line 4
Quoted 4 lines
arch/arm/boot/dts/omap2420.dtsi new file +4
-0@@ -0,0 +1,39 @@ +/* + * Device Tree Source for OMAP2420 SoC + * + * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/Nit: 2012
Quoted 8 lines
arch/arm/boot/dts/omap2420.dtsi new file +8
-0+ * + * 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" +arch/arm/boot/dts/omap2420.dtsi line 22
Quoted 10 lines
arch/arm/boot/dts/omap2420.dtsi new file +10
-0+/ { + compatible = "ti,omap2420", "ti,omap2"; + + ocp { + mcbsp1: mcbsp at 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:
Quoted 9 lines
intc: interrupt-controller at 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
Quoted 47 lines
Didn't you get some warning?
In the case of OMAP2 & 3, it is much simpler:
arch/arm/boot/dts/omap2420.dtsi line 24
Quoted 2 lines
arch/arm/boot/dts/omap2420.dtsi new file +2
-0+ interrupts = <59>, /* TX interrupt */ + <60>; /* RX interrupt */That comment is applicable for OMAP2420, OMAP2430, and OMAP3 in general.
Quoted 23 lines
arch/arm/boot/dts/omap2420.dtsi new file +17
-0+ interrupt-names = "tx", "rx"; + interrupt-parent = <&intc>; + ti,hwmods = "mcbsp1"; + }; + + mcbsp2: mcbsp at 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"; + }; + }; +};arch/arm/boot/dts/omap2430.dtsi new file +0
-0arch/arm/boot/dts/omap2430.dtsi line 4
Quoted 4 lines
arch/arm/boot/dts/omap2430.dtsi new file +4
-0@@ -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 at lists.ozlabs.org
https://lists.ozlabs.org/listinfo/devicetree-discuss
PATCH v2 1/8 ARM/dts: OMAP2: Add McBSP entries for OMAP2420 and OMAP2430 SoC
Hi Vaibhav,
Quoted 62 lines · Vaibhav Hiremath
Quoted 51 lines · Benoit Cousson
Hi Peter,
The overall series looks good to me, but I do have a couple of comments.
Quoted 17 lines · Peter Ujfalusi
The McBSP IP within OMAP2420 and 2430 is different we need to create separate dtsi files for them.
Signed-off-by Peter Ujfalusi <[email protected]>--- 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.dtsiarch/arm/boot/dts/omap2420.dtsi new file +0
-0arch/arm/boot/dts/omap2420.dtsi line 4
Quoted 4 lines
arch/arm/boot/dts/omap2420.dtsi new file +4
-0@@ -0,0 +1,39 @@ +/* + * Device Tree Source for OMAP2420 SoC + * + * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/Nit: 2012
Quoted 8 lines
arch/arm/boot/dts/omap2420.dtsi new file +8
-0+ * + * 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" +arch/arm/boot/dts/omap2420.dtsi line 22
Quoted 10 lines
arch/arm/boot/dts/omap2420.dtsi new file +10
-0+/ { + compatible = "ti,omap2420", "ti,omap2"; + + ocp { + mcbsp1: mcbsp at 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:
Quoted 9 lines
intc: interrupt-controller at 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 :-)
Quoted 5 lines
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
PATCH v2 1/8 ARM/dts: OMAP2: Add McBSP entries for OMAP2420 and OMAP2430 SoC
Quoted 65 lines · Benoit
Hi Vaibhav,
Quoted 62 lines · Vaibhav Hiremath
Quoted 60 lines · Benoit Cousson
Hi Peter,
The overall series looks good to me, but I do have a couple of comments.
Quoted 17 lines · Peter Ujfalusi
The McBSP IP within OMAP2420 and 2430 is different we need to create separate dtsi files for them.
Signed-off-by Peter Ujfalusi <[email protected]>--- 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.dtsiarch/arm/boot/dts/omap2420.dtsi new file +0
-0arch/arm/boot/dts/omap2420.dtsi line 4
Quoted 4 lines
arch/arm/boot/dts/omap2420.dtsi new file +4
-0@@ -0,0 +1,39 @@ +/* + * Device Tree Source for OMAP2420 SoC + * + * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/Nit: 2012
Quoted 8 lines
arch/arm/boot/dts/omap2420.dtsi new file +8
-0+ * + * 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" +arch/arm/boot/dts/omap2420.dtsi line 22
Quoted 10 lines
arch/arm/boot/dts/omap2420.dtsi new file +10
-0+/ { + compatible = "ti,omap2420", "ti,omap2"; + + ocp { + mcbsp1: mcbsp at 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 at 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 :-)
Quoted 9 lines
Quoted 5 lines
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.
Quoted 2 lines
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
PATCH v2 1/8 ARM/dts: OMAP2: Add McBSP entries for OMAP2420 and OMAP2430 SoC
Hi,
Quoted 5 lines · Vaibhav
Quoted 3 lines
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.
Quoted 6 lines
Quoted 3 lines
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.
Signature · 5 lines
Péter -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v2 1/8 ARM/dts: OMAP2: Add McBSP entries for OMAP2420 and OMAP2430 SoC
Quoted 12 lines · Peter
Hi,
Quoted 5 lines · Vaibhav
Quoted 3 lines
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
PATCH v2 1/8 ARM/dts: OMAP2: Add McBSP entries for OMAP2420 and OMAP2430 SoC
Hi Vaibhav,
Quoted 10 lines · Vaibhav
Quoted 9 lines · Peter
Hi,
Quoted 5 lines · Vaibhav
Quoted 3 lines
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.
Quoted 8 lines
Quoted 3 lines
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
PATCH v2 1/8 ARM/dts: OMAP2: Add McBSP entries for OMAP2420 and OMAP2430 SoC
Quoted 19 lines · Benoit
Hi Vaibhav,
Quoted 16 lines · Vaibhav
Quoted 12 lines · Peter
Hi,
Quoted 5 lines · Vaibhav
Quoted 3 lines
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??
Quoted 9 lines
Quoted 2 lines
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 at linux.davincidsp.com/msg23253.html
Thanks,
Vaibhav
PATCH v2 1/8 ARM/dts: OMAP2: Add McBSP entries for OMAP2420 and OMAP2430 SoC
On 09/05/2012 04:41 PM, Hiremath, Vaibhav wrote:
...
Quoted 6 lines
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
Quoted 4 lines
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.
Quoted 2 lines
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
Quoted 1 line
http://www.mail-archive.com/davinci-linux-open-source at linux.davincidsp.com/msg23253.html
PATCH v2 1/8 ARM/dts: OMAP2: Add McBSP entries for OMAP2420 and OMAP2430 SoC
+ Andrew,
Quoted 18 lines · Benoit
On 09/05/2012 04:41 PM, Hiremath, Vaibhav wrote:
...Quoted 6 lines
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
Quoted 4 lines
Probably your Ack is required for,
ARM: AM33XX: clock: Add dcan clock aliases for device-tree
https://patchwork.kernel.org/patch/1377061/
Quoted 8 lines
Paul already queued this one so it is fine.
Quoted 2 lines
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
Quoted 6 lines
Regards,
BenoitQuoted 1 line
http://www.mail-archive.com/davinci-linux-open-source at linux.davincidsp.com/msg23253.html
PATCH v2 1/8 ARM/dts: OMAP2: Add McBSP entries for OMAP2420 and OMAP2430 SoC
In reply to Hiremath, VaibhavQuoted 30 lines · Vaibhav
Quoted 19 lines · Benoit
Hi Vaibhav,
Quoted 16 lines · Vaibhav
Quoted 12 lines · Peter
Hi,
Quoted 5 lines · Vaibhav
Quoted 3 lines
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??Quoted 9 lines
Quoted 2 lines
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.
Quoted 9 lines
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
PATCH v2 1/8 ARM/dts: OMAP2: Add McBSP entries for OMAP2420 and OMAP2430 SoC
Hi Anil,
Quoted 41 lines · Chimata
Quoted 30 lines · Vaibhav
Quoted 19 lines · Benoit
Hi Vaibhav,
Quoted 16 lines · Vaibhav
Quoted 12 lines · Peter
Hi,
Quoted 5 lines · Vaibhav
Quoted 3 lines
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??Quoted 9 lines
Quoted 2 lines
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.
Quoted 9 lines
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/
Quoted 8 lines
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: AddD_CANdevice 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
PATCH v2 1/8 ARM/dts: OMAP2: Add McBSP entries for OMAP2420 and OMAP2430 SoC
In reply to Benoit CoussonHi Benoit,
Quoted 3 lines · Benoit Cousson
Quoted 1 line
+ * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
Nit: 2012
Oh, I missed that (copy-paste of the header...)
Quoted 26 lines
Quoted 8 lines
+ *
+ * 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.
+ */arch/arm/boot/dts/omap2420.dtsi new file +3
-0+ +/include/ "omap2.dtsi" +arch/arm/boot/dts/omap2420.dtsi line 22
Quoted 10 lines
arch/arm/boot/dts/omap2420.dtsi new file +10
-0+/ { + 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>;
Quoted 6 lines
...
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.
Signature · 5 lines
Péter -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v2 2/8 ARM/dts: omap2420-h4: Include omap2420.dtsi file instead the common omap2
In reply to Peter UjfalusiSince the board is based on OMAP2420 we should include the dedicated dtsi file (which includes the common omap2 dtsi).
--- arch/arm/boot/dts/omap2420-h4.dts | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/boot/dts/omap2420-h4.dts +1 -1
@@ -7,7 +7,7 @@ */ /dts-v1/; -/include/ "omap2.dtsi" +/include/ "omap2420.dtsi" / { model = "TI OMAP2420 H4 board";
Signature · 1 line
1.7.8.6
PATCH v2 2/8 ARM/dts: omap2420-h4: Include omap2420.dtsi file instead the common omap2
Quoted 13 lines · Peter Ujfalusi
Since the board is based on OMAP2420 we should include the dedicated dtsi file (which includes the common omap2 dtsi).
Signed-off-by Peter Ujfalusi <[email protected]>--- arch/arm/boot/dts/omap2420-h4.dts | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)arch/arm/boot/dts/omap2420-h4.dts +0
-0
arch/arm/boot/dts/omap2420-h4.dts line 13
Quoted 8 lines
arch/arm/boot/dts/omap2420-h4.dts +1
-1@@ -7,7 +7,7 @@ */ /dts-v1/; -/include/ "omap2.dtsi" +/include/ "omap2420.dtsi" / { model = "TI OMAP2420 H4 board";
Oops looks like I have this too in one of my patches. I'll drop that part in my patches.
Tony
PATCH v2 3/8 ARM/dts: OMAP3: Add McBSP entries
In reply to Peter UjfalusiCreate the needed sections to be able to probe McBSP ports via DT.
--- arch/arm/boot/dts/omap3.dtsi | 69 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 69 insertions(+), 0 deletions(-)
arch/arm/boot/dts/omap3.dtsi +69 -0
@@ -220,5 +220,74 @@ compatible = "ti,omap3-wdt"; ti,hwmods = "wd_timer2"; }; + + mcbsp1: mcbsp at 48074000 { + compatible = "ti,omap3-mcbsp"; + reg = <0x48074000 0xff>; + reg-names = "mpu"; + interrupts = <0 16 0x4>, /* OCP compliant interrupt */ + <0 59 0x4>, /* TX interrupt */ + <0 60 0x4>; /* RX interrupt */ + interrupt-names = "common", "tx", "rx"; + interrupt-parent = <&intc>; + ti,buffer-size = <128>; + ti,hwmods = "mcbsp1"; + }; + + mcbsp2: mcbsp at 49022000 { + compatible = "ti,omap3-mcbsp"; + reg = <0x49022000 0xff>, + <0x49028000 0xff>; + reg-names = "mpu", "sidetone"; + interrupts = <0 17 0x4>, /* OCP compliant interrupt */ + <0 62 0x4>, /* TX interrupt */ + <0 63 0x4>, /* RX interrupt */ + <0 4 0x4>; /* Sidetone */ + interrupt-names = "common", "tx", "rx", "sidetone"; + interrupt-parent = <&intc>; + ti,buffer-size = <1280>; + ti,hwmods = "mcbsp2"; + }; + + mcbsp3: mcbsp at 49024000 { + compatible = "ti,omap3-mcbsp"; + reg = <0x49024000 0xff>, + <0x4902a000 0xff>; + reg-names = "mpu", "sidetone"; + interrupts = <0 22 0x4>, /* OCP compliant interrupt */ + <0 89 0x4>, /* TX interrupt */ + <0 90 0x4>, /* RX interrupt */ + <0 5 0x4>; /* Sidetone */ + interrupt-names = "common", "tx", "rx", "sidetone"; + interrupt-parent = <&intc>; + ti,buffer-size = <128>; + ti,hwmods = "mcbsp3"; + }; + + mcbsp4: mcbsp at 49026000 { + compatible = "ti,omap3-mcbsp"; + reg = <0x49026000 0xff>; + reg-names = "mpu"; + interrupts = <0 23 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 at 48096000 { + compatible = "ti,omap3-mcbsp"; + reg = <0x48096000 0xff>; + reg-names = "mpu"; + interrupts = <0 27 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"; + }; }; };
Signature · 1 line
1.7.8.6
PATCH v2 4/8 ARM/dts: OMAP4: Add McBSP entries
In reply to Peter UjfalusiCreate the sections describing the McBSP ports to be able to use them via DT.
--- arch/arm/boot/dts/omap4.dtsi | 47 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 47 insertions(+), 0 deletions(-)
arch/arm/boot/dts/omap4.dtsi +47 -0
@@ -295,5 +295,52 @@ interrupt-parent = <&gic>; ti,hwmods = "dmic"; }; + + mcbsp1: mcbsp at 40122000 { + compatible = "ti,omap4-mcbsp"; + reg = <0x40122000 0xff>, /* MPU private access */ + <0x49022000 0xff>; /* L3 Interconnect */ + reg-names = "mpu", "dma"; + interrupts = <0 17 0x4>; + interrupt-names = "common"; + interrupt-parent = <&gic>; + ti,buffer-size = <128>; + ti,hwmods = "mcbsp1"; + }; + + mcbsp2: mcbsp at 40124000 { + compatible = "ti,omap4-mcbsp"; + reg = <0x40124000 0xff>, /* MPU private access */ + <0x49024000 0xff>; /* L3 Interconnect */ + reg-names = "mpu", "dma"; + interrupts = <0 22 0x4>; + interrupt-names = "common"; + interrupt-parent = <&gic>; + ti,buffer-size = <128>; + ti,hwmods = "mcbsp2"; + }; + + mcbsp3: mcbsp at 40126000 { + compatible = "ti,omap4-mcbsp"; + reg = <0x40126000 0xff>, /* MPU private access */ + <0x49026000 0xff>; /* L3 Interconnect */ + reg-names = "mpu", "dma"; + interrupts = <0 23 0x4>; + interrupt-names = "common"; + interrupt-parent = <&gic>; + ti,buffer-size = <128>; + ti,hwmods = "mcbsp3"; + }; + + mcbsp4: mcbsp at 48096000 { + compatible = "ti,omap4-mcbsp"; + reg = <0x48096000 0xff>; /* L4 Interconnect */ + reg-names = "mpu"; + interrupts = <0 16 0x4>; + interrupt-names = "common"; + interrupt-parent = <&gic>; + ti,buffer-size = <128>; + ti,hwmods = "mcbsp4"; + }; }; };
Signature · 1 line
1.7.8.6
PATCH v2 5/8 ARM/dts: OMAP5: Add McBSP entries
In reply to Peter UjfalusiCreate the sections describing the McBSP ports to be able to use them via DT.
--- arch/arm/boot/dts/omap5.dtsi | 36 ++++++++++++++++++++++++++++++++++++ 1 files changed, 36 insertions(+), 0 deletions(-)
arch/arm/boot/dts/omap5.dtsi +36 -0
@@ -211,5 +211,41 @@ ti,hwmods = "mmc5"; ti,needs-special-reset; }; + + mcbsp1: mcbsp at 40122000 { + compatible = "ti,omap4-mcbsp"; + reg = <0x40122000 0xff>, /* MPU private access */ + <0x49022000 0xff>; /* L3 Interconnect */ + reg-names = "mpu", "dma"; + interrupts = <0 17 0x4>; + interrupt-names = "common"; + interrupt-parent = <&gic>; + ti,buffer-size = <128>; + ti,hwmods = "mcbsp1"; + }; + + mcbsp2: mcbsp at 40124000 { + compatible = "ti,omap4-mcbsp"; + reg = <0x40124000 0xff>, /* MPU private access */ + <0x49024000 0xff>; /* L3 Interconnect */ + reg-names = "mpu", "dma"; + interrupts = <0 22 0x4>; + interrupt-names = "common"; + interrupt-parent = <&gic>; + ti,buffer-size = <128>; + ti,hwmods = "mcbsp2"; + }; + + mcbsp3: mcbsp at 40126000 { + compatible = "ti,omap4-mcbsp"; + reg = <0x40126000 0xff>, /* MPU private access */ + <0x49026000 0xff>; /* L3 Interconnect */ + reg-names = "mpu", "dma"; + interrupts = <0 23 0x4>; + interrupt-names = "common"; + interrupt-parent = <&gic>; + ti,buffer-size = <128>; + ti,hwmods = "mcbsp3"; + }; }; };
Signature · 1 line
1.7.8.6
PATCH v2 6/8 ARM/dts: omap3-beagle: Enable audio support
In reply to Peter UjfalusiAdd the needed sections to enable audio support on BeagleBoard when booted with DT blob.
--- arch/arm/boot/dts/omap3-beagle.dts | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-)
arch/arm/boot/dts/omap3-beagle.dts +14 -0
@@ -17,6 +17,14 @@ device_type = "memory"; reg = <0x80000000 0x20000000>; /* 512 MB */ }; + + sound { + compatible = "ti,omap-twl4030"; + ti,model = "omap3beagle"; + + ti,mcbsp = <&mcbsp2>; + ti,codec = <&twl_audio>; + }; }; &i2c1 {
@@ -32,6 +40,12 @@ regulator-min-microvolt = <1800000>; regulator-max-microvolt = <3000000>; }; + + twl_audio: audio { + compatible = "ti,twl4030-audio"; + codec { + }; + }; }; };
Signature · 1 line
1.7.8.6
PATCH v2 6/8 ARM/dts: omap3-beagle: Enable audio support
arch/arm/boot/dts/omap3-beagle.dts
Quoted 12 lines · Peter Ujfalusi
Add the needed sections to enable audio support on BeagleBoard when booted with DT blob.
Signed-off-by Peter Ujfalusi <[email protected]>--- arch/arm/boot/dts/omap3-beagle.dts | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-)arch/arm/boot/dts/omap3-beagle.dts +0
-0
I've renamed this to omap3-beagle-xm.dts as it's for beagle xm only based on the 512 MB of ram. Not a big deal, we can deal with it while I pull in the branch from Benoit if it does not get automatically resolved.
Regards,
Tony
Quoted 31 lines
arch/arm/boot/dts/omap3-beagle.dts +14
-0@@ -17,6 +17,14 @@ device_type = "memory"; reg = <0x80000000 0x20000000>; /* 512 MB */ }; + + sound { + compatible = "ti,omap-twl4030"; + ti,model = "omap3beagle"; + + ti,mcbsp = <&mcbsp2>; + ti,codec = <&twl_audio>; + }; }; &i2c1 {@@ -32,6 +40,12 @@ regulator-min-microvolt = <1800000>; regulator-max-microvolt = <3000000>; }; + + twl_audio: audio { + compatible = "ti,twl4030-audio"; + codec { + }; + }; }; };Signature · 1 line
1.7.8.6
PATCH v2 7/8 ARM/dts: omap4: Add reg-names for McPDM and DMIC
In reply to Peter UjfalusiIn order to get the memory areas by name when booted with DT.
--- arch/arm/boot/dts/omap4.dtsi | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
arch/arm/boot/dts/omap4.dtsi +2 -0
@@ -282,6 +282,7 @@ compatible = "ti,omap4-mcpdm"; reg = <0x40132000 0x7f>, /* MPU private access */ <0x49032000 0x7f>; /* L3 Interconnect */ + reg-names = "mpu", "dma"; interrupts = <0 112 0x4>; interrupt-parent = <&gic>; ti,hwmods = "mcpdm";
@@ -291,6 +292,7 @@ compatible = "ti,omap4-dmic"; reg = <0x4012e000 0x7f>, /* MPU private access */ <0x4902e000 0x7f>; /* L3 Interconnect */ + reg-names = "mpu", "dma"; interrupts = <0 114 0x4>; interrupt-parent = <&gic>; ti,hwmods = "dmic";
Signature · 1 line
1.7.8.6
PATCH v2 8/8 ARM/dts: omap5: Add McPDM and DMIC section to the dtsi file
In reply to Peter UjfalusiTo be able to load the McPDM and DMIC driver when booted with device tree.
--- arch/arm/boot/dts/omap5.dtsi | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-)
arch/arm/boot/dts/omap5.dtsi +20 -0
@@ -212,6 +212,26 @@ ti,needs-special-reset; }; + mcpdm: mcpdm at 40132000 { + compatible = "ti,omap4-mcpdm"; + reg = <0x40132000 0x7f>, /* MPU private access */ + <0x49032000 0x7f>; /* L3 Interconnect */ + reg-names = "mpu", "dma"; + interrupts = <0 112 0x4>; + interrupt-parent = <&gic>; + ti,hwmods = "mcpdm"; + }; + + dmic: dmic at 4012e000 { + compatible = "ti,omap4-dmic"; + reg = <0x4012e000 0x7f>, /* MPU private access */ + <0x4902e000 0x7f>; /* L3 Interconnect */ + reg-names = "mpu", "dma"; + interrupts = <0 114 0x4>; + interrupt-parent = <&gic>; + ti,hwmods = "dmic"; + }; + mcbsp1: mcbsp at 40122000 { compatible = "ti,omap4-mcbsp"; reg = <0x40122000 0xff>, /* MPU private access */
Signature · 1 line
1.7.8.6
v2 cover ARM/dts: OMAP audio related updates for OMAP2/3/4/5
In reply to Peter UjfalusiHi Peter,
Quoted 5 lines · Peter Ujfalusi
Hello,
I have extended and rebased the previous set:
'ARM/dts: omap McBSP and audio support for BeagleBoard'
Quoted 7 lines
Changes since v1:
- Rebased on current l-o:devel-dt branch
- Two new patch, one for OMAP4 to add reg-names for the mem areas, one for OMAP5 to add McPDM and DMIC sectionThe rest of the series remaind the same: adds the McBSP sections to OMAP2/3/4/5 and also enable the audio support for BeagleBoard when booting with DT.
Beside the OMAP 2&3 interrupt comment, the series looks good to me.
If you can repost, I'll queue it for Tony for 3.7 along with Sourav's one.
BTW, do you have any dependency with ASoC series?
Thanks,
Benoit
Quoted 26 lines
Regards,
Peter
---
Peter Ujfalusi (8):
ARM/dts: OMAP2: Add McBSP entries for OMAP2420 and OMAP2430 SoC ARM/dts: omap2420-h4: Includeomap2420.dtsifile instead the common
omap2
ARM/dts: OMAP3: Add McBSP entries
ARM/dts: OMAP4: Add McBSP entries
ARM/dts: OMAP5: Add McBSP entries
ARM/dts: omap3-beagle: Enable audio support
ARM/dts: omap4: Add reg-names for McPDM and DMIC ARM/dts: omap5: Add McPDM and DMIC section to the dtsi filearch/arm/boot/dts/omap2420-h4.dts | 2 +- arch/arm/boot/dts/omap2420.dtsi | 39 +++++++++++++++++ arch/arm/boot/dts/omap2430.dtsi | 83 ++++++++++++++++++++++++++++++++++++ arch/arm/boot/dts/omap3-beagle.dts | 14 ++++++ arch/arm/boot/dts/omap3.dtsi | 69 ++++++++++++++++++++++++++++++ arch/arm/boot/dts/omap4.dtsi | 49 +++++++++++++++++++++ arch/arm/boot/dts/omap5.dtsi | 56 ++++++++++++++++++++++++ 7 files changed, 311 insertions(+), 1 deletions(-) create mode 100644 arch/arm/boot/dts/omap2420.dtsi create mode 100644 arch/arm/boot/dts/omap2430.dtsi