Message ID | 20220323135601.42435-1-ariel.dalessandro@collabora.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | [v4] arm64: dts: imx8mn-bsh-smm-s2pro: Add tlv320aic31xx audio card node | expand |
Shawn, Can we get this integrated into the linux-next tree so it's available for the merge window? Note that dt-bindings/sound/tlv320aic31xx.h is already merged into linux-next. Regards, Ariel On 3/23/22 10:56, Ariel D'Alessandro wrote: > BSH SystemMaster (SMM) S2 PRO board comes with an audio card based on > tlv320aic31xx family codec. > > The audio card exposes two playback devices, one of them using the EASRC > (Enhanced Asynchronous Sample Rate Converter) module. Note that this > would require SDMA and EASRC firmware in order to work. > > Signed-off-by: Ariel D'Alessandro <ariel.dalessandro@collabora.com> > Signed-off-by: Michael Trimarchi <michael@amarulasolutions.com> > --- > .../dts/freescale/imx8mn-bsh-smm-s2pro.dts | 90 +++++++++++++++++++ > 1 file changed, 90 insertions(+) > > diff --git a/arch/arm64/boot/dts/freescale/imx8mn-bsh-smm-s2pro.dts b/arch/arm64/boot/dts/freescale/imx8mn-bsh-smm-s2pro.dts > index c6a8ed6745c1..fbbb3367037b 100644 > --- a/arch/arm64/boot/dts/freescale/imx8mn-bsh-smm-s2pro.dts > +++ b/arch/arm64/boot/dts/freescale/imx8mn-bsh-smm-s2pro.dts > @@ -7,6 +7,7 @@ > /dts-v1/; > > #include "imx8mn-bsh-smm-s2-common.dtsi" > +#include <dt-bindings/sound/tlv320aic31xx.h> > > / { > model = "BSH SMM S2 PRO"; > @@ -16,6 +17,65 @@ memory@40000000 { > device_type = "memory"; > reg = <0x0 0x40000000 0x0 0x20000000>; > }; > + > + sound-tlv320aic31xx { > + compatible = "fsl,imx-audio-tlv320aic31xx"; > + model = "tlv320aic31xx-hifi"; > + audio-cpu = <&sai3>; > + audio-codec = <&tlv320dac3101>; > + audio-asrc = <&easrc>; > + audio-routing = > + "Ext Spk", "SPL", > + "Ext Spk", "SPR"; > + mclk-id = <PLL_CLKIN_BCLK>; > + }; > + > + vdd_input: vdd_input { > + compatible = "regulator-fixed"; > + regulator-name = "vdd_input"; > + regulator-min-microvolt = <5000000>; > + regulator-max-microvolt = <5000000>; > + }; > +}; > + > +&easrc { > + fsl,asrc-rate = <48000>; > + fsl,asrc-format = <10>; > + status = "okay"; > +}; > + > +&i2c2 { > + clock-frequency = <400000>; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_i2c2>; > + status = "okay"; > + > + tlv320dac3101: audio-codec@18 { > + compatible = "ti,tlv320dac3101"; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_dac_rst>; > + reg = <0x18>; > + #sound-dai-cells = <0>; > + HPVDD-supply = <&buck4_reg>; > + SPRVDD-supply = <&vdd_input>; > + SPLVDD-supply = <&vdd_input>; > + AVDD-supply = <&buck4_reg>; > + IOVDD-supply = <&buck4_reg>; > + DVDD-supply = <&buck5_reg>; > + reset-gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; > + ai31xx-micbias-vg = <MICBIAS_AVDDV>; > + clocks = <&clk IMX8MN_CLK_SAI3_ROOT>; > + }; > +}; > + > +&sai3 { > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_sai3>; > + assigned-clocks = <&clk IMX8MN_CLK_SAI3>; > + assigned-clock-parents = <&clk IMX8MN_AUDIO_PLL1_OUT>; > + assigned-clock-rates = <24576000>; > + fsl,sai-mclk-direction-output; > + status = "okay"; > }; > > /* eMMC */ > @@ -30,6 +90,36 @@ &usdhc1 { > }; > > &iomuxc { > + pinctrl_dac_rst: dacrstgrp { > + fsl,pins = < > + MX8MN_IOMUXC_GPIO1_IO06_GPIO1_IO6 0x19 /* DAC_RST */ > + >; > + }; > + > + pinctrl_espi2: espi2grp { > + fsl,pins = < > + MX8MN_IOMUXC_ECSPI2_SCLK_ECSPI2_SCLK 0x082 > + MX8MN_IOMUXC_ECSPI2_MOSI_ECSPI2_MOSI 0x082 > + MX8MN_IOMUXC_ECSPI2_MISO_ECSPI2_MISO 0x082 > + MX8MN_IOMUXC_ECSPI2_SS0_ECSPI2_SS0 0x040 > + >; > + }; > + > + pinctrl_i2c2: i2c2grp { > + fsl,pins = < > + MX8MN_IOMUXC_I2C2_SCL_I2C2_SCL 0x400000c3 > + MX8MN_IOMUXC_I2C2_SDA_I2C2_SDA 0x400000c3 > + >; > + }; > + > + pinctrl_sai3: sai3grp { > + fsl,pins = < > + MX8MN_IOMUXC_SAI3_TXFS_SAI3_TX_SYNC 0xd6 > + MX8MN_IOMUXC_SAI3_TXC_SAI3_TX_BCLK 0xd6 > + MX8MN_IOMUXC_SAI3_TXD_SAI3_TX_DATA0 0xd6 > + >; > + }; > + > pinctrl_usdhc1: usdhc1grp { > fsl,pins = < > MX8MN_IOMUXC_SD1_CLK_USDHC1_CLK 0x40000090
On Wed, Mar 23, 2022 at 10:56 AM Ariel D'Alessandro <ariel.dalessandro@collabora.com> wrote: > > BSH SystemMaster (SMM) S2 PRO board comes with an audio card based on > tlv320aic31xx family codec. > > The audio card exposes two playback devices, one of them using the EASRC > (Enhanced Asynchronous Sample Rate Converter) module. Note that this > would require SDMA and EASRC firmware in order to work. > > Signed-off-by: Ariel D'Alessandro <ariel.dalessandro@collabora.com> > Signed-off-by: Michael Trimarchi <michael@amarulasolutions.com> > --- What are the changes in v4? I see you removed 'clock-names' so this looks good: Reviewed-by: Fabio Estevam <festevam@gmail.com>
Hi Fabio, On 3/25/22 10:49, Fabio Estevam wrote: > On Wed, Mar 23, 2022 at 10:56 AM Ariel D'Alessandro > <ariel.dalessandro@collabora.com> wrote: >> >> BSH SystemMaster (SMM) S2 PRO board comes with an audio card based on >> tlv320aic31xx family codec. >> >> The audio card exposes two playback devices, one of them using the EASRC >> (Enhanced Asynchronous Sample Rate Converter) module. Note that this >> would require SDMA and EASRC firmware in order to work. >> >> Signed-off-by: Ariel D'Alessandro <ariel.dalessandro@collabora.com> >> Signed-off-by: Michael Trimarchi <michael@amarulasolutions.com> >> --- > > What are the changes in v4? * Fixed the sound-tlv320aic31xx audio-codec property to point to the right codec node <&tlv320dac3101> * Reordered properties in tlv320dac3101, and removed clock-names property. > > I see you removed 'clock-names' so this looks good: Indeed. > > Reviewed-by: Fabio Estevam <festevam@gmail.com> Thanks!
Hi Fabio, Shawn, Can we merge this please? Thanks, Ariel On 3/25/22 10:56, Ariel D'Alessandro wrote: > Hi Fabio, > > On 3/25/22 10:49, Fabio Estevam wrote: >> On Wed, Mar 23, 2022 at 10:56 AM Ariel D'Alessandro >> <ariel.dalessandro@collabora.com> wrote: >>> >>> BSH SystemMaster (SMM) S2 PRO board comes with an audio card based on >>> tlv320aic31xx family codec. >>> >>> The audio card exposes two playback devices, one of them using the EASRC >>> (Enhanced Asynchronous Sample Rate Converter) module. Note that this >>> would require SDMA and EASRC firmware in order to work. >>> >>> Signed-off-by: Ariel D'Alessandro <ariel.dalessandro@collabora.com> >>> Signed-off-by: Michael Trimarchi <michael@amarulasolutions.com> >>> --- >> >> What are the changes in v4? > > * Fixed the sound-tlv320aic31xx audio-codec property to point to the > right codec node <&tlv320dac3101> > > * Reordered properties in tlv320dac3101, and removed clock-names property. > >> >> I see you removed 'clock-names' so this looks good: > > Indeed. > >> >> Reviewed-by: Fabio Estevam <festevam@gmail.com> > > Thanks!
Hi Ariel, On Thu, Mar 31, 2022 at 10:35 AM Ariel D'Alessandro <ariel.dalessandro@collabora.com> wrote: > > Hi Fabio, Shawn, > > Can we merge this please? Shawn will probably start picking the patches for the next cycle after 5.18-rc1 is released.
Hi Shawn, Gentle ping :-) On 3/31/22 10:48, Fabio Estevam wrote: > Hi Ariel, > > On Thu, Mar 31, 2022 at 10:35 AM Ariel D'Alessandro > <ariel.dalessandro@collabora.com> wrote: >> >> Hi Fabio, Shawn, >> >> Can we merge this please? > > Shawn will probably start picking the patches for the next cycle after > 5.18-rc1 is released.
On Wed, Mar 23, 2022 at 10:56:01AM -0300, Ariel D'Alessandro wrote: > BSH SystemMaster (SMM) S2 PRO board comes with an audio card based on > tlv320aic31xx family codec. > > The audio card exposes two playback devices, one of them using the EASRC > (Enhanced Asynchronous Sample Rate Converter) module. Note that this > would require SDMA and EASRC firmware in order to work. > > Signed-off-by: Ariel D'Alessandro <ariel.dalessandro@collabora.com> > Signed-off-by: Michael Trimarchi <michael@amarulasolutions.com> Applied, thanks!
diff --git a/arch/arm64/boot/dts/freescale/imx8mn-bsh-smm-s2pro.dts b/arch/arm64/boot/dts/freescale/imx8mn-bsh-smm-s2pro.dts index c6a8ed6745c1..fbbb3367037b 100644 --- a/arch/arm64/boot/dts/freescale/imx8mn-bsh-smm-s2pro.dts +++ b/arch/arm64/boot/dts/freescale/imx8mn-bsh-smm-s2pro.dts @@ -7,6 +7,7 @@ /dts-v1/; #include "imx8mn-bsh-smm-s2-common.dtsi" +#include <dt-bindings/sound/tlv320aic31xx.h> / { model = "BSH SMM S2 PRO"; @@ -16,6 +17,65 @@ memory@40000000 { device_type = "memory"; reg = <0x0 0x40000000 0x0 0x20000000>; }; + + sound-tlv320aic31xx { + compatible = "fsl,imx-audio-tlv320aic31xx"; + model = "tlv320aic31xx-hifi"; + audio-cpu = <&sai3>; + audio-codec = <&tlv320dac3101>; + audio-asrc = <&easrc>; + audio-routing = + "Ext Spk", "SPL", + "Ext Spk", "SPR"; + mclk-id = <PLL_CLKIN_BCLK>; + }; + + vdd_input: vdd_input { + compatible = "regulator-fixed"; + regulator-name = "vdd_input"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + }; +}; + +&easrc { + fsl,asrc-rate = <48000>; + fsl,asrc-format = <10>; + status = "okay"; +}; + +&i2c2 { + clock-frequency = <400000>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c2>; + status = "okay"; + + tlv320dac3101: audio-codec@18 { + compatible = "ti,tlv320dac3101"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_dac_rst>; + reg = <0x18>; + #sound-dai-cells = <0>; + HPVDD-supply = <&buck4_reg>; + SPRVDD-supply = <&vdd_input>; + SPLVDD-supply = <&vdd_input>; + AVDD-supply = <&buck4_reg>; + IOVDD-supply = <&buck4_reg>; + DVDD-supply = <&buck5_reg>; + reset-gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; + ai31xx-micbias-vg = <MICBIAS_AVDDV>; + clocks = <&clk IMX8MN_CLK_SAI3_ROOT>; + }; +}; + +&sai3 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_sai3>; + assigned-clocks = <&clk IMX8MN_CLK_SAI3>; + assigned-clock-parents = <&clk IMX8MN_AUDIO_PLL1_OUT>; + assigned-clock-rates = <24576000>; + fsl,sai-mclk-direction-output; + status = "okay"; }; /* eMMC */ @@ -30,6 +90,36 @@ &usdhc1 { }; &iomuxc { + pinctrl_dac_rst: dacrstgrp { + fsl,pins = < + MX8MN_IOMUXC_GPIO1_IO06_GPIO1_IO6 0x19 /* DAC_RST */ + >; + }; + + pinctrl_espi2: espi2grp { + fsl,pins = < + MX8MN_IOMUXC_ECSPI2_SCLK_ECSPI2_SCLK 0x082 + MX8MN_IOMUXC_ECSPI2_MOSI_ECSPI2_MOSI 0x082 + MX8MN_IOMUXC_ECSPI2_MISO_ECSPI2_MISO 0x082 + MX8MN_IOMUXC_ECSPI2_SS0_ECSPI2_SS0 0x040 + >; + }; + + pinctrl_i2c2: i2c2grp { + fsl,pins = < + MX8MN_IOMUXC_I2C2_SCL_I2C2_SCL 0x400000c3 + MX8MN_IOMUXC_I2C2_SDA_I2C2_SDA 0x400000c3 + >; + }; + + pinctrl_sai3: sai3grp { + fsl,pins = < + MX8MN_IOMUXC_SAI3_TXFS_SAI3_TX_SYNC 0xd6 + MX8MN_IOMUXC_SAI3_TXC_SAI3_TX_BCLK 0xd6 + MX8MN_IOMUXC_SAI3_TXD_SAI3_TX_DATA0 0xd6 + >; + }; + pinctrl_usdhc1: usdhc1grp { fsl,pins = < MX8MN_IOMUXC_SD1_CLK_USDHC1_CLK 0x40000090