diff options
Diffstat (limited to 'sound/soc/pxa/e740_wm9705.c')
-rw-r--r-- | sound/soc/pxa/e740_wm9705.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/sound/soc/pxa/e740_wm9705.c b/sound/soc/pxa/e740_wm9705.c index 7c691aae8af2..d72e124a3676 100644 --- a/sound/soc/pxa/e740_wm9705.c +++ b/sound/soc/pxa/e740_wm9705.c | |||
@@ -88,24 +88,6 @@ static const struct snd_soc_dapm_route audio_map[] = { | |||
88 | {"Mic Amp", NULL, "Mic (Internal)"}, | 88 | {"Mic Amp", NULL, "Mic (Internal)"}, |
89 | }; | 89 | }; |
90 | 90 | ||
91 | static int e740_ac97_init(struct snd_soc_pcm_runtime *rtd) | ||
92 | { | ||
93 | struct snd_soc_codec *codec = rtd->codec; | ||
94 | struct snd_soc_dapm_context *dapm = &codec->dapm; | ||
95 | |||
96 | snd_soc_dapm_nc_pin(dapm, "HPOUTL"); | ||
97 | snd_soc_dapm_nc_pin(dapm, "HPOUTR"); | ||
98 | snd_soc_dapm_nc_pin(dapm, "PHONE"); | ||
99 | snd_soc_dapm_nc_pin(dapm, "LINEINL"); | ||
100 | snd_soc_dapm_nc_pin(dapm, "LINEINR"); | ||
101 | snd_soc_dapm_nc_pin(dapm, "CDINL"); | ||
102 | snd_soc_dapm_nc_pin(dapm, "CDINR"); | ||
103 | snd_soc_dapm_nc_pin(dapm, "PCBEEP"); | ||
104 | snd_soc_dapm_nc_pin(dapm, "MIC2"); | ||
105 | |||
106 | return 0; | ||
107 | } | ||
108 | |||
109 | static struct snd_soc_dai_link e740_dai[] = { | 91 | static struct snd_soc_dai_link e740_dai[] = { |
110 | { | 92 | { |
111 | .name = "AC97", | 93 | .name = "AC97", |
@@ -114,7 +96,6 @@ static struct snd_soc_dai_link e740_dai[] = { | |||
114 | .codec_dai_name = "wm9705-hifi", | 96 | .codec_dai_name = "wm9705-hifi", |
115 | .platform_name = "pxa-pcm-audio", | 97 | .platform_name = "pxa-pcm-audio", |
116 | .codec_name = "wm9705-codec", | 98 | .codec_name = "wm9705-codec", |
117 | .init = e740_ac97_init, | ||
118 | }, | 99 | }, |
119 | { | 100 | { |
120 | .name = "AC97 Aux", | 101 | .name = "AC97 Aux", |
@@ -136,6 +117,7 @@ static struct snd_soc_card e740 = { | |||
136 | .num_dapm_widgets = ARRAY_SIZE(e740_dapm_widgets), | 117 | .num_dapm_widgets = ARRAY_SIZE(e740_dapm_widgets), |
137 | .dapm_routes = audio_map, | 118 | .dapm_routes = audio_map, |
138 | .num_dapm_routes = ARRAY_SIZE(audio_map), | 119 | .num_dapm_routes = ARRAY_SIZE(audio_map), |
120 | .fully_routed = true, | ||
139 | }; | 121 | }; |
140 | 122 | ||
141 | static struct gpio e740_audio_gpios[] = { | 123 | static struct gpio e740_audio_gpios[] = { |