summaryrefslogtreecommitdiff
path: root/sound/soc/codecs/max98390.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2020-07-30 23:00:36 +0300
committerMark Brown <broonie@kernel.org>2020-07-30 23:00:36 +0300
commit3d026a8a590f9fb657e8aed00bb76dc1e0e37c08 (patch)
tree85470879d368bcc8a6c3e7f01332b87fdccea297 /sound/soc/codecs/max98390.c
parent4d1976c79946cdf6ba3b53e26992ea0c0abf03da (diff)
parente44815a295a50027a9953f3ef62827d14631b96b (diff)
downloadlinux-3d026a8a590f9fb657e8aed00bb76dc1e0e37c08.tar.xz
Merge series "ASoC: meson: tdm fixes" from Jerome Brunet <jbrunet@baylibre.com>:
This patcheset is collection of fixes for the TDM input and output the axg audio architecture. Its fixes: - slave mode format setting - g12 and sm1 skew offset - tdm clock inversion - standard daifmt props names which don't require a specific prefix Jerome Brunet (4): ASoC: meson: axg-tdm-interface: fix link fmt setup ASoC: meson: axg-tdmin: fix g12a skew ASoC: meson: axg-tdm-formatters: fix sclk inversion ASoC: meson: cards: remove DT_PREFIX for standard daifmt properties sound/soc/meson/axg-tdm-formatter.c | 11 ++++++----- sound/soc/meson/axg-tdm-formatter.h | 1 - sound/soc/meson/axg-tdm-interface.c | 26 +++++++++++++++++--------- sound/soc/meson/axg-tdmin.c | 16 +++++++++++++++- sound/soc/meson/axg-tdmout.c | 3 --- sound/soc/meson/meson-card-utils.c | 2 +- 6 files changed, 39 insertions(+), 20 deletions(-) -- 2.25.4
Diffstat (limited to 'sound/soc/codecs/max98390.c')
-rw-r--r--sound/soc/codecs/max98390.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/max98390.c b/sound/soc/codecs/max98390.c
index 325d8dee79fa..ff5cc9bbec29 100644
--- a/sound/soc/codecs/max98390.c
+++ b/sound/soc/codecs/max98390.c
@@ -678,7 +678,7 @@ static const struct snd_kcontrol_new max98390_dai_controls =
static const struct snd_soc_dapm_widget max98390_dapm_widgets[] = {
SND_SOC_DAPM_DAC_E("Amp Enable", "HiFi Playback",
- MAX98390_R203A_AMP_EN, 0, 0, max98390_dac_event,
+ SND_SOC_NOPM, 0, 0, max98390_dac_event,
SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),
SND_SOC_DAPM_MUX("DAI Sel Mux", SND_SOC_NOPM, 0, 0,
&max98390_dai_controls),