From 77be7d36a525c9032e1234543ea35b6a75815975 Mon Sep 17 00:00:00 2001 From: Shengjiu Wang Date: Wed, 7 Aug 2019 10:56:52 +0800 Subject: [PATCH] MLK-22400-1: ASoC: fsl_rpmsg_i2s: Add rpmsg i2s for imx8mn The rpmsg i2s audio is supported with codec wm8524 in imx8mn Signed-off-by: Shengjiu Wang (cherry picked from commit 68ad8218321cec6006acdb3df846da8bc6994792) --- .../devicetree/bindings/sound/fsl,rpmsg-i2s.txt | 2 +- sound/soc/fsl/fsl_rpmsg_i2s.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/sound/fsl,rpmsg-i2s.txt b/Documentation/devicetree/bindings/sound/fsl,rpmsg-i2s.txt index 27de48eb2519..77e73d355fd4 100644 --- a/Documentation/devicetree/bindings/sound/fsl,rpmsg-i2s.txt +++ b/Documentation/devicetree/bindings/sound/fsl,rpmsg-i2s.txt @@ -8,7 +8,7 @@ Required properties: - compatible : Compatible list, contains "fsl,imx7ulp-rpmsg-i2s". "fsl,imx8mq-rpmsg-i2s", "fsl,imx8qxp-rpmsg-i2s" - "fsl,imx8qm-rpmsg-i2s" + "fsl,imx8qm-rpmsg-i2s", "fsl,imx8mn-rpmsg-i2s" - fsl,audioindex : This is an index indicating the audio device index in the M4 side. diff --git a/sound/soc/fsl/fsl_rpmsg_i2s.c b/sound/soc/fsl/fsl_rpmsg_i2s.c index 0beb67c7b49e..4ba151186681 100644 --- a/sound/soc/fsl/fsl_rpmsg_i2s.c +++ b/sound/soc/fsl/fsl_rpmsg_i2s.c @@ -155,6 +155,7 @@ static const struct of_device_id fsl_rpmsg_i2s_ids[] = { { .compatible = "fsl,imx8mq-rpmsg-i2s"}, { .compatible = "fsl,imx8qxp-rpmsg-i2s"}, { .compatible = "fsl,imx8qm-rpmsg-i2s"}, + { .compatible = "fsl,imx8mn-rpmsg-i2s"}, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, fsl_rpmsg_i2s_ids); @@ -296,6 +297,21 @@ static int fsl_rpmsg_i2s_probe(struct platform_device *pdev) fsl_rpmsg_i2s_dai.capture.formats = rpmsg_i2s->formats; } + if (of_device_is_compatible(pdev->dev.of_node, + "fsl,imx8mn-rpmsg-i2s")) { + rpmsg_i2s->codec_dummy = 1; + rpmsg_i2s->version = 2; + rpmsg_i2s->rates = SNDRV_PCM_RATE_KNOT; + rpmsg_i2s->formats = SNDRV_PCM_FMTBIT_S16_LE | + SNDRV_PCM_FMTBIT_S24_LE | + SNDRV_PCM_FMTBIT_S32_LE; + + fsl_rpmsg_i2s_dai.playback.rates = rpmsg_i2s->rates; + fsl_rpmsg_i2s_dai.playback.formats = rpmsg_i2s->formats; + fsl_rpmsg_i2s_dai.capture.rates = rpmsg_i2s->rates; + fsl_rpmsg_i2s_dai.capture.formats = rpmsg_i2s->formats; + } + if (of_property_read_bool(pdev->dev.of_node, "fsl,enable-lpa")) rpmsg_i2s->enable_lpa = 1; -- 2.17.1