[PATCH 0/4] Add SOF support for new board revisions

[PATCH 0/4] Add SOF support for new board revisions

[Daniel Baluta]

We introduce SOF support for new board revisions for i.MX8MP/QM/QXP
which wrt audio they replace wm8960 codec with wm8962.

Also add support for cs42888 codec on i.MX8QM/8QXP baseboard.

Patches 1-3 are already merged in linux SOF tree and they can be merged
via asoc tree.

Patch 4 documents the new compatible strings and can be merged via DT
tree or asoc.

Daniel Baluta (1):
  ASoC: SOF: imx: Add mach entry to select cs42888 topology

Iuliana Prodan (3):
  dt-bindings: arm: imx: Add board revisions for i.MX8MP, i.MX8QM and
    i.MX8QXP
  ASoC: SOF: imx8: Add entries for new 8QM and 8QXP revisions
  ASoC: SOF: imx8m: Add entry for new 8M Plus revision

 .../devicetree/bindings/arm/fsl.yaml          |  3 +++
 sound/soc/sof/imx/imx8.c                      | 21 +++++++++++++++++++
 sound/soc/sof/imx/imx8m.c                     |  5 +++++
 3 files changed, 29 insertions(+)

-- 
2.43.0

[PATCH 1/4] dt-bindings: arm: imx: Add board revisions for i.MX8MP, i.MX8QM and i.MX8QXP

[Daniel Baluta]

From: Iuliana Prodan <iuliana.prodan@nxp.com>

wm8960 codec is EOL so we have i.MX8MP EVK Rev B4,
i.MX8QM MEK Rev D and i.MX8QXP MEK WCPU boards with
wm8962 codec.
Therefore, add compatibles for them.

Signed-off-by: Iuliana Prodan <iuliana.prodan@nxp.com>
Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
---
 Documentation/devicetree/bindings/arm/fsl.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Documentation/devicetree/bindings/arm/fsl.yaml b/Documentation/devicetree/bindings/arm/fsl.yaml
index 6e0dcf4307f1..df26b6b26e8c 100644
--- a/Documentation/devicetree/bindings/arm/fsl.yaml
+++ b/Documentation/devicetree/bindings/arm/fsl.yaml
@@ -1091,6 +1091,7 @@ properties:
               - dmo,imx8mp-data-modul-edm-sbc # i.MX8MP eDM SBC
               - emcraft,imx8mp-navqp      # i.MX8MP Emcraft Systems NavQ+ Kit
               - fsl,imx8mp-evk            # i.MX8MP EVK Board
+              - fsl,imx8mp-evk-revb4      # i.MX8MP EVK Rev B4 Board
               - gateworks,imx8mp-gw71xx-2x # i.MX8MP Gateworks Board
               - gateworks,imx8mp-gw72xx-2x # i.MX8MP Gateworks Board
               - gateworks,imx8mp-gw73xx-2x # i.MX8MP Gateworks Board
@@ -1262,6 +1263,7 @@ properties:
         items:
           - enum:
               - fsl,imx8qm-mek           # i.MX8QM MEK Board
+              - fsl,imx8qm-mek-revd      # i.MX8QM MEK Rev D Board
               - toradex,apalis-imx8      # Apalis iMX8 Modules
               - toradex,apalis-imx8-v1.1 # Apalis iMX8 V1.1 Modules
           - const: fsl,imx8qm
@@ -1290,6 +1292,7 @@ properties:
           - enum:
               - einfochips,imx8qxp-ai_ml  # i.MX8QXP AI_ML Board
               - fsl,imx8qxp-mek           # i.MX8QXP MEK Board
+              - fsl,imx8qxp-mek-wcpu      # i.MX8QXP MEK WCPU Board
           - const: fsl,imx8qxp
 
       - description: i.MX8DXL based Boards
-- 
2.43.0

[PATCH 2/4] ASoC: SOF: imx: Add mach entry to select cs42888 topology

[Daniel Baluta]

After commit 2b9cdef13648 ("ASoC: SOF: imx: Add devicetree support
to select topologies") we select topology to be used by the board
compatible string in the dts.

Now that we have a way to know when the baseboard is installed, use
the board compatible and select proper topology files when the cs42888
Audio IO card is used.

Reviewed-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Liam Girdwood <liam.r.girdwood@intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Iuliana Prodan <iuliana.prodan@nxp.com>
Reviewed-by: Laurentiu Mihalcea <laurentiu.mihalcea@nxp.com>
Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
---
 sound/soc/sof/imx/imx8.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/sound/soc/sof/imx/imx8.c b/sound/soc/sof/imx/imx8.c
index 0b85b29d1067..d6117a3d4266 100644
--- a/sound/soc/sof/imx/imx8.c
+++ b/sound/soc/sof/imx/imx8.c
@@ -611,6 +611,17 @@ static struct snd_sof_of_mach sof_imx8_machs[] = {
 		.sof_tplg_filename = "sof-imx8-wm8960.tplg",
 		.drv_name = "asoc-audio-graph-card2",
 	},
+	{
+		.compatible = "fsl,imx8qxp-mek-bb",
+		.sof_tplg_filename = "sof-imx8-cs42888.tplg",
+		.drv_name = "asoc-audio-graph-card2",
+	},
+	{
+		.compatible = "fsl,imx8qm-mek-bb",
+		.sof_tplg_filename = "sof-imx8-cs42888.tplg",
+		.drv_name = "asoc-audio-graph-card2",
+	},
+
 	{}
 };
 
-- 
2.43.0

[PATCH 3/4] ASoC: SOF: imx8: Add entries for new 8QM and 8QXP revisions

[Daniel Baluta]

From: Iuliana Prodan <iuliana.prodan@nxp.com>

The new revisions for 8QM and 8QXP have wm8962 codec instead of wm8960.
Therefore add new entries in sof_imx8_machs, an array of snd_sof_of_mach,
where we describe topology name and driver name.
For the new revisions we have new compatible values and based on these,
we select the new topology file, for wm8962 codec.

Reviewed-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Liam Girdwood <liam.r.girdwood@intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Laurentiu Mihalcea <laurentiu.mihalcea@nxp.com>
Signed-off-by: Iuliana Prodan <iuliana.prodan@nxp.com>
Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
---
 sound/soc/sof/imx/imx8.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/sound/soc/sof/imx/imx8.c b/sound/soc/sof/imx/imx8.c
index d6117a3d4266..3b418114e8d5 100644
--- a/sound/soc/sof/imx/imx8.c
+++ b/sound/soc/sof/imx/imx8.c
@@ -606,11 +606,21 @@ static struct snd_sof_of_mach sof_imx8_machs[] = {
 		.sof_tplg_filename = "sof-imx8-wm8960.tplg",
 		.drv_name = "asoc-audio-graph-card2",
 	},
+	{
+		.compatible = "fsl,imx8qxp-mek-wcpu",
+		.sof_tplg_filename = "sof-imx8-wm8962.tplg",
+		.drv_name = "asoc-audio-graph-card2",
+	},
 	{
 		.compatible = "fsl,imx8qm-mek",
 		.sof_tplg_filename = "sof-imx8-wm8960.tplg",
 		.drv_name = "asoc-audio-graph-card2",
 	},
+	{
+		.compatible = "fsl,imx8qm-mek-revd",
+		.sof_tplg_filename = "sof-imx8-wm8962.tplg",
+		.drv_name = "asoc-audio-graph-card2",
+	},
 	{
 		.compatible = "fsl,imx8qxp-mek-bb",
 		.sof_tplg_filename = "sof-imx8-cs42888.tplg",
-- 
2.43.0

[PATCH 4/4] ASoC: SOF: imx8m: Add entry for new 8M Plus revision

[Daniel Baluta]

From: Iuliana Prodan <iuliana.prodan@nxp.com>

The new revision for 8M Plus has wm8962 codec instead of wm8960.
Therefore add new entry in sof_imx8mp_machs, an array of snd_sof_of_mach,
where we describe topology name and driver name.
For the new revision we have new compatible value and based on this,
we select the new topology file, for wm8962 codec.

Reviewed-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Liam Girdwood <liam.r.girdwood@intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Laurentiu Mihalcea <laurentiu.mihalcea@nxp.com>
Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
Signed-off-by: Iuliana Prodan <iuliana.prodan@nxp.com>
---
 sound/soc/sof/imx/imx8m.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/sound/soc/sof/imx/imx8m.c b/sound/soc/sof/imx/imx8m.c
index 4ab5814e9117..c63d64164e4b 100644
--- a/sound/soc/sof/imx/imx8m.c
+++ b/sound/soc/sof/imx/imx8m.c
@@ -515,6 +515,11 @@ static const struct snd_sof_dsp_ops sof_imx8m_ops = {
 };
 
 static struct snd_sof_of_mach sof_imx8mp_machs[] = {
+	{
+		.compatible = "fsl,imx8mp-evk-revb4",
+		.sof_tplg_filename = "sof-imx8mp-wm8962.tplg",
+		.drv_name = "asoc-audio-graph-card2",
+	},
 	{
 		.compatible = "fsl,imx8mp-evk",
 		.sof_tplg_filename = "sof-imx8mp-wm8960.tplg",
-- 
2.43.0

Re: [PATCH 2/4] ASoC: SOF: imx: Add mach entry to select cs42888 topology

[Frank Li]

On Wed, Jan 22, 2025 at 06:35:42PM +0200, Daniel Baluta wrote:
> After commit 2b9cdef13648 ("ASoC: SOF: imx: Add devicetree support
> to select topologies") we select topology to be used by the board
> compatible string in the dts.

I am confused. why not use "sof-imx8-cs42888.tplg" in imx8's dts instead
use board's compatible string "fsl,imx8qxp-mek-bb".

More and more boards will be added in future. This file will become bigger
and bigger!

Frank

>
> Now that we have a way to know when the baseboard is installed, use
> the board compatible and select proper topology files when the cs42888
> Audio IO card is used.
>
> Reviewed-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
> Reviewed-by: Liam Girdwood <liam.r.girdwood@intel.com>
> Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
> Reviewed-by: Iuliana Prodan <iuliana.prodan@nxp.com>
> Reviewed-by: Laurentiu Mihalcea <laurentiu.mihalcea@nxp.com>
> Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
> ---
>  sound/soc/sof/imx/imx8.c | 11 +++++++++++
>  1 file changed, 11 insertions(+)
>
> diff --git a/sound/soc/sof/imx/imx8.c b/sound/soc/sof/imx/imx8.c
> index 0b85b29d1067..d6117a3d4266 100644
> --- a/sound/soc/sof/imx/imx8.c
> +++ b/sound/soc/sof/imx/imx8.c
> @@ -611,6 +611,17 @@ static struct snd_sof_of_mach sof_imx8_machs[] = {
>  		.sof_tplg_filename = "sof-imx8-wm8960.tplg",
>  		.drv_name = "asoc-audio-graph-card2",
>  	},
> +	{
> +		.compatible = "fsl,imx8qxp-mek-bb",
> +		.sof_tplg_filename = "sof-imx8-cs42888.tplg",
> +		.drv_name = "asoc-audio-graph-card2",
> +	},
> +	{
> +		.compatible = "fsl,imx8qm-mek-bb",
> +		.sof_tplg_filename = "sof-imx8-cs42888.tplg",
> +		.drv_name = "asoc-audio-graph-card2",
> +	},
> +
>  	{}
>  };
>
> --
> 2.43.0
>

Re: [PATCH 2/4] ASoC: SOF: imx: Add mach entry to select cs42888 topology

[Daniel Baluta]

On Wed, Jan 22, 2025 at 9:55 PM Frank Li <Frank.li@nxp.com> wrote:
>
> On Wed, Jan 22, 2025 at 06:35:42PM +0200, Daniel Baluta wrote:
> > After commit 2b9cdef13648 ("ASoC: SOF: imx: Add devicetree support
> > to select topologies") we select topology to be used by the board
> > compatible string in the dts.
>
> I am confused. why not use "sof-imx8-cs42888.tplg" in imx8's dts instead
> use board's compatible string "fsl,imx8qxp-mek-bb".
>
> More and more boards will be added in future. This file will become bigger
> and bigger!

Hi Frank,

So you mean create a dts property named e.g sof-tplg-name and read the
topology name from dts?

dsp {
       firmware-name="sof-imx8.ri";
       tplg-name = "sof-imx8-cs428888.tplg";
};


This was our first approach but then we aligned with the community on
using compatible to match
for properties like default fw path, default tplg path, fw name, tplg name.

Now dts should somehow describe the hardware not the software (e.g
tplg binary) used on that platform.
The growing number of boards will not be a problem, each one will have
a compatible in the dts.

But the concern here is how we describe a hardware setup where we have
a CPU board + a baseboard
like it is the case for cs42888 codec?

Our approach was that in our dts or overlay dts that describes SOF
with cs428888 codec to put the exact
compatible "fsl,imx8qxp-mek-bb" and match it with static vector in SOF
driver that you see in this patch.

SOF core relies on the compatible string in order to identify the
correct tplg_filename for example.

thanks,
Daniel.

Re: [PATCH 2/4] ASoC: SOF: imx: Add mach entry to select cs42888 topology

[Frank Li]

On Thu, Jan 23, 2025 at 11:38:33AM +0200, Daniel Baluta wrote:
> On Wed, Jan 22, 2025 at 9:55 PM Frank Li <Frank.li@nxp.com> wrote:
> >
> > On Wed, Jan 22, 2025 at 06:35:42PM +0200, Daniel Baluta wrote:
> > > After commit 2b9cdef13648 ("ASoC: SOF: imx: Add devicetree support
> > > to select topologies") we select topology to be used by the board
> > > compatible string in the dts.
> >
> > I am confused. why not use "sof-imx8-cs42888.tplg" in imx8's dts instead
> > use board's compatible string "fsl,imx8qxp-mek-bb".
> >
> > More and more boards will be added in future. This file will become bigger
> > and bigger!
>
> Hi Frank,
>
> So you mean create a dts property named e.g sof-tplg-name and read the
> topology name from dts?
>
> dsp {
>        firmware-name="sof-imx8.ri";
>        tplg-name = "sof-imx8-cs428888.tplg";
> };

  dsp {
	compatible = "imx8-dsp-xxxx";
	...
  }

in dsp driver, map "imx8-dsp-xxxx" to "sof-imx8-cs428888.tplg" and
"sof-imx8.ri".

>
>
> This was our first approach but then we aligned with the community on
> using compatible to match
> for properties like default fw path, default tplg path, fw name, tplg name.

What's origial email thread. I think "compatible" refer to dsp node, not
to boards level compatible string.

>
> Now dts should somehow describe the hardware not the software (e.g
> tplg binary) used on that platform.
> The growing number of boards will not be a problem, each one will have
> a compatible in the dts.

Yes, but your C files will fill up meansless map code when more board
added.


>
> But the concern here is how we describe a hardware setup where we have
> a CPU board + a baseboard
> like it is the case for cs42888 codec?
>
> Our approach was that in our dts or overlay dts that describes SOF
> with cs428888 codec to put the exact
> compatible "fsl,imx8qxp-mek-bb" and match it with static vector in SOF
> driver that you see in this patch.
>
> SOF core relies on the compatible string in order to identify the
> correct tplg_filename for example.

Any application ctrl tools can link these nodes?

Frank

>
> thanks,
> Daniel.

Re: [PATCH 0/4] Add SOF support for new board revisions

[Mark Brown]

On Wed, 22 Jan 2025 18:35:40 +0200, Daniel Baluta wrote:
> We introduce SOF support for new board revisions for i.MX8MP/QM/QXP
> which wrt audio they replace wm8960 codec with wm8962.
> 
> Also add support for cs42888 codec on i.MX8QM/8QXP baseboard.
> 
> Patches 1-3 are already merged in linux SOF tree and they can be merged
> via asoc tree.
> 
> [...]

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/4] dt-bindings: arm: imx: Add board revisions for i.MX8MP, i.MX8QM and i.MX8QXP
      commit: 4b24c69af9cd5bd8fe98ab2ddd822d73f5e20a00
[2/4] ASoC: SOF: imx: Add mach entry to select cs42888 topology
      commit: 66084793fac9c8b841f65da1809ad0ad398f9f2f
[3/4] ASoC: SOF: imx8: Add entries for new 8QM and 8QXP revisions
      commit: a9f54c7fbd2edb28c8d4d812be3d0129167f92d4
[4/4] ASoC: SOF: imx8m: Add entry for new 8M Plus revision
      commit: af65d7d041d486cc55530e14d806e16143037962

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark

Re: [PATCH 1/4] dt-bindings: arm: imx: Add board revisions for i.MX8MP, i.MX8QM and i.MX8QXP

[Krzysztof Kozlowski]

On Wed, Jan 22, 2025 at 06:35:41PM +0200, Daniel Baluta wrote:
> From: Iuliana Prodan <iuliana.prodan@nxp.com>
> 
> wm8960 codec is EOL so we have i.MX8MP EVK Rev B4,
> i.MX8QM MEK Rev D and i.MX8QXP MEK WCPU boards with
> wm8962 codec.
> Therefore, add compatibles for them.

Please wrap commit message according to Linux coding style / submission
process (neither too early nor over the limit):
https://elixir.bootlin.com/linux/v6.4-rc1/source/Documentation/process/submitting-patches.rst#L597

> 
> Signed-off-by: Iuliana Prodan <iuliana.prodan@nxp.com>
> Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
> ---
>  Documentation/devicetree/bindings/arm/fsl.yaml | 3 +++
>  1 file changed, 3 insertions(+)

Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

Best regards,
Krzysztof