Diff
Modified: trunk/sound/soc/blackfin/bf5xx-ac97-pcm.c (9795 => 9796)
--- trunk/sound/soc/blackfin/bf5xx-ac97-pcm.c 2011-03-28 06:49:33 UTC (rev 9795)
+++ trunk/sound/soc/blackfin/bf5xx-ac97-pcm.c 2011-03-28 06:52:46 UTC (rev 9796)
@@ -465,7 +465,7 @@
static struct platform_driver bf5xx_pcm_driver = {
.driver = {
- .name = "bfin-pcm-audio",
+ .name = "bfin-ac97-pcm-audio",
.owner = THIS_MODULE,
},
Modified: trunk/sound/soc/blackfin/bf5xx-ad183x.c (9795 => 9796)
--- trunk/sound/soc/blackfin/bf5xx-ad183x.c 2011-03-28 06:49:33 UTC (rev 9795)
+++ trunk/sound/soc/blackfin/bf5xx-ad183x.c 2011-03-28 06:52:46 UTC (rev 9796)
@@ -74,7 +74,7 @@
.stream_name = "AD183X",
.cpu_dai_name = "bfin-tdm.0",
.codec_dai_name = "ad183x-hifi",
- .platform_name = "bfin-pcm-audio",
+ .platform_name = "bfin-tdm-pcm-audio",
.codec_name = "spi0.4",
.ops = &bf5xx_ad183x_ops,
},
@@ -83,14 +83,14 @@
.stream_name = "AD183X",
.cpu_dai_name = "bfin-tdm.1",
.codec_dai_name = "ad183x-hifi",
- .platform_name = "bfin-pcm-audio",
+ .platform_name = "bfin-tdm-pcm-audio",
.codec_name = "spi0.4",
.ops = &bf5xx_ad183x_ops,
- }
+ },
};
static struct snd_soc_card bf5xx_ad183x = {
- .name = "bf5xx_ad183x",
+ .name = "bfin-ad183x",
.dai_link = &bf5xx_ad183x_dai[CONFIG_SND_BF5XX_SPORT_NUM],
.num_links = 1,
};
Modified: trunk/sound/soc/blackfin/bf5xx-ad193x.c (9795 => 9796)
--- trunk/sound/soc/blackfin/bf5xx-ad193x.c 2011-03-28 06:49:33 UTC (rev 9795)
+++ trunk/sound/soc/blackfin/bf5xx-ad193x.c 2011-03-28 06:52:46 UTC (rev 9796)
@@ -102,7 +102,7 @@
.stream_name = "AD193X",
.cpu_dai_name = "bfin-tdm.0",
.codec_dai_name = "ad193x-hifi",
- .platform_name = "bfin-pcm-audio",
+ .platform_name = "bfin-tdm-pcm-audio",
#if defined(CONFIG_SND_SOC_AD193X_SPI)
.codec_name = "spi0.5",
#elif defined(CONFIG_SND_SOC_AD193X_I2C)
@@ -115,18 +115,18 @@
.stream_name = "AD193X",
.cpu_dai_name = "bfin-tdm.1",
.codec_dai_name = "ad193x-hifi",
- .platform_name = "bfin-pcm-audio",
+ .platform_name = "bfin-tdm-pcm-audio",
#if defined(CONFIG_SND_SOC_AD193X_SPI)
.codec_name = "spi0.5",
#elif defined(CONFIG_SND_SOC_AD193X_I2C)
.codec_name = "ad193x.0-0004",
#endif
.ops = &bf5xx_ad193x_ops,
- }
+ },
};
static struct snd_soc_card bf5xx_ad193x = {
- .name = "bf5xx_ad193x",
+ .name = "bfin-ad193x",
.dai_link = &bf5xx_ad193x_dai[CONFIG_SND_BF5XX_SPORT_NUM],
.num_links = 1,
};
Modified: trunk/sound/soc/blackfin/bf5xx-ad73311.c (9795 => 9796)
--- trunk/sound/soc/blackfin/bf5xx-ad73311.c 2011-03-28 06:49:33 UTC (rev 9795)
+++ trunk/sound/soc/blackfin/bf5xx-ad73311.c 2011-03-28 06:52:46 UTC (rev 9796)
@@ -209,7 +209,7 @@
.stream_name = "AD73311",
.cpu_dai_name = "bfin-i2s.0",
.codec_dai_name = "ad73311-hifi",
- .platform_name = "bfin-pcm-audio",
+ .platform_name = "bfin-i2s-pcm-audio",
.codec_name = "ad73311",
.init = snd_ad73311_init,
.ops = &bf5xx_ad73311_ops,
@@ -219,15 +219,15 @@
.stream_name = "AD73311",
.cpu_dai_name = "bfin-i2s.1",
.codec_dai_name = "ad73311-hifi",
- .platform_name = "bfin-pcm-audio",
+ .platform_name = "bfin-i2s-pcm-audio",
.codec_name = "ad73311",
.init = snd_ad73311_init,
.ops = &bf5xx_ad73311_ops,
- }
+ },
};
static struct snd_soc_card bf5xx_ad73311 = {
- .name = "bf5xx_ad73311",
+ .name = "bfin-ad73311",
.probe = bf5xx_probe,
.dai_link = &bf5xx_ad73311_dai[CONFIG_SND_BF5XX_SPORT_NUM],
.num_links = 1,
Modified: trunk/sound/soc/blackfin/bf5xx-adau1361.c (9795 => 9796)
--- trunk/sound/soc/blackfin/bf5xx-adau1361.c 2011-03-28 06:49:33 UTC (rev 9795)
+++ trunk/sound/soc/blackfin/bf5xx-adau1361.c 2011-03-28 06:52:46 UTC (rev 9796)
@@ -93,13 +93,13 @@
.stream_name = "adau1361",
.cpu_dai_name = "bfin-i2s",
.codec_dai_name = "ADAU1361",
- .platform_name = "bfin-pcm-audio",
+ .platform_name = "bfin-i2s-pcm-audio",
.codec_name = "adau1361",
.ops = &bf5xx_adau1361_ops,
};
static struct snd_soc_card bf5xx_adau1361 = {
- .name = "bf5xx_adau1361",
+ .name = "bfin-adau1361",
.dai_link = &bf5xx_adau1361_dai,
.num_links = 1,
};
Modified: trunk/sound/soc/blackfin/bf5xx-adau1373.c (9795 => 9796)
--- trunk/sound/soc/blackfin/bf5xx-adau1373.c 2011-03-28 06:49:33 UTC (rev 9795)
+++ trunk/sound/soc/blackfin/bf5xx-adau1373.c 2011-03-28 06:52:46 UTC (rev 9796)
@@ -90,13 +90,13 @@
.stream_name = "adau1373",
.cpu_dai_name = "bfin-i2s",
.codec_dai_name = "ADAU1373",
- .platform_name = "bfin-pcm-audio",
+ .platform_name = "bfin-i2s-pcm-audio",
.codec_name = "adau1373",
.ops = &bf5xx_adau1373_ops,
};
static struct snd_soc_card bf5xx_adau1373 = {
- .name = "bf5xx_adau1373",
+ .name = "bfin-adau1373",
.dai_link = &bf5xx_adau1373_dai,
.num_links = 1,
};
Modified: trunk/sound/soc/blackfin/bf5xx-adau1381.c (9795 => 9796)
--- trunk/sound/soc/blackfin/bf5xx-adau1381.c 2011-03-28 06:49:33 UTC (rev 9795)
+++ trunk/sound/soc/blackfin/bf5xx-adau1381.c 2011-03-28 06:52:46 UTC (rev 9796)
@@ -93,13 +93,13 @@
.stream_name = "adau1381",
.cpu_dai_name = "bfin-i2s",
.codec_dai_name = "ADAU1381",
- .platform_name = "bfin-pcm-audio",
+ .platform_name = "bfin-i2s-pcm-audio",
.codec_name = "adau1381",
.ops = &bf5xx_adau1381_ops,
};
static struct snd_soc_card bf5xx_adau1381 = {
- .name = "bf5xx_adau1381",
+ .name = "bfin-adau1381",
.dai_link = &bf5xx_adau1381_dai,
.num_links = 1,
};
Modified: trunk/sound/soc/blackfin/bf5xx-adau1761.c (9795 => 9796)
--- trunk/sound/soc/blackfin/bf5xx-adau1761.c 2011-03-28 06:49:33 UTC (rev 9795)
+++ trunk/sound/soc/blackfin/bf5xx-adau1761.c 2011-03-28 06:52:46 UTC (rev 9796)
@@ -93,13 +93,13 @@
.stream_name = "adau1761",
.cpu_dai_name = "bfin-i2s",
.codec_dai_name = "ADAU1761",
- .platform_name = "bfin-pcm-audio",
+ .platform_name = "bfin-i2s-pcm-audio",
.codec_name = "adau1761",
.ops = &bf5xx_adau1761_ops,
};
static struct snd_soc_card bf5xx_adau1761 = {
- .name = "bf5xx_adau1761",
+ .name = "bfin-adau1761",
.dai_link = &bf5xx_adau1761_dai,
.num_links = 1,
};
Modified: trunk/sound/soc/blackfin/bf5xx-adav80x.c (9795 => 9796)
--- trunk/sound/soc/blackfin/bf5xx-adav80x.c 2011-03-28 06:49:33 UTC (rev 9795)
+++ trunk/sound/soc/blackfin/bf5xx-adav80x.c 2011-03-28 06:52:46 UTC (rev 9796)
@@ -84,13 +84,13 @@
.stream_name = "ADAV80X",
.cpu_dai_name = "bfin-i2s",
.codec_dai_name = "ADAV80X",
- .platform_name = "bfin-pcm-audio",
+ .platform_name = "bfin-i2s-pcm-audio",
.codec_name = "adav80x",
.ops = &bf5xx_adav80x_ops,
};
static struct snd_soc_card bf5xx_adav80x = {
- .name = "bf5xx_adav80x",
+ .name = "bfin-adav80x",
.dai_link = &bf5xx_adav80x_dai,
.num_links = 1,
};
Modified: trunk/sound/soc/blackfin/bf5xx-i2s-pcm.c (9795 => 9796)
--- trunk/sound/soc/blackfin/bf5xx-i2s-pcm.c 2011-03-28 06:49:33 UTC (rev 9795)
+++ trunk/sound/soc/blackfin/bf5xx-i2s-pcm.c 2011-03-28 06:52:46 UTC (rev 9796)
@@ -295,7 +295,7 @@
static struct platform_driver bfin_i2s_pcm_driver = {
.driver = {
- .name = "bfin-pcm-audio",
+ .name = "bfin-i2s-pcm-audio",
.owner = THIS_MODULE,
},
Modified: trunk/sound/soc/blackfin/bf5xx-ssm2602.c (9795 => 9796)
--- trunk/sound/soc/blackfin/bf5xx-ssm2602.c 2011-03-28 06:49:33 UTC (rev 9795)
+++ trunk/sound/soc/blackfin/bf5xx-ssm2602.c 2011-03-28 06:52:46 UTC (rev 9796)
@@ -108,7 +108,7 @@
.stream_name = "SSM2602",
.cpu_dai_name = "bfin-i2s.0",
.codec_dai_name = "ssm2602-hifi",
- .platform_name = "bfin-pcm-audio",
+ .platform_name = "bfin-i2s-pcm-audio",
.codec_name = "ssm2602.0-001b",
.ops = &bf5xx_ssm2602_ops,
},
@@ -117,14 +117,14 @@
.stream_name = "SSM2602",
.cpu_dai_name = "bfin-i2s.1",
.codec_dai_name = "ssm2602-hifi",
- .platform_name = "bfin-pcm-audio",
+ .platform_name = "bfin-i2s-pcm-audio",
.codec_name = "ssm2602.0-001b",
.ops = &bf5xx_ssm2602_ops,
- }
+ },
};
static struct snd_soc_card bf5xx_ssm2602 = {
- .name = "bf5xx_ssm2602",
+ .name = "bfin-ssm2602",
.dai_link = &bf5xx_ssm2602_dai[CONFIG_SND_BF5XX_SPORT_NUM],
.num_links = 1,
};
Modified: trunk/sound/soc/blackfin/bf5xx-tdm-pcm.c (9795 => 9796)
--- trunk/sound/soc/blackfin/bf5xx-tdm-pcm.c 2011-03-28 06:49:33 UTC (rev 9795)
+++ trunk/sound/soc/blackfin/bf5xx-tdm-pcm.c 2011-03-28 06:52:46 UTC (rev 9796)
@@ -329,7 +329,7 @@
static struct platform_driver bfin_tdm_driver = {
.driver = {
- .name = "bfin-pcm-audio",
+ .name = "bfin-tdm-pcm-audio",
.owner = THIS_MODULE,
},
