diff --git a/[refs] b/[refs]
index b7187ad76ef6..e93b85bc00aa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ac8615baf279f9bcb90c8ae017321d63a94e1762
+refs/heads/master: 6f48413dd0f28d81a20fba2e264dd1b9f205893e
diff --git a/trunk/sound/soc/at32/playpaq_wm8510.c b/trunk/sound/soc/at32/playpaq_wm8510.c
index fd62f2569758..fee5f8e58957 100644
--- a/trunk/sound/soc/at32/playpaq_wm8510.c
+++ b/trunk/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;