[PATCH 0/3] ARM: dts: imx[6qdl|7]-[apalis|colibri]: Update audio card names

[PATCH 0/3] ARM: dts: imx[6qdl|7]-[apalis|colibri]: Update audio card names

[Hiago De Franco]

From: Hiago De Franco <hiago.franco@toradex.com>

This patch series update the audio card names for Apalis and Colibri
iMX6/7 to match their specific SoM names, making it shorter (less than
15 characters, as shown in [1]) to fix warnings related to ALSA in
Apalis iMX6 and Colibri iMX6. For Colibri iMX7, also do the change to
make it compliant with the other card names.

[1] Documentation/sound/alsa-configuration.rst

Hiago De Franco (3):
  ARM: dts: imx6qdl-apalis: Update audio card name
  ARM: dts: imx6qdl-colibri: Update audio card name
  ARM: dts: imx7-colibri: Update audio card name

 arch/arm/boot/dts/nxp/imx/imx6qdl-apalis.dtsi  | 2 +-
 arch/arm/boot/dts/nxp/imx/imx6qdl-colibri.dtsi | 2 +-
 arch/arm/boot/dts/nxp/imx/imx7-colibri.dtsi    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

-- 
2.39.2

[PATCH 1/3] ARM: dts: imx6qdl-apalis: Update audio card name

[Hiago De Franco]

From: Hiago De Franco <hiago.franco@toradex.com>

Update the audio card name for Apalis iMX6 to match its specific SoM
name, making it less than 15 characters to fix the following warning

fsl-asoc-card sound: ASoC: driver name too long
'imx6q-apalis-sgtl5000' -> 'imx6q-apalis-sg'

making it compliant with the ALSA configuration specification [1].

[1] Documentation/sound/alsa-configuration.rst

Signed-off-by: Hiago De Franco <hiago.franco@toradex.com>
---
 arch/arm/boot/dts/nxp/imx/imx6qdl-apalis.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl-apalis.dtsi
index edf55760a5c1..1c72da417011 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6qdl-apalis.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-apalis.dtsi
@@ -191,7 +191,7 @@ sound {
 			"MIC_IN", "Mic Jack",
 			"Mic Jack", "Mic Bias",
 			"Headphone Jack", "HP_OUT";
-		model = "imx6q-apalis-sgtl5000";
+		model = "apalis-imx6";
 		mux-ext-port = <4>;
 		mux-int-port = <1>;
 		ssi-controller = <&ssi1>;
-- 
2.39.2

Re: [PATCH 1/3] ARM: dts: imx6qdl-apalis: Update audio card name

[Krzysztof Kozlowski]

On 09/09/2024 13:49, Hiago De Franco wrote:
> From: Hiago De Franco <hiago.franco@toradex.com>
> 
> Update the audio card name for Apalis iMX6 to match its specific SoM
> name, making it less than 15 characters to fix the following warning
> 
> fsl-asoc-card sound: ASoC: driver name too long
> 'imx6q-apalis-sgtl5000' -> 'imx6q-apalis-sg'
> 
> making it compliant with the ALSA configuration specification [1].
> 
> [1] Documentation/sound/alsa-configuration.rst
> 
> Signed-off-by: Hiago De Franco <hiago.franco@toradex.com>
> ---
>  arch/arm/boot/dts/nxp/imx/imx6qdl-apalis.dtsi | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl-apalis.dtsi
> index edf55760a5c1..1c72da417011 100644
> --- a/arch/arm/boot/dts/nxp/imx/imx6qdl-apalis.dtsi
> +++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-apalis.dtsi
> @@ -191,7 +191,7 @@ sound {
>  			"MIC_IN", "Mic Jack",
>  			"Mic Jack", "Mic Bias",
>  			"Headphone Jack", "HP_OUT";
> -		model = "imx6q-apalis-sgtl5000";
> +		model = "apalis-imx6";

Doesn't this break all the users? E.g. ALSA UCM and whatever
user-space-parsing stuff you have?

Best regards,
Krzysztof

Re: [PATCH 1/3] ARM: dts: imx6qdl-apalis: Update audio card name

[Francesco Dolcini]

Hello Krzysztof,
thanks for the review/feedback.

On Mon, Sep 09, 2024 at 02:09:11PM +0200, Krzysztof Kozlowski wrote:
> On 09/09/2024 13:49, Hiago De Franco wrote:
> > diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl-apalis.dtsi
> > index edf55760a5c1..1c72da417011 100644
> > --- a/arch/arm/boot/dts/nxp/imx/imx6qdl-apalis.dtsi
> > +++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-apalis.dtsi
> > @@ -191,7 +191,7 @@ sound {
> >  			"MIC_IN", "Mic Jack",
> >  			"Mic Jack", "Mic Bias",
> >  			"Headphone Jack", "HP_OUT";
> > -		model = "imx6q-apalis-sgtl5000";
> > +		model = "apalis-imx6";
> 
> Doesn't this break all the users? E.g. ALSA UCM and whatever
> user-space-parsing stuff you have?

I am not sure about "all" users, but for sure it's a breaking change.
There is no ALSA UCM for this board (and also not for the other twos in
this series), we just worked on it and we thought that if we want to do
such a change the moment is now.

What should we do?

Francesco

Re: [PATCH 1/3] ARM: dts: imx6qdl-apalis: Update audio card name

[Krzysztof Kozlowski]

On 09/09/2024 14:54, Francesco Dolcini wrote:
> Hello Krzysztof,
> thanks for the review/feedback.
> 
> On Mon, Sep 09, 2024 at 02:09:11PM +0200, Krzysztof Kozlowski wrote:
>> On 09/09/2024 13:49, Hiago De Franco wrote:
>>> diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl-apalis.dtsi
>>> index edf55760a5c1..1c72da417011 100644
>>> --- a/arch/arm/boot/dts/nxp/imx/imx6qdl-apalis.dtsi
>>> +++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-apalis.dtsi
>>> @@ -191,7 +191,7 @@ sound {
>>>  			"MIC_IN", "Mic Jack",
>>>  			"Mic Jack", "Mic Bias",
>>>  			"Headphone Jack", "HP_OUT";
>>> -		model = "imx6q-apalis-sgtl5000";
>>> +		model = "apalis-imx6";
>>
>> Doesn't this break all the users? E.g. ALSA UCM and whatever
>> user-space-parsing stuff you have?
> 
> I am not sure about "all" users, but for sure it's a breaking change.
> There is no ALSA UCM for this board (and also not for the other twos in
> this series), we just worked on it and we thought that if we want to do
> such a change the moment is now.
> 
> What should we do?

For me is enough to explain in commit msg such expected (or lack of it)
impact.

Best regards,
Krzysztof

[PATCH 2/3] ARM: dts: imx6qdl-colibri: Update audio card name

[Hiago De Franco]

From: Hiago De Franco <hiago.franco@toradex.com>

Update the audio card name for Colibri iMX6 to match its specific SoM
name, making it less than 15 characters to fix the following warning

fsl-asoc-card sound: ASoC: driver name too long
'imx6dl-colibri-sgtl5000' -> 'imx6dl-colibri-'

making it compliant with the ALSA configuration specification [1].

[1] Documentation/sound/alsa-configuration.rst

Signed-off-by: Hiago De Franco <hiago.franco@toradex.com>
---
 arch/arm/boot/dts/nxp/imx/imx6qdl-colibri.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl-colibri.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl-colibri.dtsi
index b01670cdd52c..9f33419c260b 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6qdl-colibri.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-colibri.dtsi
@@ -136,7 +136,7 @@ sound {
 			"LINE_IN", "Line In Jack",
 			"MIC_IN", "Mic Jack",
 			"Mic Jack", "Mic Bias";
-		model = "imx6dl-colibri-sgtl5000";
+		model = "colibri-imx6";
 		mux-int-port = <1>;
 		mux-ext-port = <5>;
 		ssi-controller = <&ssi1>;
-- 
2.39.2

[PATCH 3/3] ARM: dts: imx7-colibri: Update audio card name

[Hiago De Franco]

From: Hiago De Franco <hiago.franco@toradex.com>

Update the audio card name for Colibri iMX7 to match its specific SoM
name, making it compliant with the other names for Colibri iMX6 and
Apalis iMX6.

Signed-off-by: Hiago De Franco <hiago.franco@toradex.com>
---
 arch/arm/boot/dts/nxp/imx/imx7-colibri.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/nxp/imx/imx7-colibri.dtsi b/arch/arm/boot/dts/nxp/imx/imx7-colibri.dtsi
index 62e41edcaf1d..8666dcd7fe97 100644
--- a/arch/arm/boot/dts/nxp/imx/imx7-colibri.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx7-colibri.dtsi
@@ -120,7 +120,7 @@ sound {
 		simple-audio-card,bitclock-master = <&dailink_master>;
 		simple-audio-card,format = "i2s";
 		simple-audio-card,frame-master = <&dailink_master>;
-		simple-audio-card,name = "imx7-sgtl5000";
+		simple-audio-card,name = "colibri-imx7";
 
 		simple-audio-card,cpu {
 			sound-dai = <&sai1>;
-- 
2.39.2