Merge remote-tracking branches 'asoc/topic/rt5665', 'asoc/topic/rt5677', 'asoc/topic...

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

diff --cc sound/soc/codecs/Makefile
Simple merge

diff --cc sound/soc/samsung/i2s.c
Simple merge

diff --cc sound/soc/sunxi/sun4i-i2s.c
index 4237323ef5945a37c11c0097f5f4ff62babca0f1,f24d19526603c2d2a31ef9af1cff07ed4dd8d1ca,f24d19526603c2d2a31ef9af1cff07ed4dd8d1ca,f24d19526603c2d2a31ef9af1cff07ed4dd8d1ca,f24d19526603c2d2a31ef9af1cff07ed4dd8d1ca,268f2bf691b33e6c1955d690f2e9bc4852686069..3635bbc72cbcd3f4053569195007f57762758e7f
--- 1/sound/soc/sunxi/sun4i-i2s.c
--- 2/sound/soc/sunxi/sun4i-i2s.c
--- 3/sound/soc/sunxi/sun4i-i2s.c
--- 4/sound/soc/sunxi/sun4i-i2s.c
--- 5/sound/soc/sunxi/sun4i-i2s.c
--- 6/sound/soc/sunxi/sun4i-i2s.c
+++ b/sound/soc/sunxi/sun4i-i2s.c
@@@@@@@ -692,12 -692,12 -692,12 -692,12 -692,12 -714,29 +714,29 @@@@@@@ static int sun4i_i2s_probe(struct platf
                dev_err(&pdev->dev, "Can't get our mod clock\n");
                return PTR_ERR(i2s->mod_clk);
        }
-----   
+++++ 
+++++   if (quirks->has_reset) {
+++++           i2s->rst = devm_reset_control_get(&pdev->dev, NULL);
+++++           if (IS_ERR(i2s->rst)) {
+++++                   dev_err(&pdev->dev, "Failed to get reset control\n");
+++++                   return PTR_ERR(i2s->rst);
+++++           }
+++++   }
+++++ 
+++++   if (!IS_ERR(i2s->rst)) {
+++++           ret = reset_control_deassert(i2s->rst);
+++++           if (ret) {
+++++                   dev_err(&pdev->dev,
+++++                           "Failed to deassert the reset control\n");
+++++                   return -EINVAL;
+++++           }
+++++   }
+++++ 
        i2s->playback_dma_data.addr = res->start + SUN4I_I2S_FIFO_TX_REG;
 -----  i2s->playback_dma_data.maxburst = 4;
 +++++  i2s->playback_dma_data.maxburst = 8;
      
        i2s->capture_dma_data.addr = res->start + SUN4I_I2S_FIFO_RX_REG;
 -----  i2s->capture_dma_data.maxburst = 4;
 +++++  i2s->capture_dma_data.maxburst = 8;
      
        pm_runtime_enable(&pdev->dev);
        if (!pm_runtime_enabled(&pdev->dev)) {