Merge tag 'asoc-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next

ASoC: Updates for v4.5

This is quite a busy release on the driver front with a lot of new
drivers being added but comparatively quiet on the core side with only
one big change going in and that a fairly straightforward refactoring.

 - Conversion of the array of DAI links to a list by Mengdong Lin,
   supporting dynamically adding and removing DAI links.
 - Some more fixes for the topology code, though it is still not final
   and ready for enabling in production.  We really need to get to the
   point where that can be done.
 - A pile of changes for Intel SkyLake drivers which hopefully deliver
   some useful initial functionality for systems with this chipset,
   though there is more work still to come.
 - New drivers for a number of Imagination Technologies IPs.
 - Lots of new features and cleanups for the Renesas drivers.
 - ANC support for WM5110.
 - New driver for Atmel class D speaker drivers.
 - New drivers for Cirrus CS47L24 and WM1831.
 - New driver for Dialog DA7128.
 - New drivers for Realtek RT5659 and RT56156.
 - New driver for Rockchip RK3036.
 - New driver for TI PC3168A

1 files changed, 82 insertions, 31 deletions

diff --git a/sound/soc/dwc/designware_i2s.c b/sound/soc/dwc/designware_i2s.c
index 6e6a70c5c2bd..825a1f480aab 100644
--- a/sound/soc/dwc/designware_i2s.c
+++ b/sound/soc/dwc/designware_i2s.c
@@ -18,6 +18,7 @@
 #include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/slab.h>
+#include <linux/pm_runtime.h>
 #include <sound/designware_i2s.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
@@ -93,7 +94,12 @@ struct dw_i2s_dev {
         struct clk *clk;
         int active;
         unsigned int capability;
+        unsigned int quirks;
+        unsigned int i2s_reg_comp1;
+        unsigned int i2s_reg_comp2;
         struct device *dev;
+        u32 ccr;
+        u32 xfer_resolution;
 
         /* data related to DMA transfers b/w i2s and DMAC */
         union dw_i2s_snd_dma_data play_dma_data;
@@ -213,31 +219,58 @@ static int dw_i2s_startup(struct snd_pcm_substream *substream,
         return 0;
 }
 
+static void dw_i2s_config(struct dw_i2s_dev *dev, int stream)
+{
+        u32 ch_reg, irq;
+        struct i2s_clk_config_data *config = &dev->config;
+
+
+        i2s_disable_channels(dev, stream);
+
+        for (ch_reg = 0; ch_reg < (config->chan_nr / 2); ch_reg++) {
+                if (stream == SNDRV_PCM_STREAM_PLAYBACK) {
+                        i2s_write_reg(dev->i2s_base, TCR(ch_reg),
+                                      dev->xfer_resolution);
+                        i2s_write_reg(dev->i2s_base, TFCR(ch_reg), 0x02);
+                        irq = i2s_read_reg(dev->i2s_base, IMR(ch_reg));
+                        i2s_write_reg(dev->i2s_base, IMR(ch_reg), irq & ~0x30);
+                        i2s_write_reg(dev->i2s_base, TER(ch_reg), 1);
+                } else {
+                        i2s_write_reg(dev->i2s_base, RCR(ch_reg),
+                                      dev->xfer_resolution);
+                        i2s_write_reg(dev->i2s_base, RFCR(ch_reg), 0x07);
+                        irq = i2s_read_reg(dev->i2s_base, IMR(ch_reg));
+                        i2s_write_reg(dev->i2s_base, IMR(ch_reg), irq & ~0x03);
+                        i2s_write_reg(dev->i2s_base, RER(ch_reg), 1);
+                }
+
+        }
+}
+
 static int dw_i2s_hw_params(struct snd_pcm_substream *substream,
                 struct snd_pcm_hw_params *params, struct snd_soc_dai *dai)
 {
         struct dw_i2s_dev *dev = snd_soc_dai_get_drvdata(dai);
         struct i2s_clk_config_data *config = &dev->config;
-        u32 ccr, xfer_resolution, ch_reg, irq;
         int ret;
 
         switch (params_format(params)) {
         case SNDRV_PCM_FORMAT_S16_LE:
                 config->data_width = 16;
-                ccr = 0x00;
-                xfer_resolution = 0x02;
+                dev->ccr = 0x00;
+                dev->xfer_resolution = 0x02;
                 break;
 
         case SNDRV_PCM_FORMAT_S24_LE:
                 config->data_width = 24;
-                ccr = 0x08;
-                xfer_resolution = 0x04;
+                dev->ccr = 0x08;
+                dev->xfer_resolution = 0x04;
                 break;
 
         case SNDRV_PCM_FORMAT_S32_LE:
                 config->data_width = 32;
-                ccr = 0x10;
-                xfer_resolution = 0x05;
+                dev->ccr = 0x10;
+                dev->xfer_resolution = 0x05;
                 break;
 
         default:
@@ -258,27 +291,9 @@ static int dw_i2s_hw_params(struct snd_pcm_substream *substream,
                 return -EINVAL;
         }
 
-        i2s_disable_channels(dev, substream->stream);
+        dw_i2s_config(dev, substream->stream);
 
-        for (ch_reg = 0; ch_reg < (config->chan_nr / 2); ch_reg++) {
-                if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
-                        i2s_write_reg(dev->i2s_base, TCR(ch_reg),
-                                      xfer_resolution);
-                        i2s_write_reg(dev->i2s_base, TFCR(ch_reg), 0x02);
-                        irq = i2s_read_reg(dev->i2s_base, IMR(ch_reg));
-                        i2s_write_reg(dev->i2s_base, IMR(ch_reg), irq & ~0x30);
-                        i2s_write_reg(dev->i2s_base, TER(ch_reg), 1);
-                } else {
-                        i2s_write_reg(dev->i2s_base, RCR(ch_reg),
-                                      xfer_resolution);
-                        i2s_write_reg(dev->i2s_base, RFCR(ch_reg), 0x07);
-                        irq = i2s_read_reg(dev->i2s_base, IMR(ch_reg));
-                        i2s_write_reg(dev->i2s_base, IMR(ch_reg), irq & ~0x03);
-                        i2s_write_reg(dev->i2s_base, RER(ch_reg), 1);
-                }
-        }
-
-        i2s_write_reg(dev->i2s_base, CCR, ccr);
+        i2s_write_reg(dev->i2s_base, CCR, dev->ccr);
 
         config->sample_rate = params_rate(params);
 
@@ -394,6 +409,23 @@ static const struct snd_soc_component_driver dw_i2s_component = {
 };
 
 #ifdef CONFIG_PM
+static int dw_i2s_runtime_suspend(struct device *dev)
+{
+        struct dw_i2s_dev *dw_dev = dev_get_drvdata(dev);
+
+        if (dw_dev->capability & DW_I2S_MASTER)
+                clk_disable(dw_dev->clk);
+        return 0;
+}
+
+static int dw_i2s_runtime_resume(struct device *dev)
+{
+        struct dw_i2s_dev *dw_dev = dev_get_drvdata(dev);
+
+        if (dw_dev->capability & DW_I2S_MASTER)
+                clk_enable(dw_dev->clk);
+        return 0;
+}
 
 static int dw_i2s_suspend(struct snd_soc_dai *dai)
 {
@@ -410,6 +442,11 @@ static int dw_i2s_resume(struct snd_soc_dai *dai)
 
         if (dev->capability & DW_I2S_MASTER)
                 clk_enable(dev->clk);
+
+        if (dai->playback_active)
+                dw_i2s_config(dev, SNDRV_PCM_STREAM_PLAYBACK);
+        if (dai->capture_active)
+                dw_i2s_config(dev, SNDRV_PCM_STREAM_CAPTURE);
         return 0;
 }
 
@@ -459,8 +496,8 @@ static int dw_configure_dai(struct dw_i2s_dev *dev,
          * Read component parameter registers to extract
          * the I2S block's configuration.
          */
-        u32 comp1 = i2s_read_reg(dev->i2s_base, I2S_COMP_PARAM_1);
-        u32 comp2 = i2s_read_reg(dev->i2s_base, I2S_COMP_PARAM_2);
+        u32 comp1 = i2s_read_reg(dev->i2s_base, dev->i2s_reg_comp1);
+        u32 comp2 = i2s_read_reg(dev->i2s_base, dev->i2s_reg_comp2);
         u32 idx;
 
         if (COMP1_TX_ENABLED(comp1)) {
@@ -503,7 +540,7 @@ static int dw_configure_dai_by_pd(struct dw_i2s_dev *dev,
                                    struct resource *res,
                                    const struct i2s_platform_data *pdata)
 {
-        u32 comp1 = i2s_read_reg(dev->i2s_base, I2S_COMP_PARAM_1);
+        u32 comp1 = i2s_read_reg(dev->i2s_base, dev->i2s_reg_comp1);
         u32 idx = COMP1_APB_DATA_WIDTH(comp1);
         int ret;
 
@@ -607,6 +644,14 @@ static int dw_i2s_probe(struct platform_device *pdev)
         if (pdata) {
                 dev->capability = pdata->cap;
                 clk_id = NULL;
+                dev->quirks = pdata->quirks;
+                if (dev->quirks & DW_I2S_QUIRK_COMP_REG_OFFSET) {
+                        dev->i2s_reg_comp1 = pdata->i2s_reg_comp1;
+                        dev->i2s_reg_comp2 = pdata->i2s_reg_comp2;
+                } else {
+                        dev->i2s_reg_comp1 = I2S_COMP_PARAM_1;
+                        dev->i2s_reg_comp2 = I2S_COMP_PARAM_2;
+                }
                 ret = dw_configure_dai_by_pd(dev, dw_i2s_dai, res, pdata);
         } else {
                 clk_id = "i2sclk";
@@ -649,7 +694,7 @@ static int dw_i2s_probe(struct platform_device *pdev)
                         goto err_clk_disable;
                 }
         }
-
+        pm_runtime_enable(&pdev->dev);
         return 0;
 
 err_clk_disable:
@@ -665,6 +710,7 @@ static int dw_i2s_remove(struct platform_device *pdev)
         if (dev->capability & DW_I2S_MASTER)
                 clk_disable_unprepare(dev->clk);
 
+        pm_runtime_disable(&pdev->dev);
         return 0;
 }
 
@@ -677,12 +723,17 @@ static const struct of_device_id dw_i2s_of_match[] = {
 MODULE_DEVICE_TABLE(of, dw_i2s_of_match);
 #endif
 
+static const struct dev_pm_ops dwc_pm_ops = {
+        SET_RUNTIME_PM_OPS(dw_i2s_runtime_suspend, dw_i2s_runtime_resume, NULL)
+};
+
 static struct platform_driver dw_i2s_driver = {
         .probe          = dw_i2s_probe,
         .remove         = dw_i2s_remove,
         .driver         = {
                 .name   = "designware-i2s",
                 .of_match_table = of_match_ptr(dw_i2s_of_match),
+                .pm = &dwc_pm_ops,
         },
 };