mirror of
https://github.com/Fishwaldo/build.git
synced 2025-03-25 08:11:45 +00:00
117 lines
3.5 KiB
Diff
117 lines
3.5 KiB
Diff
From e4ff7b4f7eddc3a9adc41f3f1d97444a72561910 Mon Sep 17 00:00:00 2001
|
|
From: Vasily Khoruzhick <anarsoul@gmail.com>
|
|
Date: Fri, 12 Oct 2018 08:27:43 -0700
|
|
Subject: [PATCH 113/146] ASoC: sun4i-i2s: move code from startup/shutdown
|
|
hooks into pm_runtime hooks
|
|
|
|
startup() and shutdown() hooks are called for both substreams,
|
|
so stopping either substream when another is running breaks the
|
|
latter.
|
|
|
|
E.g. playback breaks if capture is stopped when playback is running.
|
|
|
|
Move code from startup() and shutdown() to resume() and suspend()
|
|
hooks respectively to fix this issue
|
|
|
|
Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
|
|
Acked-by: Maxime Ripard <maxime.ripard@bootlin.com>
|
|
---
|
|
sound/soc/sunxi/sun4i-i2s.c | 61 +++++++++++++++----------------------
|
|
1 file changed, 25 insertions(+), 36 deletions(-)
|
|
|
|
diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c
|
|
index a4aa931ebfae..daa6c08cffbc 100644
|
|
--- a/sound/soc/sunxi/sun4i-i2s.c
|
|
+++ b/sound/soc/sunxi/sun4i-i2s.c
|
|
@@ -644,40 +644,6 @@ static int sun4i_i2s_trigger(struct snd_pcm_substream *substream, int cmd,
|
|
return 0;
|
|
}
|
|
|
|
-static int sun4i_i2s_startup(struct snd_pcm_substream *substream,
|
|
- struct snd_soc_dai *dai)
|
|
-{
|
|
- struct sun4i_i2s *i2s = snd_soc_dai_get_drvdata(dai);
|
|
-
|
|
- /* Enable the whole hardware block */
|
|
- regmap_update_bits(i2s->regmap, SUN4I_I2S_CTRL_REG,
|
|
- SUN4I_I2S_CTRL_GL_EN, SUN4I_I2S_CTRL_GL_EN);
|
|
-
|
|
- /* Enable the first output line */
|
|
- regmap_update_bits(i2s->regmap, SUN4I_I2S_CTRL_REG,
|
|
- SUN4I_I2S_CTRL_SDO_EN_MASK,
|
|
- SUN4I_I2S_CTRL_SDO_EN(0));
|
|
-
|
|
-
|
|
- return clk_prepare_enable(i2s->mod_clk);
|
|
-}
|
|
-
|
|
-static void sun4i_i2s_shutdown(struct snd_pcm_substream *substream,
|
|
- struct snd_soc_dai *dai)
|
|
-{
|
|
- struct sun4i_i2s *i2s = snd_soc_dai_get_drvdata(dai);
|
|
-
|
|
- clk_disable_unprepare(i2s->mod_clk);
|
|
-
|
|
- /* Disable our output lines */
|
|
- regmap_update_bits(i2s->regmap, SUN4I_I2S_CTRL_REG,
|
|
- SUN4I_I2S_CTRL_SDO_EN_MASK, 0);
|
|
-
|
|
- /* Disable the whole hardware block */
|
|
- regmap_update_bits(i2s->regmap, SUN4I_I2S_CTRL_REG,
|
|
- SUN4I_I2S_CTRL_GL_EN, 0);
|
|
-}
|
|
-
|
|
static int sun4i_i2s_set_sysclk(struct snd_soc_dai *dai, int clk_id,
|
|
unsigned int freq, int dir)
|
|
{
|
|
@@ -695,8 +661,6 @@ static const struct snd_soc_dai_ops sun4i_i2s_dai_ops = {
|
|
.hw_params = sun4i_i2s_hw_params,
|
|
.set_fmt = sun4i_i2s_set_fmt,
|
|
.set_sysclk = sun4i_i2s_set_sysclk,
|
|
- .shutdown = sun4i_i2s_shutdown,
|
|
- .startup = sun4i_i2s_startup,
|
|
.trigger = sun4i_i2s_trigger,
|
|
};
|
|
|
|
@@ -869,6 +833,21 @@ static int sun4i_i2s_runtime_resume(struct device *dev)
|
|
goto err_disable_clk;
|
|
}
|
|
|
|
+ /* Enable the whole hardware block */
|
|
+ regmap_update_bits(i2s->regmap, SUN4I_I2S_CTRL_REG,
|
|
+ SUN4I_I2S_CTRL_GL_EN, SUN4I_I2S_CTRL_GL_EN);
|
|
+
|
|
+ /* Enable the first output line */
|
|
+ regmap_update_bits(i2s->regmap, SUN4I_I2S_CTRL_REG,
|
|
+ SUN4I_I2S_CTRL_SDO_EN_MASK,
|
|
+ SUN4I_I2S_CTRL_SDO_EN(0));
|
|
+
|
|
+ ret = clk_prepare_enable(i2s->mod_clk);
|
|
+ if (ret) {
|
|
+ dev_err(dev, "Failed to enable module clock\n");
|
|
+ goto err_disable_clk;
|
|
+ }
|
|
+
|
|
return 0;
|
|
|
|
err_disable_clk:
|
|
@@ -880,6 +859,16 @@ static int sun4i_i2s_runtime_suspend(struct device *dev)
|
|
{
|
|
struct sun4i_i2s *i2s = dev_get_drvdata(dev);
|
|
|
|
+ clk_disable_unprepare(i2s->mod_clk);
|
|
+
|
|
+ /* Disable our output lines */
|
|
+ regmap_update_bits(i2s->regmap, SUN4I_I2S_CTRL_REG,
|
|
+ SUN4I_I2S_CTRL_SDO_EN_MASK, 0);
|
|
+
|
|
+ /* Disable the whole hardware block */
|
|
+ regmap_update_bits(i2s->regmap, SUN4I_I2S_CTRL_REG,
|
|
+ SUN4I_I2S_CTRL_GL_EN, 0);
|
|
+
|
|
regcache_cache_only(i2s->regmap, true);
|
|
|
|
clk_disable_unprepare(i2s->bus_clk);
|
|
--
|
|
2.17.1
|
|
|