From f182c7aeb81b77801e1992b7a972545734b34ee7 Mon Sep 17 00:00:00 2001 From: Daniel Baluta Date: Wed, 28 Apr 2021 18:18:05 +0300 Subject: [PATCH] LF-3763 arm64: dts: SOF: Use newly created names for default topologies Because i.MX8QXP/i.MX8QM are similar w.r.t audio peripherals configuration we currently use the following naming for topologies sof-imx8qxp-.tplg. Which is weird to see for i.MX8QM. In order to make naming more generic use imx8 instead of imx8qxp/imx8qm. Reviwed-by: Iuliana Prodan Signed-off-by: Daniel Baluta --- arch/arm64/boot/dts/freescale/imx8qm-mek-sof-cs42888.dts | 2 +- arch/arm64/boot/dts/freescale/imx8qm-mek-sof-wm8960.dts | 2 +- arch/arm64/boot/dts/freescale/imx8qxp-mek-sof-cs42888.dts | 2 +- arch/arm64/boot/dts/freescale/imx8qxp-mek-sof-wm8960.dts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/freescale/imx8qm-mek-sof-cs42888.dts b/arch/arm64/boot/dts/freescale/imx8qm-mek-sof-cs42888.dts index d55d28eb48a7..3771bd238cd9 100644 --- a/arch/arm64/boot/dts/freescale/imx8qm-mek-sof-cs42888.dts +++ b/arch/arm64/boot/dts/freescale/imx8qm-mek-sof-cs42888.dts @@ -122,7 +122,7 @@ <&lsio_mu13 3 0>, <&lsio_mu13 3 1>; - tplg-name = "sof-imx8qxp-cs42888.tplg"; + tplg-name = "sof-imx8-cs42888.tplg"; machine-drv-name = "asoc-simple-card"; status = "okay"; diff --git a/arch/arm64/boot/dts/freescale/imx8qm-mek-sof-wm8960.dts b/arch/arm64/boot/dts/freescale/imx8qm-mek-sof-wm8960.dts index f1a401f7548e..67463fb97ee3 100644 --- a/arch/arm64/boot/dts/freescale/imx8qm-mek-sof-wm8960.dts +++ b/arch/arm64/boot/dts/freescale/imx8qm-mek-sof-wm8960.dts @@ -120,7 +120,7 @@ <&lsio_mu13 3 0>, <&lsio_mu13 3 1>; - tplg-name = "sof-imx8qxp-wm8960.tplg"; + tplg-name = "sof-imx8-wm8960.tplg"; machine-drv-name = "asoc-simple-card"; status = "okay"; diff --git a/arch/arm64/boot/dts/freescale/imx8qxp-mek-sof-cs42888.dts b/arch/arm64/boot/dts/freescale/imx8qxp-mek-sof-cs42888.dts index b236b8fb79aa..77e8345abd96 100644 --- a/arch/arm64/boot/dts/freescale/imx8qxp-mek-sof-cs42888.dts +++ b/arch/arm64/boot/dts/freescale/imx8qxp-mek-sof-cs42888.dts @@ -116,7 +116,7 @@ assigned-clock-rates = <0>, <786432000>, <49152000>, <12288000>, <49152000>; reg = <0x596e8000 0x88000>; - tplg-name = "sof-imx8qxp-cs42888.tplg"; + tplg-name = "sof-imx8-cs42888.tplg"; machine-drv-name = "asoc-simple-card"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/freescale/imx8qxp-mek-sof-wm8960.dts b/arch/arm64/boot/dts/freescale/imx8qxp-mek-sof-wm8960.dts index 6aaedc3673f6..c8dad50ed98d 100644 --- a/arch/arm64/boot/dts/freescale/imx8qxp-mek-sof-wm8960.dts +++ b/arch/arm64/boot/dts/freescale/imx8qxp-mek-sof-wm8960.dts @@ -115,7 +115,7 @@ assigned-clock-parents = <&aud_pll_div0_lpcg 0>; assigned-clock-rates = <0>, <786432000>, <49152000>, <12288000>, <49152000>; - tplg-name = "sof-imx8qxp-wm8960.tplg"; + tplg-name = "sof-imx8-wm8960.tplg"; machine-drv-name = "asoc-simple-card"; status = "okay"; }; -- 2.17.1