From e84beda66942fe2a88f2c020d02803ae1de935fd Mon Sep 17 00:00:00 2001 From: Daniel Baluta Date: Wed, 29 Jan 2020 18:36:40 +0200 Subject: [PATCH] arch: arm64: Use corect property to set card name simple-audio-card uses 'label' property to set the correct card name. We were using 'model' because that name was used by non-SOF drivers. Signed-off-by: Daniel Baluta --- arch/arm64/boot/dts/freescale/imx8qm-mek-sof-cs42888.dts | 2 +- arch/arm64/boot/dts/freescale/imx8qxp-mek-sof-cs42888.dts | 2 +- arch/arm64/boot/dts/freescale/imx8qxp-mek-sof-wm8960.dts | 2 +- 3 files changed, 3 insertions(+), 3 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 1ff3d688636f..98f076ed5639 100644 --- a/arch/arm64/boot/dts/freescale/imx8qm-mek-sof-cs42888.dts +++ b/arch/arm64/boot/dts/freescale/imx8qm-mek-sof-cs42888.dts @@ -42,7 +42,7 @@ sof-audio-cs42888 { compatible = "simple-audio-card"; - model = "imx-cs42888"; + label = "imx-cs42888"; simple-audio-card,widgets = "Line", "Line Out Jack", "Line", "Line In Jack"; 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 9f589d1aab66..3ec96623081a 100644 --- a/arch/arm64/boot/dts/freescale/imx8qxp-mek-sof-cs42888.dts +++ b/arch/arm64/boot/dts/freescale/imx8qxp-mek-sof-cs42888.dts @@ -42,7 +42,7 @@ sof-audio-cs42888 { compatible = "simple-audio-card"; - model = "imx-cs42888"; + label = "imx-cs42888"; simple-audio-card,widgets = "Line", "Line Out Jack", "Line", "Line In Jack"; 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 e1939cb71ae3..091f962d5a5d 100644 --- a/arch/arm64/boot/dts/freescale/imx8qxp-mek-sof-wm8960.dts +++ b/arch/arm64/boot/dts/freescale/imx8qxp-mek-sof-wm8960.dts @@ -42,7 +42,7 @@ sof-sound-wm8960 { compatible = "simple-audio-card"; - model = "wm8960-audio"; + label = "wm8960-audio"; simple-audio-card,bitclock-master = <&sndcodec>; simple-audio-card,frame-master = <&sndcodec>; hp-det-gpio = <&lsio_gpio1 0 0>; -- 2.17.1