ASoC: renesas: msiof: use reset controller

[ Upstream commit 25226abc1affd4bf4f6dd415d475b76e7a273fa8 ]

MSIOF has TXRST/RXRST to reset FIFO, but it shouldn't be used during SYNC
signal was asserted, because it will be cause of HW issue.

When MSIOF is used as Sound driver, this driver is assuming it is used as
clock consumer mode (= Codec is clock provider). This means, it can't
control SYNC signal by itself.

We need to use SW reset (= reset_control_xxx()) instead of TXRST/RXRST.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tested-by: Yusuke Goda <yusuke.goda.sx@renesas.com>
Link: https://patch.msgid.link/87cy7fyuug.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/sound/soc/renesas/rcar/msiof.c b/sound/soc/renesas/rcar/msiof.c
index 7a9ecc73231a86e12f0c70809824ff8d9236739f..3a1a6496637dde124187a17df56357238e688e16 100644 (file)
--- a/sound/soc/renesas/rcar/msiof.c
+++ b/sound/soc/renesas/rcar/msiof.c
@@ -24,12 +24,25 @@
  * Clock/Frame Consumer Mode.
  */
 
+/*
+ * [NOTE-RESET]
+ *
+ * MSIOF has TXRST/RXRST to reset FIFO, but it shouldn't be used during SYNC signal was asserted,
+ * because it will be cause of HW issue.
+ *
+ * When MSIOF is used as Sound driver, this driver is assuming it is used as clock consumer mode
+ * (= Codec is clock provider). This means, it can't control SYNC signal by itself.
+ *
+ * We need to use SW reset (= reset_control_xxx()) instead of TXRST/RXRST.
+ */
+
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/of_dma.h>
 #include <linux/of_graph.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
+#include <linux/reset.h>
 #include <linux/spi/sh_msiof.h>
 #include <sound/dmaengine_pcm.h>
 #include <sound/soc.h>
@@ -61,10 +74,13 @@
 struct msiof_priv {
        struct device *dev;
        struct snd_pcm_substream *substream[SNDRV_PCM_STREAM_LAST + 1];
+       struct reset_control *reset;
        spinlock_t lock;
        void __iomem *base;
        resource_size_t phy_addr;
 
+       int count;
+
        /* for error */
        int err_syc[SNDRV_PCM_STREAM_LAST + 1];
        int err_ovf[SNDRV_PCM_STREAM_LAST + 1];
@@ -126,6 +142,16 @@ static int msiof_hw_start(struct snd_soc_component *component,
         *      RX: Fig 109.15
         */
 
+       /*
+        * Use reset_control_xx() instead of TXRST/RXRST.
+        * see
+        *      [NOTE-RESET]
+        */
+       if (!priv->count)
+               reset_control_deassert(priv->reset);
+
+       priv->count++;
+
        /* reset errors */
        priv->err_syc[substream->stream] =
        priv->err_ovf[substream->stream] =
@@ -144,7 +170,6 @@ static int msiof_hw_start(struct snd_soc_component *component,
                val = FIELD_PREP(SIMDR2_BITLEN1, width - 1);
                msiof_write(priv, SITMDR2, val | FIELD_PREP(SIMDR2_GRP, 1));
                msiof_write(priv, SITMDR3, val);
-
        }
        /* SIRMDRx */
        else {
@@ -217,6 +242,11 @@ static int msiof_hw_stop(struct snd_soc_component *component,
                         priv->err_ovf[substream->stream],
                         priv->err_udf[substream->stream]);
 
+       priv->count--;
+
+       if (!priv->count)
+               reset_control_assert(priv->reset);
+
        return 0;
 }
 
@@ -493,12 +523,19 @@ static int msiof_probe(struct platform_device *pdev)
        if (IS_ERR(priv->base))
                return PTR_ERR(priv->base);
 
+       priv->reset = devm_reset_control_get_exclusive(dev, NULL);
+       if (IS_ERR(priv->reset))
+               return PTR_ERR(priv->reset);
+
+       reset_control_assert(priv->reset);
+
        ret = devm_request_irq(dev, irq, msiof_interrupt, 0, dev_name(dev), priv);
        if (ret)
                return ret;
 
        priv->dev       = dev;
        priv->phy_addr  = res->start;
+       priv->count     = 0;
 
        spin_lock_init(&priv->lock);
        platform_set_drvdata(pdev, priv);