diff options
Diffstat (limited to 'sound/soc/pxa/e750_wm9705.c')
-rw-r--r-- | sound/soc/pxa/e750_wm9705.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/sound/soc/pxa/e750_wm9705.c b/sound/soc/pxa/e750_wm9705.c index 30544b65b5a8..48f2d7c2e68c 100644 --- a/sound/soc/pxa/e750_wm9705.c +++ b/sound/soc/pxa/e750_wm9705.c | |||
@@ -70,24 +70,6 @@ static const struct snd_soc_dapm_route audio_map[] = { | |||
70 | {"MIC1", NULL, "Mic (Internal)"}, | 70 | {"MIC1", NULL, "Mic (Internal)"}, |
71 | }; | 71 | }; |
72 | 72 | ||
73 | static int e750_ac97_init(struct snd_soc_pcm_runtime *rtd) | ||
74 | { | ||
75 | struct snd_soc_codec *codec = rtd->codec; | ||
76 | struct snd_soc_dapm_context *dapm = &codec->dapm; | ||
77 | |||
78 | snd_soc_dapm_nc_pin(dapm, "LOUT"); | ||
79 | snd_soc_dapm_nc_pin(dapm, "ROUT"); | ||
80 | snd_soc_dapm_nc_pin(dapm, "PHONE"); | ||
81 | snd_soc_dapm_nc_pin(dapm, "LINEINL"); | ||
82 | snd_soc_dapm_nc_pin(dapm, "LINEINR"); | ||
83 | snd_soc_dapm_nc_pin(dapm, "CDINL"); | ||
84 | snd_soc_dapm_nc_pin(dapm, "CDINR"); | ||
85 | snd_soc_dapm_nc_pin(dapm, "PCBEEP"); | ||
86 | snd_soc_dapm_nc_pin(dapm, "MIC2"); | ||
87 | |||
88 | return 0; | ||
89 | } | ||
90 | |||
91 | static struct snd_soc_dai_link e750_dai[] = { | 73 | static struct snd_soc_dai_link e750_dai[] = { |
92 | { | 74 | { |
93 | .name = "AC97", | 75 | .name = "AC97", |
@@ -96,7 +78,6 @@ static struct snd_soc_dai_link e750_dai[] = { | |||
96 | .codec_dai_name = "wm9705-hifi", | 78 | .codec_dai_name = "wm9705-hifi", |
97 | .platform_name = "pxa-pcm-audio", | 79 | .platform_name = "pxa-pcm-audio", |
98 | .codec_name = "wm9705-codec", | 80 | .codec_name = "wm9705-codec", |
99 | .init = e750_ac97_init, | ||
100 | /* use ops to check startup state */ | 81 | /* use ops to check startup state */ |
101 | }, | 82 | }, |
102 | { | 83 | { |
@@ -119,6 +100,7 @@ static struct snd_soc_card e750 = { | |||
119 | .num_dapm_widgets = ARRAY_SIZE(e750_dapm_widgets), | 100 | .num_dapm_widgets = ARRAY_SIZE(e750_dapm_widgets), |
120 | .dapm_routes = audio_map, | 101 | .dapm_routes = audio_map, |
121 | .num_dapm_routes = ARRAY_SIZE(audio_map), | 102 | .num_dapm_routes = ARRAY_SIZE(audio_map), |
103 | .fully_routed = true, | ||
122 | }; | 104 | }; |
123 | 105 | ||
124 | static struct gpio e750_audio_gpios[] = { | 106 | static struct gpio e750_audio_gpios[] = { |