Diff
Modified: trunk/sound/soc/blackfin/bf5xx-adau1361.c (9778 => 9779)
--- trunk/sound/soc/blackfin/bf5xx-adau1361.c 2011-03-27 08:38:17 UTC (rev 9778)
+++ trunk/sound/soc/blackfin/bf5xx-adau1361.c 2011-03-27 08:39:24 UTC (rev 9779)
@@ -90,23 +90,19 @@
static struct snd_soc_dai_link bf5xx_adau1361_dai = {
.name = "adau1361",
.stream_name = "adau1361",
- .cpu_dai = &bf5xx_i2s_dai,
- .codec_dai = &adau1361_dai,
+ .cpu_dai_name = "bfin-i2s",
+ .codec_dai_name = "ADAU1361",
+ .platform_name = "bfin-pcm-audio",
+ .codec_name = "adau1361",
.ops = &bf5xx_adau1361_ops,
};
static struct snd_soc_card bf5xx_adau1361 = {
.name = "bf5xx_adau1361",
- .platform = &bf5xx_i2s_soc_platform,
.dai_link = &bf5xx_adau1361_dai,
.num_links = 1,
};
-static struct snd_soc_device bf5xx_adau1361_snd_devdata = {
- .card = &bf5xx_adau1361,
- .codec_dev = &soc_codec_dev_adau1361,
-};
-
static struct platform_device *bf5xx_adau1361_snd_device;
static int __init bf5xx_adau1361_init(void)
@@ -118,9 +114,7 @@
if (!bf5xx_adau1361_snd_device)
return -ENOMEM;
- platform_set_drvdata(bf5xx_adau1361_snd_device,
- &bf5xx_adau1361_snd_devdata);
- bf5xx_adau1361_snd_devdata.dev = &bf5xx_adau1361_snd_device->dev;
+ platform_set_drvdata(bf5xx_adau1361_snd_device, &bf5xx_adau1361);
ret = platform_device_add(bf5xx_adau1361_snd_device);
if (ret)
@@ -139,5 +133,5 @@
/* Module information */
MODULE_AUTHOR("Cliff Cai");
-MODULE_DESCRIPTION("ALSA SoC adau1361");
+MODULE_DESCRIPTION("ALSA SoC adau1361 Blackfin board");
MODULE_LICENSE("GPL");
Modified: trunk/sound/soc/blackfin/bf5xx-adau1373.c (9778 => 9779)
--- trunk/sound/soc/blackfin/bf5xx-adau1373.c 2011-03-27 08:38:17 UTC (rev 9778)
+++ trunk/sound/soc/blackfin/bf5xx-adau1373.c 2011-03-27 08:39:24 UTC (rev 9779)
@@ -87,23 +87,19 @@
static struct snd_soc_dai_link bf5xx_adau1373_dai = {
.name = "adau1373",
.stream_name = "adau1373",
- .cpu_dai = &bf5xx_i2s_dai,
- .codec_dai = &adau1373_dai,
+ .cpu_dai_name = "bfin-i2s",
+ .codec_dai_name = "ADAU1373",
+ .platform_name = "bfin-pcm-audio",
+ .codec_name = "adau1373",
.ops = &bf5xx_adau1373_ops,
};
static struct snd_soc_card bf5xx_adau1373 = {
.name = "bf5xx_adau1373",
- .platform = &bf5xx_i2s_soc_platform,
.dai_link = &bf5xx_adau1373_dai,
.num_links = 1,
};
-static struct snd_soc_device bf5xx_adau1373_snd_devdata = {
- .card = &bf5xx_adau1373,
- .codec_dev = &soc_codec_dev_adau1373,
-};
-
static struct platform_device *bf5xx_adau1373_snd_device;
static int __init bf5xx_adau1373_init(void)
@@ -115,11 +111,9 @@
if (!bf5xx_adau1373_snd_device)
return -ENOMEM;
- platform_set_drvdata(bf5xx_adau1373_snd_device,
- &bf5xx_adau1373_snd_devdata);
+ platform_set_drvdata(bf5xx_adau1373_snd_device, &bf5xx_adau1373);
platform_device_add_data(bf5xx_adau1373_snd_device, &adau1373_pdata,
sizeof(adau1373_pdata));
- bf5xx_adau1373_snd_devdata.dev = &bf5xx_adau1373_snd_device->dev;
ret = platform_device_add(bf5xx_adau1373_snd_device);
if (ret)
@@ -138,5 +132,5 @@
/* Module information */
MODULE_AUTHOR("Cliff Cai");
-MODULE_DESCRIPTION("ALSA SoC adau1373");
+MODULE_DESCRIPTION("ALSA SoC adau1373 Blackfin board");
MODULE_LICENSE("GPL");
Modified: trunk/sound/soc/blackfin/bf5xx-adau1381.c (9778 => 9779)
--- trunk/sound/soc/blackfin/bf5xx-adau1381.c 2011-03-27 08:38:17 UTC (rev 9778)
+++ trunk/sound/soc/blackfin/bf5xx-adau1381.c 2011-03-27 08:39:24 UTC (rev 9779)
@@ -90,23 +90,19 @@
static struct snd_soc_dai_link bf5xx_adau1381_dai = {
.name = "adau1381",
.stream_name = "adau1381",
- .cpu_dai = &bf5xx_i2s_dai,
- .codec_dai = &adau1381_dai,
+ .cpu_dai_name = "bfin-i2s",
+ .codec_dai_name = "ADAU1381",
+ .platform_name = "bfin-pcm-audio",
+ .codec_name = "adau1381",
.ops = &bf5xx_adau1381_ops,
};
static struct snd_soc_card bf5xx_adau1381 = {
.name = "bf5xx_adau1381",
- .platform = &bf5xx_i2s_soc_platform,
.dai_link = &bf5xx_adau1381_dai,
.num_links = 1,
};
-static struct snd_soc_device bf5xx_adau1381_snd_devdata = {
- .card = &bf5xx_adau1381,
- .codec_dev = &soc_codec_dev_adau1381,
-};
-
static struct platform_device *bf5xx_adau1381_snd_device;
static int __init bf5xx_adau1381_init(void)
@@ -118,9 +114,7 @@
if (!bf5xx_adau1381_snd_device)
return -ENOMEM;
- platform_set_drvdata(bf5xx_adau1381_snd_device,
- &bf5xx_adau1381_snd_devdata);
- bf5xx_adau1381_snd_devdata.dev = &bf5xx_adau1381_snd_device->dev;
+ platform_set_drvdata(bf5xx_adau1381_snd_device, &bf5xx_adau1381);
ret = platform_device_add(bf5xx_adau1381_snd_device);
if (ret)
@@ -139,5 +133,5 @@
/* Module information */
MODULE_AUTHOR("Cliff Cai");
-MODULE_DESCRIPTION("ALSA SoC adau1381");
+MODULE_DESCRIPTION("ALSA SoC adau1381 Blackfin board");
MODULE_LICENSE("GPL");
Modified: trunk/sound/soc/blackfin/bf5xx-adau1761.c (9778 => 9779)
--- trunk/sound/soc/blackfin/bf5xx-adau1761.c 2011-03-27 08:38:17 UTC (rev 9778)
+++ trunk/sound/soc/blackfin/bf5xx-adau1761.c 2011-03-27 08:39:24 UTC (rev 9779)
@@ -90,23 +90,19 @@
static struct snd_soc_dai_link bf5xx_adau1761_dai = {
.name = "adau1761",
.stream_name = "adau1761",
- .cpu_dai = &bf5xx_i2s_dai,
- .codec_dai = &adau1761_dai,
+ .cpu_dai_name = "bfin-i2s",
+ .codec_dai_name = "ADAU1761",
+ .platform_name = "bfin-pcm-audio",
+ .codec_name = "adau1761",
.ops = &bf5xx_adau1761_ops,
};
static struct snd_soc_card bf5xx_adau1761 = {
.name = "bf5xx_adau1761",
- .platform = &bf5xx_i2s_soc_platform,
.dai_link = &bf5xx_adau1761_dai,
.num_links = 1,
};
-static struct snd_soc_device bf5xx_adau1761_snd_devdata = {
- .card = &bf5xx_adau1761,
- .codec_dev = &soc_codec_dev_adau1761,
-};
-
static struct platform_device *bf5xx_adau1761_snd_device;
static int __init bf5xx_adau1761_init(void)
@@ -118,9 +114,7 @@
if (!bf5xx_adau1761_snd_device)
return -ENOMEM;
- platform_set_drvdata(bf5xx_adau1761_snd_device,
- &bf5xx_adau1761_snd_devdata);
- bf5xx_adau1761_snd_devdata.dev = &bf5xx_adau1761_snd_device->dev;
+ platform_set_drvdata(bf5xx_adau1761_snd_device, &bf5xx_adau1761);
ret = platform_device_add(bf5xx_adau1761_snd_device);
if (ret)
@@ -139,5 +133,5 @@
/* Module information */
MODULE_AUTHOR("Cliff Cai");
-MODULE_DESCRIPTION("ALSA SoC adau1761");
+MODULE_DESCRIPTION("ALSA SoC adau1761 Blackfin board");
MODULE_LICENSE("GPL");
Modified: trunk/sound/soc/blackfin/bf5xx-adav80x.c (9778 => 9779)
--- trunk/sound/soc/blackfin/bf5xx-adav80x.c 2011-03-27 08:38:17 UTC (rev 9778)
+++ trunk/sound/soc/blackfin/bf5xx-adav80x.c 2011-03-27 08:39:24 UTC (rev 9779)
@@ -81,36 +81,31 @@
static struct snd_soc_dai_link bf5xx_adav80x_dai = {
.name = "adav80x",
.stream_name = "ADAV80X",
- .cpu_dai = &bf5xx_i2s_dai,
- .codec_dai = &adav80x_dai,
+ .cpu_dai_name = "bfin-i2s",
+ .codec_dai_name = "ADAV80X",
+ .platform_name = "bfin-pcm-audio",
+ .codec_name = "adav80x",
.ops = &bf5xx_adav80x_ops,
};
static struct snd_soc_card bf5xx_adav80x = {
.name = "bf5xx_adav80x",
- .platform = &bf5xx_i2s_soc_platform,
.dai_link = &bf5xx_adav80x_dai,
.num_links = 1,
};
-static struct snd_soc_device bf5xx_adav80x_snd_devdata = {
- .card = &bf5xx_adav80x,
- .codec_dev = &soc_codec_dev_adav80x,
-};
-
static struct platform_device *bf5xx_adav80x_snd_device;
static int __init bf5xx_adav80x_init(void)
{
int ret;
+ pr_debug("%s enter\n", __func__);
bf5xx_adav80x_snd_device = platform_device_alloc("soc-audio", -1);
if (!bf5xx_adav80x_snd_device)
return -ENOMEM;
- platform_set_drvdata(bf5xx_adav80x_snd_device,
- &bf5xx_adav80x_snd_devdata);
- bf5xx_adav80x_snd_devdata.dev = &bf5xx_adav80x_snd_device->dev;
+ platform_set_drvdata(bf5xx_adav80x_snd_device, &bf5xx_adav80x);
ret = platform_device_add(bf5xx_adav80x_snd_device);
if (ret)
@@ -118,13 +113,13 @@
return ret;
}
+module_init(bf5xx_adav80x_init);
static void __exit bf5xx_adav80x_exit(void)
{
+ pr_debug("%s enter\n", __func__);
platform_device_unregister(bf5xx_adav80x_snd_device);
}
-
-module_init(bf5xx_adav80x_init);
module_exit(bf5xx_adav80x_exit);
/* Module information */
