From: Mark Brown <broonie@kernel.org>
Date: Sun, 19 Feb 2017 16:36:54 +0000 (+0000)
Subject: Merge remote-tracking branches 'asoc/topic/rt5665', 'asoc/topic/rt5677', 'asoc/topic... 
X-Git-Tag: Ubuntu-5.2.0-15.16~7395^2~8^2~2
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=166729f37da174f4ad967ebfc3e6f1517d247e61;p=mirror_ubuntu-eoan-kernel.git

Merge remote-tracking branches 'asoc/topic/rt5665', 'asoc/topic/rt5677', 'asoc/topic/samsung', 'asoc/topic/simple' and 'asoc/topic/sunxi' into asoc-next
---

166729f37da174f4ad967ebfc3e6f1517d247e61
diff --cc sound/soc/sunxi/sun4i-i2s.c
index 4237323ef594,f24d19526603,f24d19526603,f24d19526603,f24d19526603,268f2bf691b3..3635bbc72cbc
--- a/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)) {