diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-06-12 23:47:10 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-06-12 23:47:10 -0400 |
| commit | 5b8ad10f897ab16a30017a4611ada7c435e1cc42 (patch) | |
| tree | 7c3905721adabf6e04d6e94fd19e2f785171777e | |
| parent | 989b15046a452a1490ea1dd46755c63ce6376ad6 (diff) | |
| download | longterm-queue-4.8-5b8ad10f897ab16a30017a4611ada7c435e1cc42.tar.gz | |
ASoC: refresh for sun4i context
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/ASoC-sun4i-i2s-Add-quirks-to-handle-a31-compatible.patch | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/queue/ASoC-sun4i-i2s-Add-quirks-to-handle-a31-compatible.patch b/queue/ASoC-sun4i-i2s-Add-quirks-to-handle-a31-compatible.patch index c9be543..4b14188 100644 --- a/queue/ASoC-sun4i-i2s-Add-quirks-to-handle-a31-compatible.patch +++ b/queue/ASoC-sun4i-i2s-Add-quirks-to-handle-a31-compatible.patch @@ -1,4 +1,4 @@ -From 2ad6f30de7087515a0bc2a718fca6681a57739a0 Mon Sep 17 00:00:00 2001 +From 351911b4e5df39a23095661654f44e9ad4625b9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Myl=C3=A8ne=20Josserand?= <mylene.josserand@free-electrons.com> Date: Thu, 2 Feb 2017 10:24:16 +0100 @@ -19,9 +19,10 @@ This new compatible is useful in case of A33 codec driver, for example. Signed-off-by: Mylène Josserand <mylene.josserand@free-electrons.com> Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com> Signed-off-by: Mark Brown <broonie@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c -index f24d19526603..268f2bf691b3 100644 +index 687a8f83dbe5..15c92400cea4 100644 --- a/sound/soc/sunxi/sun4i-i2s.c +++ b/sound/soc/sunxi/sun4i-i2s.c @@ -14,9 +14,11 @@ @@ -42,9 +43,9 @@ index f24d19526603..268f2bf691b3 100644 struct regmap *regmap; + struct reset_control *rst; - unsigned int mclk_freq; - -@@ -651,9 +654,22 @@ static int sun4i_i2s_runtime_suspend(struct device *dev) + struct snd_dmaengine_dai_dma_data playback_dma_data; + }; +@@ -585,9 +588,22 @@ static int sun4i_i2s_runtime_suspend(struct device *dev) return 0; } @@ -67,7 +68,7 @@ index f24d19526603..268f2bf691b3 100644 struct resource *res; void __iomem *regs; int irq, ret; -@@ -674,6 +690,12 @@ static int sun4i_i2s_probe(struct platform_device *pdev) +@@ -608,6 +624,12 @@ static int sun4i_i2s_probe(struct platform_device *pdev) return irq; } @@ -80,7 +81,7 @@ index f24d19526603..268f2bf691b3 100644 i2s->bus_clk = devm_clk_get(&pdev->dev, "apb"); if (IS_ERR(i2s->bus_clk)) { dev_err(&pdev->dev, "Can't get our bus clock\n"); -@@ -692,7 +714,24 @@ static int sun4i_i2s_probe(struct platform_device *pdev) +@@ -626,7 +648,24 @@ static int sun4i_i2s_probe(struct platform_device *pdev) dev_err(&pdev->dev, "Can't get our mod clock\n"); return PTR_ERR(i2s->mod_clk); } @@ -106,7 +107,7 @@ index f24d19526603..268f2bf691b3 100644 i2s->playback_dma_data.addr = res->start + SUN4I_I2S_FIFO_TX_REG; i2s->playback_dma_data.maxburst = 4; -@@ -727,23 +766,37 @@ err_suspend: +@@ -658,23 +697,37 @@ err_suspend: sun4i_i2s_runtime_suspend(&pdev->dev); err_pm_disable: pm_runtime_disable(&pdev->dev); |