| Message ID | 20220927002023.685128-1-marex@denx.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ARM: dts: stm32: Replace SAI format with dai-format DT property | expand |
Hi Marek, Thanks for your patch. You can add my: Reviewed-by: Olivier Moysan <olivier.moysan@foss.st.com> BRs On 9/27/22 02:20, Marek Vasut wrote: > The dai-format and format are handled equally by sound-core.c , the > later is however the only documented property in audio-graph-port.yaml . > Switch to the later. > > Signed-off-by: Marek Vasut <marex@denx.de> > --- > Cc: Alexandre Torgue <alexandre.torgue@foss.st.com> > Cc: Patrice Chotard <patrice.chotard@foss.st.com> > Cc: Patrick Delaunay <patrick.delaunay@foss.st.com> > Cc: linux-stm32@st-md-mailman.stormreply.com > To: linux-arm-kernel@lists.infradead.org > --- > arch/arm/boot/dts/stm32mp15xx-dhcom-pdk2.dtsi | 4 ++-- > arch/arm/boot/dts/stm32mp15xx-dhcor-avenger96.dtsi | 2 +- > arch/arm/boot/dts/stm32mp15xx-dkx.dtsi | 4 ++-- > 3 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/arch/arm/boot/dts/stm32mp15xx-dhcom-pdk2.dtsi b/arch/arm/boot/dts/stm32mp15xx-dhcom-pdk2.dtsi > index 5f586f024060f..4709677151aac 100644 > --- a/arch/arm/boot/dts/stm32mp15xx-dhcom-pdk2.dtsi > +++ b/arch/arm/boot/dts/stm32mp15xx-dhcom-pdk2.dtsi > @@ -242,7 +242,7 @@ sai2a: audio-controller@4400b004 { > sai2a_port: port { > sai2a_endpoint: endpoint { > remote-endpoint = <&sgtl5000_tx_endpoint>; > - format = "i2s"; > + dai-format = "i2s"; > mclk-fs = <512>; > dai-tdm-slot-num = <2>; > dai-tdm-slot-width = <16>; > @@ -260,7 +260,7 @@ sai2b: audio-controller@4400b024 { > sai2b_port: port { > sai2b_endpoint: endpoint { > remote-endpoint = <&sgtl5000_rx_endpoint>; > - format = "i2s"; > + dai-format = "i2s"; > mclk-fs = <512>; > dai-tdm-slot-num = <2>; > dai-tdm-slot-width = <16>; > diff --git a/arch/arm/boot/dts/stm32mp15xx-dhcor-avenger96.dtsi b/arch/arm/boot/dts/stm32mp15xx-dhcor-avenger96.dtsi > index aa79ed1cb1f15..50af4a27d6be4 100644 > --- a/arch/arm/boot/dts/stm32mp15xx-dhcor-avenger96.dtsi > +++ b/arch/arm/boot/dts/stm32mp15xx-dhcor-avenger96.dtsi > @@ -358,7 +358,7 @@ sai2a: audio-controller@4400b004 { > sai2a_port: port { > sai2a_endpoint: endpoint { > remote-endpoint = <&adv7513_i2s0>; > - format = "i2s"; > + dai-format = "i2s"; > mclk-fs = <256>; > }; > }; > diff --git a/arch/arm/boot/dts/stm32mp15xx-dkx.dtsi b/arch/arm/boot/dts/stm32mp15xx-dkx.dtsi > index 6afff983069b6..7798a2e17c5ca 100644 > --- a/arch/arm/boot/dts/stm32mp15xx-dkx.dtsi > +++ b/arch/arm/boot/dts/stm32mp15xx-dkx.dtsi > @@ -508,7 +508,7 @@ sai2a: audio-controller@4400b004 { > sai2a_port: port { > sai2a_endpoint: endpoint { > remote-endpoint = <&cs42l51_tx_endpoint>; > - format = "i2s"; > + dai-format = "i2s"; > mclk-fs = <256>; > dai-tdm-slot-num = <2>; > dai-tdm-slot-width = <32>; > @@ -526,7 +526,7 @@ sai2b: audio-controller@4400b024 { > sai2b_port: port { > sai2b_endpoint: endpoint { > remote-endpoint = <&cs42l51_rx_endpoint>; > - format = "i2s"; > + dai-format = "i2s"; > mclk-fs = <256>; > dai-tdm-slot-num = <2>; > dai-tdm-slot-width = <32>;
On 9/27/22 02:20, Marek Vasut wrote: > The dai-format and format are handled equally by sound-core.c , the > later is however the only documented property in audio-graph-port.yaml . > Switch to the later. > > Signed-off-by: Marek Vasut <marex@denx.de> > --- > Cc: Alexandre Torgue <alexandre.torgue@foss.st.com> > Cc: Patrice Chotard <patrice.chotard@foss.st.com> > Cc: Patrick Delaunay <patrick.delaunay@foss.st.com> > Cc: linux-stm32@st-md-mailman.stormreply.com > To: linux-arm-kernel@lists.infradead.org > --- > arch/arm/boot/dts/stm32mp15xx-dhcom-pdk2.dtsi | 4 ++-- > arch/arm/boot/dts/stm32mp15xx-dhcor-avenger96.dtsi | 2 +- > arch/arm/boot/dts/stm32mp15xx-dkx.dtsi | 4 ++-- > 3 files changed, 5 insertions(+), 5 deletions(-) Applied on stm32-next. Thanks. Alex
diff --git a/arch/arm/boot/dts/stm32mp15xx-dhcom-pdk2.dtsi b/arch/arm/boot/dts/stm32mp15xx-dhcom-pdk2.dtsi index 5f586f024060f..4709677151aac 100644 --- a/arch/arm/boot/dts/stm32mp15xx-dhcom-pdk2.dtsi +++ b/arch/arm/boot/dts/stm32mp15xx-dhcom-pdk2.dtsi @@ -242,7 +242,7 @@ sai2a: audio-controller@4400b004 { sai2a_port: port { sai2a_endpoint: endpoint { remote-endpoint = <&sgtl5000_tx_endpoint>; - format = "i2s"; + dai-format = "i2s"; mclk-fs = <512>; dai-tdm-slot-num = <2>; dai-tdm-slot-width = <16>; @@ -260,7 +260,7 @@ sai2b: audio-controller@4400b024 { sai2b_port: port { sai2b_endpoint: endpoint { remote-endpoint = <&sgtl5000_rx_endpoint>; - format = "i2s"; + dai-format = "i2s"; mclk-fs = <512>; dai-tdm-slot-num = <2>; dai-tdm-slot-width = <16>; diff --git a/arch/arm/boot/dts/stm32mp15xx-dhcor-avenger96.dtsi b/arch/arm/boot/dts/stm32mp15xx-dhcor-avenger96.dtsi index aa79ed1cb1f15..50af4a27d6be4 100644 --- a/arch/arm/boot/dts/stm32mp15xx-dhcor-avenger96.dtsi +++ b/arch/arm/boot/dts/stm32mp15xx-dhcor-avenger96.dtsi @@ -358,7 +358,7 @@ sai2a: audio-controller@4400b004 { sai2a_port: port { sai2a_endpoint: endpoint { remote-endpoint = <&adv7513_i2s0>; - format = "i2s"; + dai-format = "i2s"; mclk-fs = <256>; }; }; diff --git a/arch/arm/boot/dts/stm32mp15xx-dkx.dtsi b/arch/arm/boot/dts/stm32mp15xx-dkx.dtsi index 6afff983069b6..7798a2e17c5ca 100644 --- a/arch/arm/boot/dts/stm32mp15xx-dkx.dtsi +++ b/arch/arm/boot/dts/stm32mp15xx-dkx.dtsi @@ -508,7 +508,7 @@ sai2a: audio-controller@4400b004 { sai2a_port: port { sai2a_endpoint: endpoint { remote-endpoint = <&cs42l51_tx_endpoint>; - format = "i2s"; + dai-format = "i2s"; mclk-fs = <256>; dai-tdm-slot-num = <2>; dai-tdm-slot-width = <32>; @@ -526,7 +526,7 @@ sai2b: audio-controller@4400b024 { sai2b_port: port { sai2b_endpoint: endpoint { remote-endpoint = <&cs42l51_rx_endpoint>; - format = "i2s"; + dai-format = "i2s"; mclk-fs = <256>; dai-tdm-slot-num = <2>; dai-tdm-slot-width = <32>;
The dai-format and format are handled equally by sound-core.c , the later is however the only documented property in audio-graph-port.yaml . Switch to the later. Signed-off-by: Marek Vasut <marex@denx.de> --- Cc: Alexandre Torgue <alexandre.torgue@foss.st.com> Cc: Patrice Chotard <patrice.chotard@foss.st.com> Cc: Patrick Delaunay <patrick.delaunay@foss.st.com> Cc: linux-stm32@st-md-mailman.stormreply.com To: linux-arm-kernel@lists.infradead.org --- arch/arm/boot/dts/stm32mp15xx-dhcom-pdk2.dtsi | 4 ++-- arch/arm/boot/dts/stm32mp15xx-dhcor-avenger96.dtsi | 2 +- arch/arm/boot/dts/stm32mp15xx-dkx.dtsi | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-)