Skip to content

Commit

Permalink
Add SOF support for new board revisions
Browse files Browse the repository at this point in the history
Merge series from Daniel Baluta <daniel.baluta@nxp.com>:

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.
  • Loading branch information
broonie committed Jan 23, 2025
2 parents 6917192 + af65d7d commit 9a0bad4
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 0 deletions.
3 changes: 3 additions & 0 deletions Documentation/devicetree/bindings/arm/fsl.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
21 changes: 21 additions & 0 deletions sound/soc/sof/imx/imx8.c
Original file line number Diff line number Diff line change
Expand Up @@ -605,11 +605,32 @@ 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",
.drv_name = "asoc-audio-graph-card2",
},
{
.compatible = "fsl,imx8qm-mek-bb",
.sof_tplg_filename = "sof-imx8-cs42888.tplg",
.drv_name = "asoc-audio-graph-card2",
},

{}
};

Expand Down
5 changes: 5 additions & 0 deletions sound/soc/sof/imx/imx8m.c
Original file line number Diff line number Diff line change
Expand Up @@ -514,6 +514,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",
Expand Down

0 comments on commit 9a0bad4

Please sign in to comment.