aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2015-04-11 06:52:01 -0400
committerMark Brown <broonie@kernel.org>2015-04-12 07:42:34 -0400
commit02f51640fedb61ab17fcddbd6fdb40239a4f46d9 (patch)
treea45444cef2b26ccc058a6b8abd0e4f2b94d6d173
parent77c71765ef78f87dd901fcb4c751908e835a3b2e (diff)
ASoC: wm1133-ev1: Use card DAPM context to access widgets
The dapm field of the snd_soc_codec struct will eventually be removed (replaced with the DAPM context from the component embedded inside the CODEC). Replace its usage with the card's DAPM context. The idea is that DAPM is hierarchical and with the card at the root it is possible to access widgets from other contexts through the card context. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--sound/soc/fsl/wm1133-ev1.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/fsl/wm1133-ev1.c b/sound/soc/fsl/wm1133-ev1.c
index 0653aa83c927..b454972dce35 100644
--- a/sound/soc/fsl/wm1133-ev1.c
+++ b/sound/soc/fsl/wm1133-ev1.c
@@ -202,7 +202,6 @@ static struct snd_soc_jack_pin mic_jack_pins[] = {
202static int wm1133_ev1_init(struct snd_soc_pcm_runtime *rtd) 202static int wm1133_ev1_init(struct snd_soc_pcm_runtime *rtd)
203{ 203{
204 struct snd_soc_codec *codec = rtd->codec; 204 struct snd_soc_codec *codec = rtd->codec;
205 struct snd_soc_dapm_context *dapm = &codec->dapm;
206 205
207 /* Headphone jack detection */ 206 /* Headphone jack detection */
208 snd_soc_card_jack_new(rtd->card, "Headphone", SND_JACK_HEADPHONE, 207 snd_soc_card_jack_new(rtd->card, "Headphone", SND_JACK_HEADPHONE,
@@ -216,7 +215,7 @@ static int wm1133_ev1_init(struct snd_soc_pcm_runtime *rtd)
216 wm8350_mic_jack_detect(codec, &mic_jack, SND_JACK_MICROPHONE, 215 wm8350_mic_jack_detect(codec, &mic_jack, SND_JACK_MICROPHONE,
217 SND_JACK_BTN_0); 216 SND_JACK_BTN_0);
218 217
219 snd_soc_dapm_force_enable_pin(dapm, "Mic Bias"); 218 snd_soc_dapm_force_enable_pin(&rtd->card->dapm, "Mic Bias");
220 219
221 return 0; 220 return 0;
222} 221}