diff options
-rw-r--r-- | sound/soc/tegra/tegra_wm8903.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/sound/soc/tegra/tegra_wm8903.c b/sound/soc/tegra/tegra_wm8903.c index 0e31925b9d56..2b3844322c40 100644 --- a/sound/soc/tegra/tegra_wm8903.c +++ b/sound/soc/tegra/tegra_wm8903.c | |||
@@ -139,13 +139,11 @@ static struct snd_soc_jack_pin tegra_wm8903_hp_jack_pins[] = { | |||
139 | }, | 139 | }, |
140 | }; | 140 | }; |
141 | 141 | ||
142 | static struct snd_soc_jack_gpio tegra_wm8903_hp_jack_gpios[] = { | 142 | static struct snd_soc_jack_gpio tegra_wm8903_hp_jack_gpio = { |
143 | { | 143 | .name = "headphone detect", |
144 | .name = "headphone detect", | 144 | .report = SND_JACK_HEADPHONE, |
145 | .report = SND_JACK_HEADPHONE, | 145 | .debounce_time = 150, |
146 | .debounce_time = 150, | 146 | .invert = 1, |
147 | .invert = 1, | ||
148 | } | ||
149 | }; | 147 | }; |
150 | 148 | ||
151 | static struct snd_soc_jack tegra_wm8903_mic_jack; | 149 | static struct snd_soc_jack tegra_wm8903_mic_jack; |
@@ -241,15 +239,15 @@ static int tegra_wm8903_init(struct snd_soc_pcm_runtime *rtd) | |||
241 | snd_soc_dapm_add_routes(dapm, harmony_audio_map, | 239 | snd_soc_dapm_add_routes(dapm, harmony_audio_map, |
242 | ARRAY_SIZE(harmony_audio_map)); | 240 | ARRAY_SIZE(harmony_audio_map)); |
243 | 241 | ||
244 | tegra_wm8903_hp_jack_gpios[0].gpio = pdata->gpio_hp_det; | 242 | tegra_wm8903_hp_jack_gpio.gpio = pdata->gpio_hp_det; |
245 | snd_soc_jack_new(codec, "Headphone Jack", SND_JACK_HEADPHONE, | 243 | snd_soc_jack_new(codec, "Headphone Jack", SND_JACK_HEADPHONE, |
246 | &tegra_wm8903_hp_jack); | 244 | &tegra_wm8903_hp_jack); |
247 | snd_soc_jack_add_pins(&tegra_wm8903_hp_jack, | 245 | snd_soc_jack_add_pins(&tegra_wm8903_hp_jack, |
248 | ARRAY_SIZE(tegra_wm8903_hp_jack_pins), | 246 | ARRAY_SIZE(tegra_wm8903_hp_jack_pins), |
249 | tegra_wm8903_hp_jack_pins); | 247 | tegra_wm8903_hp_jack_pins); |
250 | snd_soc_jack_add_gpios(&tegra_wm8903_hp_jack, | 248 | snd_soc_jack_add_gpios(&tegra_wm8903_hp_jack, |
251 | ARRAY_SIZE(tegra_wm8903_hp_jack_gpios), | 249 | 1, |
252 | tegra_wm8903_hp_jack_gpios); | 250 | &tegra_wm8903_hp_jack_gpio); |
253 | 251 | ||
254 | snd_soc_jack_new(codec, "Mic Jack", SND_JACK_MICROPHONE, | 252 | snd_soc_jack_new(codec, "Mic Jack", SND_JACK_MICROPHONE, |
255 | &tegra_wm8903_mic_jack); | 253 | &tegra_wm8903_mic_jack); |