From 0bc59849c4b20ba7ae7526935af48123827e1655 Mon Sep 17 00:00:00 2001 From: Shengjiu Wang Date: Mon, 30 Mar 2020 14:30:59 +0800 Subject: [PATCH] MLK-23702-2: ASoC: imx-pcm-rpmsg: Don't register codec driver if it is from DT Don't register codec driver if it is from DT. Signed-off-by: Shengjiu Wang Reviewed-by: Viorel Suman --- sound/soc/fsl/imx-pcm-rpmsg.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/soc/fsl/imx-pcm-rpmsg.c b/sound/soc/fsl/imx-pcm-rpmsg.c index 8da1345ccd06..0e70e1d2c253 100644 --- a/sound/soc/fsl/imx-pcm-rpmsg.c +++ b/sound/soc/fsl/imx-pcm-rpmsg.c @@ -806,6 +806,9 @@ static int i2s_rpmsg_probe(struct rpmsg_device *rpdev) rpmsg_i2s = container_of(i2s_info_g, struct fsl_rpmsg_i2s, i2s_info); + if (rpmsg_i2s->codec_in_dt) + return 0; + if (rpmsg_i2s->codec_wm8960) { rpmsg_codec[0].audioindex = rpmsg_i2s->codec_wm8960 >> 16; rpmsg_codec[0].shared_lrclk = true;