summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/arizona.h
diff options
context:
space:
mode:
authorCharles Keepax <ckeepax@opensource.wolfsonmicro.com>2016-06-13 13:35:17 +0100
committerMark Brown <broonie@kernel.org>2016-06-13 15:11:48 +0100
commit10867b32a1cc2fb0b370c3d3601fccc587165128 (patch)
tree97d6690fe6890c317519c4a04209c3d683752ad6 /sound/soc/codecs/arizona.h
parenta3178a3ed7986f44be7502d7dc6091ff932d9776 (diff)
downloadlinux-10867b32a1cc2fb0b370c3d3601fccc587165128.tar.bz2
ASoC: wm5102: Revert manual speaker enable
The OUT4L and OUT4R widgets are not registered PRE_PMU or POST_PMD events, as such the manual speaker enable on wm5102 does not actually ever run. Furthermore since the issue actually only affected rev B of the silicon which never shipped in volume, simply remove the work around from the code. Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/codecs/arizona.h')
-rw-r--r--sound/soc/codecs/arizona.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/sound/soc/codecs/arizona.h b/sound/soc/codecs/arizona.h
index 02d836cb5fb1..f01d0e7684eb 100644
--- a/sound/soc/codecs/arizona.h
+++ b/sound/soc/codecs/arizona.h
@@ -87,9 +87,6 @@ struct arizona_priv {
unsigned int out_down_pending;
unsigned int out_down_delay;
- unsigned int spk_ena:2;
- unsigned int spk_ena_pending:1;
-
unsigned int dvfs_reqs;
struct mutex dvfs_lock;
bool dvfs_cached;