mirror of
https://github.com/Fishwaldo/build.git
synced 2025-03-26 00:31:47 +00:00
47 lines
1.7 KiB
Diff
47 lines
1.7 KiB
Diff
From 043b8daa578f30c2ba685ad13b121fd138b95750 Mon Sep 17 00:00:00 2001
|
|
From: Marcus Cooper <codekipper@gmail.com>
|
|
Date: Sat, 19 Aug 2017 14:48:38 +0200
|
|
Subject: ASoC: sun4i-i2s: Update global enable with bitmask
|
|
|
|
The default value of the config register is different on newer
|
|
SoCs and therefore enabling/disabling with a register write
|
|
will clear bits used to set the direction of the clock and frame
|
|
pins.
|
|
|
|
Signed-off-by: Marcus Cooper <codekipper@gmail.com>
|
|
Reviewed-by: Chen-Yu Tsai <wens@csie.org>
|
|
Signed-off-by: Mark Brown <broonie@kernel.org>
|
|
---
|
|
sound/soc/sunxi/sun4i-i2s.c | 7 ++++---
|
|
1 file changed, 4 insertions(+), 3 deletions(-)
|
|
|
|
(limited to 'sound/soc/sunxi')
|
|
|
|
diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c
|
|
index 573acca..19d50ca 100644
|
|
--- a/sound/soc/sunxi/sun4i-i2s.c
|
|
+++ b/sound/soc/sunxi/sun4i-i2s.c
|
|
@@ -529,8 +529,8 @@ static int sun4i_i2s_startup(struct snd_pcm_substream *substream,
|
|
struct sun4i_i2s *i2s = snd_soc_dai_get_drvdata(dai);
|
|
|
|
/* Enable the whole hardware block */
|
|
- regmap_write(i2s->regmap, SUN4I_I2S_CTRL_REG,
|
|
- SUN4I_I2S_CTRL_GL_EN);
|
|
+ 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,
|
|
@@ -553,7 +553,8 @@ static void sun4i_i2s_shutdown(struct snd_pcm_substream *substream,
|
|
SUN4I_I2S_CTRL_SDO_EN_MASK, 0);
|
|
|
|
/* Disable the whole hardware block */
|
|
- regmap_write(i2s->regmap, SUN4I_I2S_CTRL_REG, 0);
|
|
+ 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,
|
|
--
|
|
cgit v1.1
|
|
|