diff options
| author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2016-05-18 16:19:01 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-05-18 17:57:22 +0100 |
| commit | 45c04704e467fffe3525205454d9627325dae308 (patch) | |
| tree | 56da911b1e9ea9d983aba75468c85b6b76afe0db | |
| parent | 29cf67b99527296e9c9b9f6995c1d271d21f79c0 (diff) | |
| download | linux-stable-45c04704e467fffe3525205454d9627325dae308.tar.gz linux-stable-45c04704e467fffe3525205454d9627325dae308.tar.bz2 linux-stable-45c04704e467fffe3525205454d9627325dae308.zip | |
ASoC: twl6040: Disconnect AUX output pads on digital mute
Disconnect also the path to AUXL from the HF path during digital_mute to
avoid pop noise leakage to Line-out pads.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | include/linux/mfd/twl6040.h | 1 | ||||
| -rw-r--r-- | sound/soc/codecs/twl6040.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/mfd/twl6040.h b/include/linux/mfd/twl6040.h index 8f9fc3d26e6d..8e95cd87cd74 100644 --- a/include/linux/mfd/twl6040.h +++ b/include/linux/mfd/twl6040.h @@ -134,6 +134,7 @@ #define TWL6040_HFDACENA (1 << 0) #define TWL6040_HFPGAENA (1 << 1) #define TWL6040_HFDRVENA (1 << 4) +#define TWL6040_HFSWENA (1 << 6) /* VIBCTLL/R (0x18/0x1A) fields */ diff --git a/sound/soc/codecs/twl6040.c b/sound/soc/codecs/twl6040.c index bc3de2e844e6..d1e3a932cbf3 100644 --- a/sound/soc/codecs/twl6040.c +++ b/sound/soc/codecs/twl6040.c @@ -983,9 +983,9 @@ static void twl6040_mute_path(struct snd_soc_codec *codec, enum twl6040_dai_id i if (mute) { /* Power down drivers and DACs */ hflctl &= ~(TWL6040_HFDACENA | TWL6040_HFPGAENA | - TWL6040_HFDRVENA); + TWL6040_HFDRVENA | TWL6040_HFSWENA); hfrctl &= ~(TWL6040_HFDACENA | TWL6040_HFPGAENA | - TWL6040_HFDRVENA); + TWL6040_HFDRVENA | TWL6040_HFSWENA); } twl6040_reg_write(twl6040, TWL6040_REG_HFLCTL, hflctl); |