| Message ID | 20230313-mcasp_upstream-v5-6-d6844707aa8a@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | arm64: ti: Enable audio on AM62 and AM62A | expand |
On 13/03/23 20:19, Jai Luthra wrote: > Add nodes for audio codec and sound card, enable the audio serializer > (McASP1) under use and update pinmux. > > Signed-off-by: Jai Luthra <j-luthra@ti.com> > --- > arch/arm64/boot/dts/ti/k3-am62a7-sk.dts | 77 +++++++++++++++++++++++++++++++++ > 1 file changed, 77 insertions(+) > > diff --git a/arch/arm64/boot/dts/ti/k3-am62a7-sk.dts b/arch/arm64/boot/dts/ti/k3-am62a7-sk.dts > index 063e69e45163..1775ed154aff 100644 > --- a/arch/arm64/boot/dts/ti/k3-am62a7-sk.dts > +++ b/arch/arm64/boot/dts/ti/k3-am62a7-sk.dts > @@ -122,6 +122,41 @@ led-0 { > default-state = "off"; > }; > }; > + > + tlv320_mclk: clk-0 { > + #clock-cells = <0>; > + compatible = "fixed-clock"; > + clock-frequency = <12288000>; > + }; > + > + codec_audio: sound { > + compatible = "simple-audio-card"; > + simple-audio-card,name = "AM62Ax-SKEVM"; > + simple-audio-card,widgets = > + "Headphone", "Headphone Jack", > + "Line", "Line In", > + "Microphone", "Microphone Jack"; > + simple-audio-card,routing = > + "Headphone Jack", "HPLOUT", > + "Headphone Jack", "HPROUT", > + "LINE1L", "Line In", > + "LINE1R", "Line In", > + "MIC3R", "Microphone Jack", > + "Microphone Jack", "Mic Bias"; > + simple-audio-card,format = "dsp_b"; > + simple-audio-card,bitclock-master = <&sound_master>; > + simple-audio-card,frame-master = <&sound_master>; > + simple-audio-card,bitclock-inversion; > + > + simple-audio-card,cpu { > + sound-dai = <&mcasp1>; > + }; > + > + sound_master: simple-audio-card,codec { > + sound-dai = <&tlv320aic3106>; > + clocks = <&tlv320_mclk>; > + }; > + }; > }; > > &main_pmx0 { > @@ -200,6 +235,15 @@ AM62AX_IOPAD(0x130, PIN_INPUT, 0) /* (AB17) RGMII1_TXC */ > AM62AX_IOPAD(0x12c, PIN_INPUT, 0) /* (W16) RGMII1_TX_CTL */ > >; > }; > + > + main_mcasp1_pins_default: main-mcasp1-pins-default { > + pinctrl-single,pins = < > + AM62AX_IOPAD(0x090, PIN_INPUT, 2) /* (L19) GPMC0_BE0n_CLE.MCASP1_ACLKX */ > + AM62AX_IOPAD(0x098, PIN_INPUT, 2) /* (R18) GPMC0_WAIT0.MCASP1_AFSX */ > + AM62AX_IOPAD(0x08c, PIN_OUTPUT, 2) /* (K19) GPMC0_WEn.MCASP1_AXR0 */ > + AM62AX_IOPAD(0x084, PIN_INPUT, 2) /* (L18) GPMC0_ADVn_ALE.MCASP1_AXR2 */ > + >; > + }; > }; > > &main_i2c0 { > @@ -234,6 +278,19 @@ exp1: gpio@22 { > "MCASP1_FET_SEL", "UART1_FET_SEL", > "PD_I2C_IRQ", "IO_EXP_TEST_LED"; > }; > + > + tlv320aic3106: audio-codec@1b { > + #sound-dai-cells = <0>; > + compatible = "ti,tlv320aic3106"; > + reg = <0x1b>; > + ai3x-micbias-vg = <1>; /* 2.0V */ > + status = "okay"; No need for status property here I guess???? > + > + /* Regulators */ > + AVDD-supply = <&vcc_3v3_sys>; > + IOVDD-supply = <&vcc_3v3_sys>; > + DRVDD-supply = <&vcc_3v3_sys>; DVDD 1.8V supply here looks missing??? Reviewed-by: Jayesh Choudhary <j-choudhary@ti.com> > + }; > }; > > &sdhci1 { > @@ -302,3 +359,23 @@ cpsw3g_phy0: ethernet-phy@0 { > ti,min-output-impedance; > }; > }; > + > +&mcasp1 { > + status = "okay"; > + #sound-dai-cells = <0>; > + > + pinctrl-names = "default"; > + pinctrl-0 = <&main_mcasp1_pins_default>; > + > + op-mode = <0>; /* MCASP_IIS_MODE */ > + tdm-slots = <2>; > + > + serial-dir = < /* 0: INACTIVE, 1: TX, 2: RX */ > + 1 0 2 0 > + 0 0 0 0 > + 0 0 0 0 > + 0 0 0 0 > + >; > + tx-num-evt = <32>; > + rx-num-evt = <32>; > +}; >
Hi Jayesh, Thanks for the comments on the series. On Mar 15, 2023 at 10:02:24 +0530, Jayesh Choudhary wrote: > > > On 13/03/23 20:19, Jai Luthra wrote: > > Add nodes for audio codec and sound card, enable the audio serializer > > (McASP1) under use and update pinmux. > > > > Signed-off-by: Jai Luthra <j-luthra@ti.com> > > --- > > arch/arm64/boot/dts/ti/k3-am62a7-sk.dts | 77 +++++++++++++++++++++++++++++++++ > > 1 file changed, 77 insertions(+) > > > > diff --git a/arch/arm64/boot/dts/ti/k3-am62a7-sk.dts b/arch/arm64/boot/dts/ti/k3-am62a7-sk.dts > > index 063e69e45163..1775ed154aff 100644 > > --- a/arch/arm64/boot/dts/ti/k3-am62a7-sk.dts > > +++ b/arch/arm64/boot/dts/ti/k3-am62a7-sk.dts > > @@ -122,6 +122,41 @@ led-0 { > > default-state = "off"; > > }; > > }; > > + > > + tlv320_mclk: clk-0 { > > + #clock-cells = <0>; > > + compatible = "fixed-clock"; > > + clock-frequency = <12288000>; > > + }; > > + > > + codec_audio: sound { > > + compatible = "simple-audio-card"; > > + simple-audio-card,name = "AM62Ax-SKEVM"; > > + simple-audio-card,widgets = > > + "Headphone", "Headphone Jack", > > + "Line", "Line In", > > + "Microphone", "Microphone Jack"; > > + simple-audio-card,routing = > > + "Headphone Jack", "HPLOUT", > > + "Headphone Jack", "HPROUT", > > + "LINE1L", "Line In", > > + "LINE1R", "Line In", > > + "MIC3R", "Microphone Jack", > > + "Microphone Jack", "Mic Bias"; > > + simple-audio-card,format = "dsp_b"; > > + simple-audio-card,bitclock-master = <&sound_master>; > > + simple-audio-card,frame-master = <&sound_master>; > > + simple-audio-card,bitclock-inversion; > > + > > + simple-audio-card,cpu { > > + sound-dai = <&mcasp1>; > > + }; > > + > > + sound_master: simple-audio-card,codec { > > + sound-dai = <&tlv320aic3106>; > > + clocks = <&tlv320_mclk>; > > + }; > > + }; > > }; > > &main_pmx0 { > > @@ -200,6 +235,15 @@ AM62AX_IOPAD(0x130, PIN_INPUT, 0) /* (AB17) RGMII1_TXC */ > > AM62AX_IOPAD(0x12c, PIN_INPUT, 0) /* (W16) RGMII1_TX_CTL */ > > >; > > }; > > + > > + main_mcasp1_pins_default: main-mcasp1-pins-default { > > + pinctrl-single,pins = < > > + AM62AX_IOPAD(0x090, PIN_INPUT, 2) /* (L19) GPMC0_BE0n_CLE.MCASP1_ACLKX */ > > + AM62AX_IOPAD(0x098, PIN_INPUT, 2) /* (R18) GPMC0_WAIT0.MCASP1_AFSX */ > > + AM62AX_IOPAD(0x08c, PIN_OUTPUT, 2) /* (K19) GPMC0_WEn.MCASP1_AXR0 */ > > + AM62AX_IOPAD(0x084, PIN_INPUT, 2) /* (L18) GPMC0_ADVn_ALE.MCASP1_AXR2 */ > > + >; > > + }; > > }; > > &main_i2c0 { > > @@ -234,6 +278,19 @@ exp1: gpio@22 { > > "MCASP1_FET_SEL", "UART1_FET_SEL", > > "PD_I2C_IRQ", "IO_EXP_TEST_LED"; > > }; > > + > > + tlv320aic3106: audio-codec@1b { > > + #sound-dai-cells = <0>; > > + compatible = "ti,tlv320aic3106"; > > + reg = <0x1b>; > > + ai3x-micbias-vg = <1>; /* 2.0V */ > > + status = "okay"; > > No need for status property here I guess???? Will fix. > > > + > > + /* Regulators */ > > + AVDD-supply = <&vcc_3v3_sys>; > > + IOVDD-supply = <&vcc_3v3_sys>; > > + DRVDD-supply = <&vcc_3v3_sys>; > > DVDD 1.8V supply here looks missing??? Sorry I missed to add a note in the commit message, will add in v6. DVDD 1.8V is supplied by the PMIC (TPS6593x-Q1) on the SK, the driver and dt-bindings for it are still being worked on: https://lore.kernel.org/all/20230216114410.183489-1-jpanis@baylibre.com/ The codec can be enabled without it for now, as it only uses the regulators to calculate the OCMV, which I will supply manually to the codec through DT in v6. > > Reviewed-by: Jayesh Choudhary <j-choudhary@ti.com> > > > + }; > > }; > > &sdhci1 { > > @@ -302,3 +359,23 @@ cpsw3g_phy0: ethernet-phy@0 { > > ti,min-output-impedance; > > }; > > }; > > + > > +&mcasp1 { > > + status = "okay"; > > + #sound-dai-cells = <0>; > > + > > + pinctrl-names = "default"; > > + pinctrl-0 = <&main_mcasp1_pins_default>; > > + > > + op-mode = <0>; /* MCASP_IIS_MODE */ > > + tdm-slots = <2>; > > + > > + serial-dir = < /* 0: INACTIVE, 1: TX, 2: RX */ > > + 1 0 2 0 > > + 0 0 0 0 > > + 0 0 0 0 > > + 0 0 0 0 > > + >; > > + tx-num-evt = <32>; > > + rx-num-evt = <32>; > > +}; > >
diff --git a/arch/arm64/boot/dts/ti/k3-am62a7-sk.dts b/arch/arm64/boot/dts/ti/k3-am62a7-sk.dts index 063e69e45163..1775ed154aff 100644 --- a/arch/arm64/boot/dts/ti/k3-am62a7-sk.dts +++ b/arch/arm64/boot/dts/ti/k3-am62a7-sk.dts @@ -122,6 +122,41 @@ led-0 { default-state = "off"; }; }; + + tlv320_mclk: clk-0 { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <12288000>; + }; + + codec_audio: sound { + compatible = "simple-audio-card"; + simple-audio-card,name = "AM62Ax-SKEVM"; + simple-audio-card,widgets = + "Headphone", "Headphone Jack", + "Line", "Line In", + "Microphone", "Microphone Jack"; + simple-audio-card,routing = + "Headphone Jack", "HPLOUT", + "Headphone Jack", "HPROUT", + "LINE1L", "Line In", + "LINE1R", "Line In", + "MIC3R", "Microphone Jack", + "Microphone Jack", "Mic Bias"; + simple-audio-card,format = "dsp_b"; + simple-audio-card,bitclock-master = <&sound_master>; + simple-audio-card,frame-master = <&sound_master>; + simple-audio-card,bitclock-inversion; + + simple-audio-card,cpu { + sound-dai = <&mcasp1>; + }; + + sound_master: simple-audio-card,codec { + sound-dai = <&tlv320aic3106>; + clocks = <&tlv320_mclk>; + }; + }; }; &main_pmx0 { @@ -200,6 +235,15 @@ AM62AX_IOPAD(0x130, PIN_INPUT, 0) /* (AB17) RGMII1_TXC */ AM62AX_IOPAD(0x12c, PIN_INPUT, 0) /* (W16) RGMII1_TX_CTL */ >; }; + + main_mcasp1_pins_default: main-mcasp1-pins-default { + pinctrl-single,pins = < + AM62AX_IOPAD(0x090, PIN_INPUT, 2) /* (L19) GPMC0_BE0n_CLE.MCASP1_ACLKX */ + AM62AX_IOPAD(0x098, PIN_INPUT, 2) /* (R18) GPMC0_WAIT0.MCASP1_AFSX */ + AM62AX_IOPAD(0x08c, PIN_OUTPUT, 2) /* (K19) GPMC0_WEn.MCASP1_AXR0 */ + AM62AX_IOPAD(0x084, PIN_INPUT, 2) /* (L18) GPMC0_ADVn_ALE.MCASP1_AXR2 */ + >; + }; }; &main_i2c0 { @@ -234,6 +278,19 @@ exp1: gpio@22 { "MCASP1_FET_SEL", "UART1_FET_SEL", "PD_I2C_IRQ", "IO_EXP_TEST_LED"; }; + + tlv320aic3106: audio-codec@1b { + #sound-dai-cells = <0>; + compatible = "ti,tlv320aic3106"; + reg = <0x1b>; + ai3x-micbias-vg = <1>; /* 2.0V */ + status = "okay"; + + /* Regulators */ + AVDD-supply = <&vcc_3v3_sys>; + IOVDD-supply = <&vcc_3v3_sys>; + DRVDD-supply = <&vcc_3v3_sys>; + }; }; &sdhci1 { @@ -302,3 +359,23 @@ cpsw3g_phy0: ethernet-phy@0 { ti,min-output-impedance; }; }; + +&mcasp1 { + status = "okay"; + #sound-dai-cells = <0>; + + pinctrl-names = "default"; + pinctrl-0 = <&main_mcasp1_pins_default>; + + op-mode = <0>; /* MCASP_IIS_MODE */ + tdm-slots = <2>; + + serial-dir = < /* 0: INACTIVE, 1: TX, 2: RX */ + 1 0 2 0 + 0 0 0 0 + 0 0 0 0 + 0 0 0 0 + >; + tx-num-evt = <32>; + rx-num-evt = <32>; +};
Add nodes for audio codec and sound card, enable the audio serializer (McASP1) under use and update pinmux. Signed-off-by: Jai Luthra <j-luthra@ti.com> --- arch/arm64/boot/dts/ti/k3-am62a7-sk.dts | 77 +++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+)