diff options
Diffstat (limited to 'sound/soc/pxa/e750_wm9705.c')
-rw-r--r-- | sound/soc/pxa/e750_wm9705.c | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/sound/soc/pxa/e750_wm9705.c b/sound/soc/pxa/e750_wm9705.c index 4c143803a75e..2bc97e92446b 100644 --- a/sound/soc/pxa/e750_wm9705.c +++ b/sound/soc/pxa/e750_wm9705.c | |||
@@ -74,23 +74,24 @@ static const struct snd_soc_dapm_route audio_map[] = { | |||
74 | static int e750_ac97_init(struct snd_soc_pcm_runtime *rtd) | 74 | static int e750_ac97_init(struct snd_soc_pcm_runtime *rtd) |
75 | { | 75 | { |
76 | struct snd_soc_codec *codec = rtd->codec; | 76 | struct snd_soc_codec *codec = rtd->codec; |
77 | 77 | struct snd_soc_dapm_context *dapm = &codec->dapm; | |
78 | snd_soc_dapm_nc_pin(codec, "LOUT"); | 78 | |
79 | snd_soc_dapm_nc_pin(codec, "ROUT"); | 79 | snd_soc_dapm_nc_pin(dapm, "LOUT"); |
80 | snd_soc_dapm_nc_pin(codec, "PHONE"); | 80 | snd_soc_dapm_nc_pin(dapm, "ROUT"); |
81 | snd_soc_dapm_nc_pin(codec, "LINEINL"); | 81 | snd_soc_dapm_nc_pin(dapm, "PHONE"); |
82 | snd_soc_dapm_nc_pin(codec, "LINEINR"); | 82 | snd_soc_dapm_nc_pin(dapm, "LINEINL"); |
83 | snd_soc_dapm_nc_pin(codec, "CDINL"); | 83 | snd_soc_dapm_nc_pin(dapm, "LINEINR"); |
84 | snd_soc_dapm_nc_pin(codec, "CDINR"); | 84 | snd_soc_dapm_nc_pin(dapm, "CDINL"); |
85 | snd_soc_dapm_nc_pin(codec, "PCBEEP"); | 85 | snd_soc_dapm_nc_pin(dapm, "CDINR"); |
86 | snd_soc_dapm_nc_pin(codec, "MIC2"); | 86 | snd_soc_dapm_nc_pin(dapm, "PCBEEP"); |
87 | 87 | snd_soc_dapm_nc_pin(dapm, "MIC2"); | |
88 | snd_soc_dapm_new_controls(codec, e750_dapm_widgets, | 88 | |
89 | snd_soc_dapm_new_controls(dapm, e750_dapm_widgets, | ||
89 | ARRAY_SIZE(e750_dapm_widgets)); | 90 | ARRAY_SIZE(e750_dapm_widgets)); |
90 | 91 | ||
91 | snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map)); | 92 | snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map)); |
92 | 93 | ||
93 | snd_soc_dapm_sync(codec); | 94 | snd_soc_dapm_sync(dapm); |
94 | 95 | ||
95 | return 0; | 96 | return 0; |
96 | } | 97 | } |