diff options
| author | Fabio Estevam <fabio.estevam@freescale.com> | 2014-11-14 02:14:47 -0200 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2015-05-13 09:56:07 +0200 |
| commit | eeea9fbe6bb8db5d0caa485652e423371209cebf (patch) | |
| tree | ae09493906c0a4bb3cfefe319683d35b7cbaacae /sound | |
| parent | 202483c148322e527b14863c59f3ffff93aeec69 (diff) | |
ASoC: sgtl5000: Fix SMALL_POP bit definitionColibri_T30_LinuxImageV2.4Beta1_20150518Colibri_T20_LinuxImageV2.4Beta1_20150518Apalis_T30_LinuxImageV2.4Beta1_20150518
On a mx28evk with a sgtl5000 codec we notice a loud 'click' sound to happen
5 seconds after the end of a playback.
The SMALL_POP bit should fix this, but its definition is incorrect:
according to the sgtl5000 manual it is bit 0 of CHIP_REF_CTRL register, not
bit 1.
Fix the definition accordingly and enable the bit as intended per the code
comment.
After applying this change, no loud 'click' sound is heard after playback
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Cc: stable@vger.kernel.org
(cherry picked from commit c251ea7bd7a04f1f2575467e0de76e803cf59149)
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/sgtl5000.c | 3 | ||||
| -rw-r--r-- | sound/soc/codecs/sgtl5000.h | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c index 96bd0e3508ef..7cd8cac38a87 100644 --- a/sound/soc/codecs/sgtl5000.c +++ b/sound/soc/codecs/sgtl5000.c @@ -1398,8 +1398,7 @@ static int sgtl5000_probe(struct snd_soc_codec *codec) /* enable small pop, introduce 400ms delay in turning off */ snd_soc_update_bits(codec, SGTL5000_CHIP_REF_CTRL, - SGTL5000_SMALL_POP, - SGTL5000_SMALL_POP); + SGTL5000_SMALL_POP, 1); /* disable short cut detector */ snd_soc_write(codec, SGTL5000_CHIP_SHORT_CTRL, 0); diff --git a/sound/soc/codecs/sgtl5000.h b/sound/soc/codecs/sgtl5000.h index 8a9f43534b79..0fc205bec266 100644 --- a/sound/soc/codecs/sgtl5000.h +++ b/sound/soc/codecs/sgtl5000.h @@ -275,7 +275,7 @@ #define SGTL5000_BIAS_CTRL_MASK 0x000e #define SGTL5000_BIAS_CTRL_SHIFT 1 #define SGTL5000_BIAS_CTRL_WIDTH 3 -#define SGTL5000_SMALL_POP 0x0001 +#define SGTL5000_SMALL_POP 0 /* * SGTL5000_CHIP_MIC_CTRL |