diff options
author | Liam Girdwood <lg@opensource.wolfsonmicro.com> | 2008-07-08 08:21:52 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@perex.cz> | 2008-07-10 03:32:54 -0400 |
commit | 6f48413dd0f28d81a20fba2e264dd1b9f205893e (patch) | |
tree | 841f17ea92bb772aa429e15697d213d73aa7888a /sound/soc/at32 | |
parent | ac8615baf279f9bcb90c8ae017321d63a94e1762 (diff) |
ALSA: asoc: at32 - DAI struct merge and enable_pin() change.
This adds support for the recent DAI struct merge and new DAPM pin API.
Signed-off-by: Liam Girdwood <lg@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound/soc/at32')
-rw-r--r-- | sound/soc/at32/playpaq_wm8510.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/at32/playpaq_wm8510.c b/sound/soc/at32/playpaq_wm8510.c index fd62f2569758..fee5f8e58957 100644 --- a/sound/soc/at32/playpaq_wm8510.c +++ b/sound/soc/at32/playpaq_wm8510.c | |||
@@ -341,15 +341,15 @@ static int playpaq_wm8510_init(struct snd_soc_codec *codec) | |||
341 | } | 341 | } |
342 | 342 | ||
343 | 343 | ||
344 | /* always connected endpoints */ | 344 | /* always connected pins */ |
345 | snd_soc_dapm_set_endpoint(codec, "Int Mic", 1); | 345 | snd_soc_dapm_enable_pin(codec, "Int Mic"); |
346 | snd_soc_dapm_set_endpoint(codec, "Ext Spk", 1); | 346 | snd_soc_dapm_enable_pin(codec, "Ext Spk"); |
347 | snd_soc_dapm_sync_endpoints(codec); | 347 | snd_soc_dapm_sync(codec); |
348 | 348 | ||
349 | 349 | ||
350 | 350 | ||
351 | /* Make CSB show PLL rate */ | 351 | /* Make CSB show PLL rate */ |
352 | codec->dai->dai_ops.set_clkdiv(codec->dai, WM8510_OPCLKDIV, | 352 | snd_soc_dai_set_clkdiv(codec->dai, WM8510_OPCLKDIV, |
353 | WM8510_OPCLKDIV_1 | 4); | 353 | WM8510_OPCLKDIV_1 | 4); |
354 | 354 | ||
355 | return 0; | 355 | return 0; |