summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorLiam Girdwood <lg@opensource.wolfsonmicro.com>2008-07-08 13:21:52 +0100
committerJaroslav Kysela <perex@perex.cz>2008-07-10 09:32:54 +0200
commit6f48413dd0f28d81a20fba2e264dd1b9f205893e (patch)
tree841f17ea92bb772aa429e15697d213d73aa7888a /sound
parentac8615baf279f9bcb90c8ae017321d63a94e1762 (diff)
downloadlinux-6f48413dd0f28d81a20fba2e264dd1b9f205893e.tar.gz
linux-6f48413dd0f28d81a20fba2e264dd1b9f205893e.tar.bz2
linux-6f48413dd0f28d81a20fba2e264dd1b9f205893e.zip
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')
-rw-r--r--sound/soc/at32/playpaq_wm8510.c10
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)
}
- /* 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;