diff --git a/[refs] b/[refs]
index 3d64380a835c..b3838ba031ad 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f04cd9cb11469a6a9cbfdad824254143250d78d2
+refs/heads/master: c8ad38b8b26ad04d5125606065c87315308d6df5
diff --git a/trunk/sound/soc/blackfin/bf5xx-ad1836.c b/trunk/sound/soc/blackfin/bf5xx-ad1836.c
index 83012da9dfc2..826bae696d36 100644
--- a/trunk/sound/soc/blackfin/bf5xx-ad1836.c
+++ b/trunk/sound/soc/blackfin/bf5xx-ad1836.c
@@ -85,7 +85,7 @@ static struct snd_soc_dai_link bf5xx_ad1836_dai = {
 	.cpu_dai_name = "bf5xx-tdm",
 	.codec_dai_name = "ad1836-hifi",
 	.platform_name = "bf5xx-tdm-pcm-audio",
-	.codec_name = "ad1836-codec.0",
+	.codec_name = "ad1836.0",
 	.ops = &bf5xx_ad1836_ops,
 };
 
diff --git a/trunk/sound/soc/blackfin/bf5xx-ad193x.c b/trunk/sound/soc/blackfin/bf5xx-ad193x.c
index 33678828d57e..5794d094d003 100644
--- a/trunk/sound/soc/blackfin/bf5xx-ad193x.c
+++ b/trunk/sound/soc/blackfin/bf5xx-ad193x.c
@@ -113,7 +113,7 @@ static struct snd_soc_dai_link bf5xx_ad193x_dai = {
 	.cpu_dai_name = "bf5xx-tdm",
 	.codec_dai_name ="ad193x-hifi",
 	.platform_name = "bf5xx-tdm-pcm-audio",
-	.codec_name = "ad193x-codec.5",
+	.codec_name = "ad193x.5",
 	.ops = &bf5xx_ad193x_ops,
 };
 
diff --git a/trunk/sound/soc/blackfin/bf5xx-ad1980.c b/trunk/sound/soc/blackfin/bf5xx-ad1980.c
index d57c9c9c9883..c147130a2e7e 100644
--- a/trunk/sound/soc/blackfin/bf5xx-ad1980.c
+++ b/trunk/sound/soc/blackfin/bf5xx-ad1980.c
@@ -73,7 +73,7 @@ static struct snd_soc_dai_link bf5xx_board_dai = {
 	.cpu_dai_name = "bfin-ac97",
 	.codec_dai_name = "ad1980-hifi",
 	.platform_name = "bfin-pcm-audio",
-	.codec_name = "ad1980-codec",
+	.codec_name = "ad1980",
 	.ops = &bf5xx_board_ops,
 };
 
diff --git a/trunk/sound/soc/blackfin/bf5xx-ad73311.c b/trunk/sound/soc/blackfin/bf5xx-ad73311.c
index 732fb8bad076..1655f950dfb4 100644
--- a/trunk/sound/soc/blackfin/bf5xx-ad73311.c
+++ b/trunk/sound/soc/blackfin/bf5xx-ad73311.c
@@ -186,7 +186,7 @@ static struct snd_soc_dai_link bf5xx_ad73311_dai = {
 	.cpu_dai_name = "bf5xx-i2s",
 	.codec_dai_name = "ad73311-hifi",
 	.platform_name = "bfin-pcm-audio",
-	.codec_name = "ad73311-codec",
+	.codec_name = "ad73311",
 	.ops = &bf5xx_ad73311_ops,
 };
 
diff --git a/trunk/sound/soc/blackfin/bf5xx-ssm2602.c b/trunk/sound/soc/blackfin/bf5xx-ssm2602.c
index ad28663f5bbd..732a02ffe68f 100644
--- a/trunk/sound/soc/blackfin/bf5xx-ssm2602.c
+++ b/trunk/sound/soc/blackfin/bf5xx-ssm2602.c
@@ -119,7 +119,7 @@ static struct snd_soc_dai_link bf5xx_ssm2602_dai = {
 	.cpu_dai_name = "bf5xx-i2s",
 	.codec_dai_name = "ssm2602-hifi",
 	.platform_name = "bf5xx-pcm-audio",
-	.codec_name = "ssm2602-codec.0-001b",
+	.codec_name = "ssm2602.0-001b",
 	.ops = &bf5xx_ssm2602_ops,
 };