mirror of
https://github.com/Fishwaldo/build.git
synced 2025-04-16 11:01:45 +00:00
150ac0c2af
AR-1 - Adding support category for distributions AR-4 - Remove Allwinner legacy AR-5 - Drop Udoo family and move Udoo board into newly created imx6 family AR-9 - Rename sunxi-next to sunxi-legacy AR-10 - Rename sunxi-dev to sunxi-current AR-11 - Adding Radxa Rockpi S support AR-13 - Rename rockchip64-default to rockchip64-legacy AR-14 - Add rockchip64-current as mainline source AR-15 - Drop Rockchip 4.19.y NEXT, current become 5.3.y AR-16 - Rename RK3399 default to legacy AR-17 - Rename Odroid XU4 next and default to legacy 4.14.y, add DEV 5.4.y AR-18 - Add Odroid N2 current mainline AR-19 - Move Odroid C1 to meson family AR-20 - Rename mvebu64-default to mvebu64-legacy AR-21 - Rename mvebu-default to mvebu-legacy AR-22 - Rename mvebu-next to mvebu-current AR-23 - Drop meson64 default and next, current becomes former DEV 5.3.y AR-24 - Drop cubox family and move Cubox/Hummingboard boards under imx6 AR-26 - Adjust motd AR-27 - Enabling distribution release status AR-28 - Added new GCC compilers AR-29 - Implementing Ubuntu Eoan AR-30 - Add desktop packages per board or family AR-31 - Remove (Ubuntu/Debian) distribution name from image filename AR-32 - Move arch configs from configuration.sh to separate arm64 and armhf config files AR-33 - Revision numbers for beta builds changed to day_in_the_year AR-34 - Patches support linked patches AR-35 - Break meson64 family into gxbb and gxl AR-36 - Add Nanopineo2 Black AR-38 - Upgrade option from old branches to new one via armbian-config AR-41 - Show full timezone info AR-43 - Merge Odroid N2 to meson64 AR-44 - Enable FORCE_BOOTSCRIPT_UPDATE for all builds
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
|
|
|