ARM: DTS: OMAP: Audio related cleanups for dtsi and dts files
cover ARM: DTS: OMAP: Audio related cleanups for dtsi and dts files
Hi Benoit,
OMAP: Put the audio nodes to disabled styate by default and board dts files should enable the nodes which is used on the board.
am335x: correct the audio mclk clock. This patch has been marked to go to 3.13
stable as well.
Regards,
Peter
---
Peter Ujfalusi (9):
ARM: DTS: omap4-panda-common: Move audio related pinmux to respective
nodes
ARM: DTS: omap4-sdp: Move audio related pinmux to respective nodes
ARM: DTS: omap4: Set all audio related IP's status to disabled as
default
ARM: DTS: omap4-panda-common: No need to disable the unused audio
nodes
ARM: DTS: omap4-sdp: No need to disable mcbsp3 node
ARM: DTS: omap5: Set all audio related IP's status to disabled as
default
ARM: DTS: omap3: Set disabled status for McBSP instances as default
state
ARM: DTS: omap2: Set disabled status for McBSP instances as default
state
ARM: DTS: am335x-evmsk: Correct audio clock frequency
arch/arm/boot/dts/am335x-evmsk.dts | 2 +- arch/arm/boot/dts/omap2420.dtsi | 2 ++ arch/arm/boot/dts/omap2430.dtsi | 5 +++++ arch/arm/boot/dts/omap3-beagle-xm.dts | 4 ++++ arch/arm/boot/dts/omap3-beagle.dts | 4 ++++ arch/arm/boot/dts/omap3-devkit8000.dts | 16 ++------------- arch/arm/boot/dts/omap3-igep.dtsi | 1 + arch/arm/boot/dts/omap3-overo.dtsi | 4 ++++ arch/arm/boot/dts/omap3.dtsi | 5 +++++ arch/arm/boot/dts/omap4-panda-common.dtsi | 23 ++++++++++----------- arch/arm/boot/dts/omap4-sdp.dts | 33 ++++++++++++++++++++++++------- arch/arm/boot/dts/omap4.dtsi | 6 ++++++ arch/arm/boot/dts/omap5.dtsi | 5 +++++ 13 files changed, 77 insertions(+), 33 deletions(-)
Signature · 1 line
1.8.5.3
PATCH 1/9 ARM: DTS: omap4-panda-common: Move audio related pinmux to respective nodes
Attach the pinctrl nodes to their respective device node:
mcbsp1, mcpdm and twl6040.
--- arch/arm/boot/dts/omap4-panda-common.dtsi | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-)
arch/arm/boot/dts/omap4-panda-common.dtsi +16 -3
@@ -109,9 +109,6 @@ &omap4_pmx_core { pinctrl-names = "default"; pinctrl-0 = < - &twl6040_pins - &mcpdm_pins - &mcbsp1_pins &dss_dpi_pins &tfp410_pins &dss_hdmi_pins
@@ -300,6 +297,10 @@ twl6040: twl@4b { compatible = "ti,twl6040"; reg = <0x4b>; + + pinctrl-names = "default"; + pinctrl-0 = <&twl6040_pins>; + /* IRQ# = 119 */ interrupts = <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH>; /* IRQ_SYS_2N cascaded to gic */ interrupt-parent = <&gic>;
@@ -380,6 +381,12 @@ device-handle = <&elpida_ECB240ABACN>; }; +&mcbsp1 { + pinctrl-names = "default"; + pinctrl-0 = <&mcbsp1_pins>; + status = "okay"; +}; + &mcbsp2 { status = "disabled"; };
@@ -392,6 +399,12 @@ status = "disabled"; }; +&mcpdm { + pinctrl-names = "default"; + pinctrl-0 = <&mcpdm_pins>; + status = "okay"; +}; + &twl_usb_comparator { usb-supply = <&vusb>; };
Signature · 1 line
1.8.5.3
PATCH 2/9 ARM: DTS: omap4-sdp: Move audio related pinmux to respective nodes
In reply to Peter UjfalusiAttach the pinctrl nodes to their respective device node:
mcbsp1, mcbsp2, dmic, mcpdm and twl6040.
--- arch/arm/boot/dts/omap4-sdp.dts | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-)
arch/arm/boot/dts/omap4-sdp.dts +28 -5
@@ -158,11 +158,6 @@ &omap4_pmx_core { pinctrl-names = "default"; pinctrl-0 = < - &twl6040_pins - &mcpdm_pins - &dmic_pins - &mcbsp1_pins - &mcbsp2_pins &dss_hdmi_pins &tpd12s015_pins >;
@@ -326,6 +321,10 @@ twl6040: twl at 4b { compatible = "ti,twl6040"; reg = <0x4b>; + + pinctrl-names = "default"; + pinctrl-0 = <&twl6040_pins>; + /* SPI = 0, IRQ# = 119, 4 = active high level-sensitive */ interrupts = <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH>; /* IRQ_SYS_2N cascaded to gic */ interrupt-parent = <&gic>;
@@ -537,10 +536,34 @@ pinctrl-0 = <&uart4_pins>; }; +&mcbsp1 { + pinctrl-names = "default"; + pinctrl-0 = <&mcbsp1_pins>; + status = "okay"; +}; + +&mcbsp2 { + pinctrl-names = "default"; + pinctrl-0 = <&mcbsp2_pins>; + status = "okay"; +}; + &mcbsp3 { status = "disabled"; }; +&dmic { + pinctrl-names = "default"; + pinctrl-0 = <&dmic_pins>; + status = "okay"; +}; + +&mcpdm { + pinctrl-names = "default"; + pinctrl-0 = <&mcpdm_pins>; + status = "okay"; +}; + &twl_usb_comparator { usb-supply = <&vusb>; };
Signature · 1 line
1.8.5.3
PATCH 3/9 ARM: DTS: omap4: Set all audio related IP's status to disabled as default
In reply to Peter UjfalusiBoard dts files will need to enable the IP nodes which they are using and does not have to care about the not used ones (to disable them).
--- arch/arm/boot/dts/omap4.dtsi | 6 ++++++ 1 file changed, 6 insertions(+)
arch/arm/boot/dts/omap4.dtsi +6 -0
@@ -426,6 +426,7 @@ dmas = <&sdma 65>, <&sdma 66>; dma-names = "up_link", "dn_link"; + status = "disabled"; }; dmic: dmic at 4012e000 {
@@ -437,6 +438,7 @@ ti,hwmods = "dmic"; dmas = <&sdma 67>; dma-names = "up_link"; + status = "disabled"; }; mcbsp1: mcbsp at 40122000 {
@@ -451,6 +453,7 @@ dmas = <&sdma 33>, <&sdma 34>; dma-names = "tx", "rx"; + status = "disabled"; }; mcbsp2: mcbsp at 40124000 {
@@ -465,6 +468,7 @@ dmas = <&sdma 17>, <&sdma 18>; dma-names = "tx", "rx"; + status = "disabled"; }; mcbsp3: mcbsp at 40126000 {
@@ -479,6 +483,7 @@ dmas = <&sdma 19>, <&sdma 20>; dma-names = "tx", "rx"; + status = "disabled"; }; mcbsp4: mcbsp at 48096000 {
@@ -492,6 +497,7 @@ dmas = <&sdma 31>, <&sdma 32>; dma-names = "tx", "rx"; + status = "disabled"; }; keypad: keypad at 4a31c000 {
Signature · 1 line
1.8.5.3
PATCH 4/9 ARM: DTS: omap4-panda-common: No need to disable the unused audio nodes
In reply to Peter UjfalusiAll audio nodes has been set to disabled state in omap4.dtsi file.
--- arch/arm/boot/dts/omap4-panda-common.dtsi | 12 ------------ 1 file changed, 12 deletions(-)
arch/arm/boot/dts/omap4-panda-common.dtsi +0 -12
@@ -387,18 +387,6 @@ status = "okay"; }; -&mcbsp2 { - status = "disabled"; -}; - -&mcbsp3 { - status = "disabled"; -}; - -&dmic { - status = "disabled"; -}; - &mcpdm { pinctrl-names = "default"; pinctrl-0 = <&mcpdm_pins>;
Signature · 1 line
1.8.5.3
PATCH 5/9 ARM: DTS: omap4-sdp: No need to disable mcbsp3 node
In reply to Peter UjfalusiAll audio nodes has been set to disabled state in omap4.dtsi file.
--- arch/arm/boot/dts/omap4-sdp.dts | 4 ---- 1 file changed, 4 deletions(-)
arch/arm/boot/dts/omap4-sdp.dts +0 -4
@@ -548,10 +548,6 @@ status = "okay"; }; -&mcbsp3 { - status = "disabled"; -}; - &dmic { pinctrl-names = "default"; pinctrl-0 = <&dmic_pins>;
Signature · 1 line
1.8.5.3
PATCH 6/9 ARM: DTS: omap5: Set all audio related IP's status to disabled as default
In reply to Peter UjfalusiBoard dts files will need to enable the IP nodes which they are using and does not have to care about the not used ones (to disable them).
--- arch/arm/boot/dts/omap5.dtsi | 5 +++++ 1 file changed, 5 insertions(+)
arch/arm/boot/dts/omap5.dtsi +5 -0
@@ -467,6 +467,7 @@ dmas = <&sdma 65>, <&sdma 66>; dma-names = "up_link", "dn_link"; + status = "disabled"; }; dmic: dmic at 4012e000 {
@@ -478,6 +479,7 @@ ti,hwmods = "dmic"; dmas = <&sdma 67>; dma-names = "up_link"; + status = "disabled"; }; mcbsp1: mcbsp at 40122000 {
@@ -492,6 +494,7 @@ dmas = <&sdma 33>, <&sdma 34>; dma-names = "tx", "rx"; + status = "disabled"; }; mcbsp2: mcbsp at 40124000 {
@@ -506,6 +509,7 @@ dmas = <&sdma 17>, <&sdma 18>; dma-names = "tx", "rx"; + status = "disabled"; }; mcbsp3: mcbsp at 40126000 {
@@ -520,6 +524,7 @@ dmas = <&sdma 19>, <&sdma 20>; dma-names = "tx", "rx"; + status = "disabled"; }; timer1: timer at 4ae18000 {
Signature · 1 line
1.8.5.3
PATCH 7/9 ARM: DTS: omap3: Set disabled status for McBSP instances as default state
In reply to Peter UjfalusiIn omap3.dtsi disable all mcbsp nodes and board dts files can explicitly enable the mcbsp they are using.
--- arch/arm/boot/dts/omap3-beagle-xm.dts | 4 ++++ arch/arm/boot/dts/omap3-beagle.dts | 4 ++++ arch/arm/boot/dts/omap3-devkit8000.dts | 16 ++-------------- arch/arm/boot/dts/omap3-igep.dtsi | 1 + arch/arm/boot/dts/omap3-overo.dtsi | 4 ++++ arch/arm/boot/dts/omap3.dtsi | 5 +++++ 6 files changed, 20 insertions(+), 14 deletions(-)
arch/arm/boot/dts/omap3-beagle-xm.dts +4 -0
@@ -222,3 +222,7 @@ regulator-max-microvolt = <1800000>; regulator-always-on; }; + +&mcbsp2 { + status = "okay"; +};
arch/arm/boot/dts/omap3-beagle.dts +4 -0
@@ -199,3 +199,7 @@ regulator-max-microvolt = <1800000>; regulator-always-on; }; + +&mcbsp2 { + status = "okay"; +};
arch/arm/boot/dts/omap3-devkit8000.dts +2 -14
@@ -101,20 +101,8 @@ status = "disabled"; }; -&mcbsp1 { - status = "disabled"; -}; - -&mcbsp3 { - status = "disabled"; -}; - -&mcbsp4 { - status = "disabled"; -}; - -&mcbsp5 { - status = "disabled"; +&mcbsp2 { + status = "okay"; }; &gpmc {
arch/arm/boot/dts/omap3-igep.dtsi +1 -0
@@ -172,6 +172,7 @@ &mcbsp2 { pinctrl-names = "default"; pinctrl-0 = <&mcbsp2_pins>; + status = "okay"; }; &mmc1 {
arch/arm/boot/dts/omap3-overo.dtsi +4 -0
@@ -95,3 +95,7 @@ pinctrl-names = "default"; pinctrl-0 = <&uart3_pins>; }; + +&mcbsp2 { + status = "okay"; +};
arch/arm/boot/dts/omap3.dtsi +5 -0
@@ -397,6 +397,7 @@ dmas = <&sdma 31>, <&sdma 32>; dma-names = "tx", "rx"; + status = "disabled"; }; mcbsp2: mcbsp at 49022000 {
@@ -414,6 +415,7 @@ dmas = <&sdma 33>, <&sdma 34>; dma-names = "tx", "rx"; + status = "disabled"; }; mcbsp3: mcbsp at 49024000 {
@@ -431,6 +433,7 @@ dmas = <&sdma 17>, <&sdma 18>; dma-names = "tx", "rx"; + status = "disabled"; }; mcbsp4: mcbsp at 49026000 {
@@ -446,6 +449,7 @@ dmas = <&sdma 19>, <&sdma 20>; dma-names = "tx", "rx"; + status = "disabled"; }; mcbsp5: mcbsp at 48096000 {
@@ -461,6 +465,7 @@ dmas = <&sdma 21>, <&sdma 22>; dma-names = "tx", "rx"; + status = "disabled"; }; sham: sham at 480c3000 {
Signature · 1 line
1.8.5.3
PATCH 8/9 ARM: DTS: omap2: Set disabled status for McBSP instances as default state
In reply to Peter UjfalusiIn omap2420.dtsi and omap2430.dtsi disable all mcbsp nodes and board dts files can explicitly enable the mcbsp they are using.
--- arch/arm/boot/dts/omap2420.dtsi | 2 ++ arch/arm/boot/dts/omap2430.dtsi | 5 +++++ 2 files changed, 7 insertions(+)
arch/arm/boot/dts/omap2420.dtsi +2 -0
@@ -99,6 +99,7 @@ dmas = <&sdma 31>, <&sdma 32>; dma-names = "tx", "rx"; + status = "disabled"; }; mcbsp2: mcbsp at 48076000 {
@@ -112,6 +113,7 @@ dmas = <&sdma 33>, <&sdma 34>; dma-names = "tx", "rx"; + status = "disabled"; }; msdi1: mmc at 4809c000 {
arch/arm/boot/dts/omap2430.dtsi +5 -0
@@ -113,6 +113,7 @@ dmas = <&sdma 31>, <&sdma 32>; dma-names = "tx", "rx"; + status = "disabled"; }; mcbsp2: mcbsp at 48076000 {
@@ -128,6 +129,7 @@ dmas = <&sdma 33>, <&sdma 34>; dma-names = "tx", "rx"; + status = "disabled"; }; mcbsp3: mcbsp at 4808c000 {
@@ -143,6 +145,7 @@ dmas = <&sdma 17>, <&sdma 18>; dma-names = "tx", "rx"; + status = "disabled"; }; mcbsp4: mcbsp at 4808e000 {
@@ -158,6 +161,7 @@ dmas = <&sdma 19>, <&sdma 20>; dma-names = "tx", "rx"; + status = "disabled"; }; mcbsp5: mcbsp at 48096000 {
@@ -173,6 +177,7 @@ dmas = <&sdma 21>, <&sdma 22>; dma-names = "tx", "rx"; + status = "disabled"; }; mmc1: mmc at 4809c000 {
Signature · 1 line
1.8.5.3
PATCH 9/9 ARM: DTS: am335x-evmsk: Correct audio clock frequency
In reply to Peter UjfalusiThe clock for audio is sourced from virt_24000000_ck, so the correct frequency is 24000000.
--- arch/arm/boot/dts/am335x-evmsk.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/am335x-evmsk.dts +1 -1
@@ -121,7 +121,7 @@ ti,model = "AM335x-EVMSK"; ti,audio-codec = <&tlv320aic3106>; ti,mcasp-controller = <&mcasp1>; - ti,codec-clock-rate = <24576000>; + ti,codec-clock-rate = <24000000>; ti,audio-routing = "Headphone Jack", "HPLOUT", "Headphone Jack", "HPROUT";
Signature · 1 line
1.8.5.3
cover ARM: DTS: OMAP: Audio related cleanups for dtsi and dts files
In reply to Peter UjfalusiQuoted 7 lines · Peter Ujfalusi
Hi Benoit,
OMAP: Put the audio nodes to disabled styate by default and board dts files should enable the nodes which is used on the board.
am335x: correct the audio mclk clock. This patch has been marked to go to 3.13
stable as well.
Looks like these should get merged, assuming Benoit did not pick them up yet so applying into omap-for-v3.15/dt.
Regards,
Tony
Quoted 35 lines
Peter Ujfalusi (9):
ARM: DTS: omap4-panda-common: Move audio related pinmux to respective
nodes
ARM: DTS: omap4-sdp: Move audio related pinmux to respective nodes
ARM: DTS: omap4: Set all audio related IP's status to disabled as
default
ARM: DTS: omap4-panda-common: No need to disable the unused audio
nodes
ARM: DTS: omap4-sdp: No need to disable mcbsp3 node
ARM: DTS: omap5: Set all audio related IP's status to disabled as
default
ARM: DTS: omap3: Set disabled status for McBSP instances as default
state
ARM: DTS: omap2: Set disabled status for McBSP instances as default
state
ARM: DTS: am335x-evmsk: Correct audio clock frequencyarch/arm/boot/dts/am335x-evmsk.dts | 2 +- arch/arm/boot/dts/omap2420.dtsi | 2 ++ arch/arm/boot/dts/omap2430.dtsi | 5 +++++ arch/arm/boot/dts/omap3-beagle-xm.dts | 4 ++++ arch/arm/boot/dts/omap3-beagle.dts | 4 ++++ arch/arm/boot/dts/omap3-devkit8000.dts | 16 ++------------- arch/arm/boot/dts/omap3-igep.dtsi | 1 + arch/arm/boot/dts/omap3-overo.dtsi | 4 ++++ arch/arm/boot/dts/omap3.dtsi | 5 +++++ arch/arm/boot/dts/omap4-panda-common.dtsi | 23 ++++++++++----------- arch/arm/boot/dts/omap4-sdp.dts | 33 ++++++++++++++++++++++++------- arch/arm/boot/dts/omap4.dtsi | 6 ++++++ arch/arm/boot/dts/omap5.dtsi | 5 +++++ 13 files changed, 77 insertions(+), 33 deletions(-)Signature · 1 line
1.8.5.3