From: Liam Girdwood <lg@opensource.wolfsonmicro.com>
Date: Tue, 8 Jul 2008 12:21:52 +0000 (+0100)
Subject: ALSA: asoc: at32 - DAI struct merge and enable_pin() change.
X-Git-Tag: v2.6.27-rc1~1111^2~20
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f48413dd0f28d81a20fba2e264dd1b9f205893e;p=linux-2.6

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>
---

diff --git a/sound/soc/at32/playpaq_wm8510.c b/sound/soc/at32/playpaq_wm8510.c
index fd62f25697..fee5f8e589 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)
 	}
 
 
-	/* 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;