]> err.no Git - linux-2.6/commitdiff
ALSA: asoc: at32 - DAI struct merge and enable_pin() change.
authorLiam Girdwood <lg@opensource.wolfsonmicro.com>
Tue, 8 Jul 2008 12:21:52 +0000 (13:21 +0100)
committerJaroslav Kysela <perex@perex.cz>
Thu, 10 Jul 2008 07:32:54 +0000 (09:32 +0200)
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>
sound/soc/at32/playpaq_wm8510.c

index fd62f2569758453d8c73fc45efad4fea7e182cbb..fee5f8e589575ab783a44c5366d1438c4e50bb28 100644 (file)
@@ -341,15 +341,15 @@ static int playpaq_wm8510_init(struct snd_soc_codec *codec)
        }
 
 
-       /* always connected endpoints */
-       snd_soc_dapm_set_endpoint(codec, "Int Mic", 1);
-       snd_soc_dapm_set_endpoint(codec, "Ext Spk", 1);
-       snd_soc_dapm_sync_endpoints(codec);
+       /* always connected pins */
+       snd_soc_dapm_enable_pin(codec, "Int Mic");
+       snd_soc_dapm_enable_pin(codec, "Ext Spk");
+       snd_soc_dapm_sync(codec);
 
 
 
        /* Make CSB show PLL rate */
-       codec->dai->dai_ops.set_clkdiv(codec->dai, WM8510_OPCLKDIV,
+       snd_soc_dai_set_clkdiv(codec->dai, WM8510_OPCLKDIV,
                                       WM8510_OPCLKDIV_1 | 4);
 
        return 0;