Patch "ASoC: wm5110: Fix PGA clear when disabling DRE" has been added to the 4.4-stable tree
Subsystems (4)
This is a note to let you know that I've just added the patch titled
ASoC: wm5110: Fix PGA clear when disabling DRE
to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
asoc-wm5110-fix-pga-clear-when-disabling-dre.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
24338722cfa23fdf4e08c6189a11f7e3a902d86aMon Sep 17 00:00:00 2001
From: Charles Keepax <[email protected]>
Date: Wed, 6 Jan 2016 15:15:37 +0000
Subject: ASoC: wm5110: Fix PGA clear when disabling DRE
From: Charles Keepax <[email protected]>
commit 24338722cfa23fdf4e08c6189a11f7e3a902d86a upstream.
We don't want to use a bypassed write in wm5110_clear_pga_volume, we might disable the DRE whilst the CODEC is powered down. A normal regmap_write will always go to the hardware (when not on cache_only) even if the written value matches the cache. As using a normal write will still achieve the desired behaviour of bring the cache and hardware in sync, this patch updates the function to use a normal write, which avoids issues when the CODEC is powered down.
--- sound/soc/codecs/wm5110.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
sound/soc/codecs/wm5110.c +3 -5
@@ -360,15 +360,13 @@ static int wm5110_hp_ev(struct snd_soc_dstatic int wm5110_clear_pga_volume (struct arizona *arizona,int output) { -struct reg_sequence clear_pga = { -ARIZONA_OUTPUT_PATH_CONFIG_1L + output *4 ,0x80 - }; +unsigned int reg =ARIZONA_OUTPUT_PATH_CONFIG_1L + output *4 ;int ret; - ret =regmap_multi_reg_write_bypassed (arizona->regmap, &clear_pga,1 ); + ret =regmap_write (arizona->regmap, reg,0x80 );if (ret)dev_err (arizona->dev,"Failed to clear PGA (0x%x): %d\n" , - clear_pga.reg, ret); + reg, ret);return ret; }
Patches currently in stable-queue which might be from [email protected] are
queue-4.4/asoc-wm5110-fix-pga-clear-when-disabling-dre.patch