ASoC: stm32: i2s: fix IRQ clearing

[linux.git] / sound / soc / stm / stm32_i2s.c

diff --git a/sound/soc/stm/stm32_i2s.c b/sound/soc/stm/stm32_i2s.c
index 6d0bf78d114d0da74f5b61f5c576c12483d562d9..339cd4715b2ebf4c81a9b517e65e16b149967235 100644 (file)
--- a/sound/soc/stm/stm32_i2s.c
+++ b/sound/soc/stm/stm32_i2s.c
@@ -186,8 +186,9 @@ enum i2s_datlen {
 #define STM32_I2S_IS_SLAVE(x)          ((x)->ms_flg == I2S_MS_SLAVE)
 
 /**
+ * struct stm32_i2s_data - private data of I2S
  * @regmap_conf: I2S register map configuration pointer
- * @egmap: I2S register map pointer
+ * @regmap: I2S register map pointer
  * @pdev: device data pointer
  * @dai_drv: DAI driver pointer
  * @dma_data_tx: dma configuration data for tx channel
@@ -246,8 +247,8 @@ static irqreturn_t stm32_i2s_isr(int irq, void *devid)
                return IRQ_NONE;
        }
 
-       regmap_update_bits(i2s->regmap, STM32_I2S_IFCR_REG,
-                          I2S_IFCR_MASK, flags);
+       regmap_write_bits(i2s->regmap, STM32_I2S_IFCR_REG,
+                         I2S_IFCR_MASK, flags);
 
        if (flags & I2S_SR_OVR) {
                dev_dbg(&pdev->dev, "Overrun\n");
@@ -276,7 +277,6 @@ static bool stm32_i2s_readable_reg(struct device *dev, unsigned int reg)
        case STM32_I2S_CFG2_REG:
        case STM32_I2S_IER_REG:
        case STM32_I2S_SR_REG:
-       case STM32_I2S_IFCR_REG:
        case STM32_I2S_TXDR_REG:
        case STM32_I2S_RXDR_REG:
        case STM32_I2S_CGFR_REG:
@@ -544,15 +544,22 @@ static int stm32_i2s_startup(struct snd_pcm_substream *substream,
                             struct snd_soc_dai *cpu_dai)
 {
        struct stm32_i2s_data *i2s = snd_soc_dai_get_drvdata(cpu_dai);
+       int ret;
 
        i2s->substream = substream;
 
+       ret = clk_prepare_enable(i2s->i2sclk);
+       if (ret < 0) {
+               dev_err(cpu_dai->dev, "Failed to enable clock: %d\n", ret);
+               return ret;
+       }
+
        spin_lock(&i2s->lock_fd);
        i2s->refcount++;
        spin_unlock(&i2s->lock_fd);
 
-       return regmap_update_bits(i2s->regmap, STM32_I2S_IFCR_REG,
-                                 I2S_IFCR_MASK, I2S_IFCR_MASK);
+       return regmap_write_bits(i2s->regmap, STM32_I2S_IFCR_REG,
+                                I2S_IFCR_MASK, I2S_IFCR_MASK);
 }
 
 static int stm32_i2s_hw_params(struct snd_pcm_substream *substream,
@@ -596,15 +603,15 @@ static int stm32_i2s_trigger(struct snd_pcm_substream *substream, int cmd,
                        return ret;
                }
 
-               ret = regmap_update_bits(i2s->regmap, STM32_I2S_CR1_REG,
-                                        I2S_CR1_CSTART, I2S_CR1_CSTART);
+               ret = regmap_write_bits(i2s->regmap, STM32_I2S_CR1_REG,
+                                       I2S_CR1_CSTART, I2S_CR1_CSTART);
                if (ret < 0) {
                        dev_err(cpu_dai->dev, "Error %d starting I2S\n", ret);
                        return ret;
                }
 
-               regmap_update_bits(i2s->regmap, STM32_I2S_IFCR_REG,
-                                  I2S_IFCR_MASK, I2S_IFCR_MASK);
+               regmap_write_bits(i2s->regmap, STM32_I2S_IFCR_REG,
+                                 I2S_IFCR_MASK, I2S_IFCR_MASK);
 
                if (playback_flg) {
                        ier = I2S_IER_UDRIE;
@@ -673,6 +680,8 @@ static void stm32_i2s_shutdown(struct snd_pcm_substream *substream,
 
        regmap_update_bits(i2s->regmap, STM32_I2S_CGFR_REG,
                           I2S_CGFR_MCKOE, (unsigned int)~I2S_CGFR_MCKOE);
+
+       clk_disable_unprepare(i2s->i2sclk);
 }
 
 static int stm32_i2s_dai_probe(struct snd_soc_dai *cpu_dai)
@@ -703,6 +712,7 @@ static const struct regmap_config stm32_h7_i2s_regmap_conf = {
        .volatile_reg = stm32_i2s_volatile_reg,
        .writeable_reg = stm32_i2s_writeable_reg,
        .fast_io = true,
+       .cache_type = REGCACHE_FLAT,
 };
 
 static const struct snd_soc_dai_ops stm32_i2s_pcm_dai_ops = {
@@ -872,49 +882,26 @@ static int stm32_i2s_probe(struct platform_device *pdev)
        if (ret)
                return ret;
 
-       i2s->regmap = devm_regmap_init_mmio(&pdev->dev, i2s->base,
-                                           i2s->regmap_conf);
+       i2s->regmap = devm_regmap_init_mmio_clk(&pdev->dev, "pclk",
+                                               i2s->base, i2s->regmap_conf);
        if (IS_ERR(i2s->regmap)) {
                dev_err(&pdev->dev, "regmap init failed\n");
                return PTR_ERR(i2s->regmap);
        }
 
-       ret = clk_prepare_enable(i2s->pclk);
-       if (ret) {
-               dev_err(&pdev->dev, "Enable pclk failed: %d\n", ret);
-               return ret;
-       }
-
-       ret = clk_prepare_enable(i2s->i2sclk);
-       if (ret) {
-               dev_err(&pdev->dev, "Enable i2sclk failed: %d\n", ret);
-               goto err_pclk_disable;
-       }
-
        ret = devm_snd_soc_register_component(&pdev->dev, &stm32_i2s_component,
                                              i2s->dai_drv, 1);
        if (ret)
-               goto err_clocks_disable;
+               return ret;
 
        ret = devm_snd_dmaengine_pcm_register(&pdev->dev,
                                              &stm32_i2s_pcm_config, 0);
        if (ret)
-               goto err_clocks_disable;
+               return ret;
 
        /* Set SPI/I2S in i2s mode */
-       ret = regmap_update_bits(i2s->regmap, STM32_I2S_CGFR_REG,
-                                I2S_CGFR_I2SMOD, I2S_CGFR_I2SMOD);
-       if (ret)
-               goto err_clocks_disable;
-
-       return ret;
-
-err_clocks_disable:
-       clk_disable_unprepare(i2s->i2sclk);
-err_pclk_disable:
-       clk_disable_unprepare(i2s->pclk);
-
-       return ret;
+       return regmap_update_bits(i2s->regmap, STM32_I2S_CGFR_REG,
+                                 I2S_CGFR_I2SMOD, I2S_CGFR_I2SMOD);
 }
 
 static int stm32_i2s_remove(struct platform_device *pdev)
@@ -929,10 +916,35 @@ static int stm32_i2s_remove(struct platform_device *pdev)
 
 MODULE_DEVICE_TABLE(of, stm32_i2s_ids);
 
+#ifdef CONFIG_PM_SLEEP
+static int stm32_i2s_suspend(struct device *dev)
+{
+       struct stm32_i2s_data *i2s = dev_get_drvdata(dev);
+
+       regcache_cache_only(i2s->regmap, true);
+       regcache_mark_dirty(i2s->regmap);
+
+       return 0;
+}
+
+static int stm32_i2s_resume(struct device *dev)
+{
+       struct stm32_i2s_data *i2s = dev_get_drvdata(dev);
+
+       regcache_cache_only(i2s->regmap, false);
+       return regcache_sync(i2s->regmap);
+}
+#endif /* CONFIG_PM_SLEEP */
+
+static const struct dev_pm_ops stm32_i2s_pm_ops = {
+       SET_SYSTEM_SLEEP_PM_OPS(stm32_i2s_suspend, stm32_i2s_resume)
+};
+
 static struct platform_driver stm32_i2s_driver = {
        .driver = {
                .name = "st,stm32-i2s",
                .of_match_table = stm32_i2s_ids,
+               .pm = &stm32_i2s_pm_ops,
        },
        .probe = stm32_i2s_probe,
        .remove = stm32_i2s_remove,