diff options
| author | Marcus Cooper <codekipper@gmail.com> | 2017-08-19 14:48:38 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-08-21 17:16:10 +0100 |
| commit | 043b8daa578f30c2ba685ad13b121fd138b95750 (patch) | |
| tree | b6805f0dbbf66e3fff961c02b78bad3875097a19 /sound | |
| parent | d03d2737e2d20c6ffb242154a69e1a9313adb632 (diff) | |
| download | linux-043b8daa578f30c2ba685ad13b121fd138b95750.tar.gz linux-043b8daa578f30c2ba685ad13b121fd138b95750.tar.bz2 linux-043b8daa578f30c2ba685ad13b121fd138b95750.zip | |
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>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/sunxi/sun4i-i2s.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c index 573acca24a2c..19d50ca10d1f 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, |