Merge remote-tracking branches 'asoc/topic/dwc', 'asoc/topic/intel' and 'asoc/topic...

diff --cc sound/soc/dwc/designware_i2s.c
index 8d18bbda661b66412dba2b93246bc7069cc61c80,23a7c13b914f63fbf77a7f47794cc6035f5fc5ee,b93168d4f6489ee667d94d89a7271e6b4eba8ad5,b93168d4f6489ee667d94d89a7271e6b4eba8ad5..06d3a34ac90ae634db9d16e6c71fd06cdadbb7be
--- 1/sound/soc/dwc/designware_i2s.c
--- 2/sound/soc/dwc/designware_i2s.c
--- 3/sound/soc/dwc/designware_i2s.c
--- 4/sound/soc/dwc/designware_i2s.c
+++ b/sound/soc/dwc/designware_i2s.c
@@@@@ -366,34 -387,15 -355,34 -355,34 +398,15 @@@@@ static int dw_i2s_probe(struct platform
        dw_i2s_dai->resume = dw_i2s_resume;
    
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- --    if (!res) {
- --            dev_err(&pdev->dev, "no i2s resource defined\n");
- --            return -ENODEV;
- --    }
- --
        dev->i2s_base = devm_ioremap_resource(&pdev->dev, res);
- --    if (IS_ERR(dev->i2s_base)) {
- --            dev_err(&pdev->dev, "ioremap fail for i2s_region\n");
+ ++    if (IS_ERR(dev->i2s_base))
                return PTR_ERR(dev->i2s_base);
- --    }
- --
- --    cap = pdata->cap;
- --    dev->capability = cap;
- --    dev->i2s_clk_cfg = pdata->i2s_clk_cfg;
-   
-       /* Set DMA slaves info */
    
  --    /* Set DMA slaves info */
  --
- --    dev->play_dma_data.data = pdata->play_dma_data;
- --    dev->capture_dma_data.data = pdata->capture_dma_data;
- --    dev->play_dma_data.addr = res->start + I2S_TXDMA;
- --    dev->capture_dma_data.addr = res->start + I2S_RXDMA;
- --    dev->play_dma_data.max_burst = 16;
- --    dev->capture_dma_data.max_burst = 16;
- --    dev->play_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES;
- --    dev->capture_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES;
- --    dev->play_dma_data.filter = pdata->filter;
- --    dev->capture_dma_data.filter = pdata->filter;
+ ++    dev->dev = &pdev->dev;
+ ++    dw_configure_dai_by_pd(dev, dw_i2s_dai, res, pdata);
    
+ ++    dev->capability = pdata->cap;
+ ++    dev->i2s_clk_cfg = pdata->i2s_clk_cfg;
        dev->clk = clk_get(&pdev->dev, NULL);
        if (IS_ERR(dev->clk))
                return  PTR_ERR(dev->clk);

diff --cc sound/soc/intel/Kconfig
Simple merge

diff --cc sound/soc/intel/bytcr_dpcm_rt5640.c
Simple merge

diff --cc sound/soc/intel/sst-firmware.c
Simple merge

diff --cc sound/soc/intel/sst/sst_acpi.c
Simple merge