diff options
Diffstat (limited to 'sound/soc/pxa/zylonite.c')
-rw-r--r-- | sound/soc/pxa/zylonite.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/soc/pxa/zylonite.c b/sound/soc/pxa/zylonite.c index d27e05af7759..b222a7d72027 100644 --- a/sound/soc/pxa/zylonite.c +++ b/sound/soc/pxa/zylonite.c | |||
@@ -20,7 +20,6 @@ | |||
20 | #include <sound/pcm.h> | 20 | #include <sound/pcm.h> |
21 | #include <sound/pcm_params.h> | 21 | #include <sound/pcm_params.h> |
22 | #include <sound/soc.h> | 22 | #include <sound/soc.h> |
23 | #include <sound/soc-dapm.h> | ||
24 | 23 | ||
25 | #include "../codecs/wm9713.h" | 24 | #include "../codecs/wm9713.h" |
26 | #include "pxa2xx-ac97.h" | 25 | #include "pxa2xx-ac97.h" |
@@ -73,21 +72,22 @@ static const struct snd_soc_dapm_route audio_map[] = { | |||
73 | static int zylonite_wm9713_init(struct snd_soc_pcm_runtime *rtd) | 72 | static int zylonite_wm9713_init(struct snd_soc_pcm_runtime *rtd) |
74 | { | 73 | { |
75 | struct snd_soc_codec *codec = rtd->codec; | 74 | struct snd_soc_codec *codec = rtd->codec; |
75 | struct snd_soc_dapm_context *dapm = &codec->dapm; | ||
76 | 76 | ||
77 | if (clk_pout) | 77 | if (clk_pout) |
78 | snd_soc_dai_set_pll(rtd->codec_dai, 0, 0, | 78 | snd_soc_dai_set_pll(rtd->codec_dai, 0, 0, |
79 | clk_get_rate(pout), 0); | 79 | clk_get_rate(pout), 0); |
80 | 80 | ||
81 | snd_soc_dapm_new_controls(codec, zylonite_dapm_widgets, | 81 | snd_soc_dapm_new_controls(dapm, zylonite_dapm_widgets, |
82 | ARRAY_SIZE(zylonite_dapm_widgets)); | 82 | ARRAY_SIZE(zylonite_dapm_widgets)); |
83 | 83 | ||
84 | snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map)); | 84 | snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map)); |
85 | 85 | ||
86 | /* Static setup for now */ | 86 | /* Static setup for now */ |
87 | snd_soc_dapm_enable_pin(codec, "Headphone"); | 87 | snd_soc_dapm_enable_pin(dapm, "Headphone"); |
88 | snd_soc_dapm_enable_pin(codec, "Headset Earpiece"); | 88 | snd_soc_dapm_enable_pin(dapm, "Headset Earpiece"); |
89 | 89 | ||
90 | snd_soc_dapm_sync(codec); | 90 | snd_soc_dapm_sync(dapm); |
91 | return 0; | 91 | return 0; |
92 | } | 92 | } |
93 | 93 | ||