aboutsummaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorStephen Barber <smbarber@chromium.org>2016-10-27 18:02:27 -0700
committerMark Brown <broonie@kernel.org>2016-10-28 18:04:26 +0100
commitd64b5bf5b10ad95fd4a2684e1fc39eb7b00d9d0c (patch)
treeab74c14da2f5bb1871a512a67326f77b140f5ec3 /sound
parent1001354ca34179f3db924eb66672442a173147dc (diff)
downloadlinux-aarch64-d64b5bf5b10ad95fd4a2684e1fc39eb7b00d9d0c.tar.gz
ASoC: da7219: Connect output enable register to DAIOUT
da7219 output (for headset capture) should be set to high-impedance when not in use, since it will otherwise interfere with output from other codecs attached to the same DAI. Signed-off-by: Stephen Barber <smbarber@chromium.org> Acked-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/da7219.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/codecs/da7219.c b/sound/soc/codecs/da7219.c
index 1152aa5e7c39..cf37936bfe3a 100644
--- a/sound/soc/codecs/da7219.c
+++ b/sound/soc/codecs/da7219.c
@@ -880,7 +880,8 @@ static const struct snd_soc_dapm_widget da7219_dapm_widgets[] = {
SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
/* DAI */
- SND_SOC_DAPM_AIF_OUT("DAIOUT", "Capture", 0, SND_SOC_NOPM, 0, 0),
+ SND_SOC_DAPM_AIF_OUT("DAIOUT", "Capture", 0, DA7219_DAI_TDM_CTRL,
+ DA7219_DAI_OE_SHIFT, DA7219_NO_INVERT),
SND_SOC_DAPM_AIF_IN("DAIIN", "Playback", 0, SND_SOC_NOPM, 0, 0),
/* Output Muxes */