diff options
author | Takashi Iwai <tiwai@suse.de> | 2015-02-05 01:08:35 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2015-02-05 01:08:35 -0500 |
commit | a3ae255e3729c1bb4507412ea29be804f703d44c (patch) | |
tree | edd1ca577dad5a0d701ae111519eaefa60896f98 /sound/soc/codecs/da732x.c | |
parent | 3fe9cf390f6dc84f76b112b0a660967a84f9a81b (diff) | |
parent | 16ca41c6cc904d7eb9e92afc5f576e375c314f90 (diff) |
Merge tag 'asoc-v3.20-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Updates for v3.20
More updates for v3.20:
- Lots of refactoring from Lars-Peter Clausen, moving drivers to more
data driven initialization and rationalizing a lot of DAPM usage.
- Much improved handling of CDCLK clocks on Samsung I2S controllers.
- Lots of driver specific cleanups and feature improvements.
- CODEC support for TI PCM514x and TLV320AIC3104 devices.
- Board support for Tegra systems with Realtek RT5677.
Conflicts:
sound/soc/intel/sst-mfld-platform-pcm.c
Diffstat (limited to 'sound/soc/codecs/da732x.c')
-rw-r--r-- | sound/soc/codecs/da732x.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/da732x.c b/sound/soc/codecs/da732x.c index 61b2f9a2eef1..ffe96175a8a5 100644 --- a/sound/soc/codecs/da732x.c +++ b/sound/soc/codecs/da732x.c | |||
@@ -609,7 +609,7 @@ static const struct snd_kcontrol_new da732x_snd_controls[] = { | |||
609 | static int da732x_adc_event(struct snd_soc_dapm_widget *w, | 609 | static int da732x_adc_event(struct snd_soc_dapm_widget *w, |
610 | struct snd_kcontrol *kcontrol, int event) | 610 | struct snd_kcontrol *kcontrol, int event) |
611 | { | 611 | { |
612 | struct snd_soc_codec *codec = w->codec; | 612 | struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm); |
613 | 613 | ||
614 | switch (event) { | 614 | switch (event) { |
615 | case SND_SOC_DAPM_POST_PMU: | 615 | case SND_SOC_DAPM_POST_PMU: |
@@ -663,7 +663,7 @@ static int da732x_adc_event(struct snd_soc_dapm_widget *w, | |||
663 | static int da732x_out_pga_event(struct snd_soc_dapm_widget *w, | 663 | static int da732x_out_pga_event(struct snd_soc_dapm_widget *w, |
664 | struct snd_kcontrol *kcontrol, int event) | 664 | struct snd_kcontrol *kcontrol, int event) |
665 | { | 665 | { |
666 | struct snd_soc_codec *codec = w->codec; | 666 | struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm); |
667 | 667 | ||
668 | switch (event) { | 668 | switch (event) { |
669 | case SND_SOC_DAPM_POST_PMU: | 669 | case SND_SOC_DAPM_POST_PMU: |