---

yaml --- r: 230322 b: refs/heads/master c: 806bfed h: refs/heads/master v: v3
git-mirror · Dec 1, 2010 · 85d820e · 85d820e
1 parent 22fff68
commit 85d820e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 437f6a2b25becc0a2c2cfe02ce78d65a4957e5d8
+refs/heads/master: 806bfedfb124b85d2e2b8ecdb8a451b23abed386
diff --git a/trunk/sound/soc/sh/fsi-ak4642.c b/trunk/sound/soc/sh/fsi-ak4642.c
@@ -14,6 +14,7 @@
 
 struct fsi_ak4642_data {
 	const char *name;
+	const char *card;
 	const char *cpu_dai;
 	const char *codec;
 	const char *platform;
@@ -39,7 +40,6 @@ static struct snd_soc_dai_link fsi_dai_link = {
 };
 
 static struct snd_soc_card fsi_soc_card  = {
-	.name		= "FSI (AK4642)",
 	.dai_link	= &fsi_dai_link,
 	.num_links	= 1,
 };
@@ -69,6 +69,7 @@ static int fsi_ak4642_probe(struct platform_device *pdev)
 	fsi_dai_link.cpu_dai_name	= pdata->cpu_dai;
 	fsi_dai_link.platform_name	= pdata->platform;
 	fsi_dai_link.codec_name		= pdata->codec;
+	fsi_soc_card.name		= pdata->card;
 
 	platform_set_drvdata(fsi_snd_device, &fsi_soc_card);
 	ret = platform_device_add(fsi_snd_device);
@@ -88,55 +89,63 @@ static int fsi_ak4642_remove(struct platform_device *pdev)
 
 static struct fsi_ak4642_data fsi_a_ak4642 = {
 	.name		= "AK4642",
+	.card		= "FSIA (AK4642)",
 	.cpu_dai	= "fsia-dai",
 	.codec		= "ak4642-codec.0-0012",
 	.platform	= "sh_fsi.0",
 };
 
 static struct fsi_ak4642_data fsi_b_ak4642 = {
 	.name		= "AK4642",
+	.card		= "FSIB (AK4642)",
 	.cpu_dai	= "fsib-dai",
 	.codec		= "ak4642-codec.0-0012",
 	.platform	= "sh_fsi.0",
 };
 
 static struct fsi_ak4642_data fsi_a_ak4643 = {
 	.name		= "AK4643",
+	.card		= "FSIA (AK4643)",
 	.cpu_dai	= "fsia-dai",
 	.codec		= "ak4642-codec.0-0013",
 	.platform	= "sh_fsi.0",
 };
 
 static struct fsi_ak4642_data fsi_b_ak4643 = {
 	.name		= "AK4643",
+	.card		= "FSIB (AK4643)",
 	.cpu_dai	= "fsib-dai",
 	.codec		= "ak4642-codec.0-0013",
 	.platform	= "sh_fsi.0",
 };
 
 static struct fsi_ak4642_data fsi2_a_ak4642 = {
 	.name		= "AK4642",
+	.card		= "FSI2A (AK4642)",
 	.cpu_dai	= "fsia-dai",
 	.codec		= "ak4642-codec.0-0012",
 	.platform	= "sh_fsi2",
 };
 
 static struct fsi_ak4642_data fsi2_b_ak4642 = {
 	.name		= "AK4642",
+	.card		= "FSI2B (AK4642)",
 	.cpu_dai	= "fsib-dai",
 	.codec		= "ak4642-codec.0-0012",
 	.platform	= "sh_fsi2",
 };
 
 static struct fsi_ak4642_data fsi2_a_ak4643 = {
 	.name		= "AK4643",
+	.card		= "FSI2A (AK4643)",
 	.cpu_dai	= "fsia-dai",
 	.codec		= "ak4642-codec.0-0013",
 	.platform	= "sh_fsi2",
 };
 
 static struct fsi_ak4642_data fsi2_b_ak4643 = {
 	.name		= "AK4643",
+	.card		= "FSI2B (AK4643)",
 	.cpu_dai	= "fsib-dai",
 	.codec		= "ak4642-codec.0-0013",
 	.platform	= "sh_fsi2",