diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2010-12-01 01:50:52 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-12-01 06:49:58 -0500 |
commit | 806bfedfb124b85d2e2b8ecdb8a451b23abed386 (patch) | |
tree | 3612008731dc3070281f2f29587c39fd256a2083 /sound/soc/sh | |
parent | 437f6a2b25becc0a2c2cfe02ce78d65a4957e5d8 (diff) |
ASoC: sh: fsi-ak4642: midify card name
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/sh')
-rw-r--r-- | sound/soc/sh/fsi-ak4642.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/sound/soc/sh/fsi-ak4642.c b/sound/soc/sh/fsi-ak4642.c index 839ba6cc2120..a14820ac9665 100644 --- a/sound/soc/sh/fsi-ak4642.c +++ b/sound/soc/sh/fsi-ak4642.c | |||
@@ -14,6 +14,7 @@ | |||
14 | 14 | ||
15 | struct fsi_ak4642_data { | 15 | struct fsi_ak4642_data { |
16 | const char *name; | 16 | const char *name; |
17 | const char *card; | ||
17 | const char *cpu_dai; | 18 | const char *cpu_dai; |
18 | const char *codec; | 19 | const char *codec; |
19 | const char *platform; | 20 | const char *platform; |
@@ -39,7 +40,6 @@ static struct snd_soc_dai_link fsi_dai_link = { | |||
39 | }; | 40 | }; |
40 | 41 | ||
41 | static struct snd_soc_card fsi_soc_card = { | 42 | static struct snd_soc_card fsi_soc_card = { |
42 | .name = "FSI (AK4642)", | ||
43 | .dai_link = &fsi_dai_link, | 43 | .dai_link = &fsi_dai_link, |
44 | .num_links = 1, | 44 | .num_links = 1, |
45 | }; | 45 | }; |
@@ -69,6 +69,7 @@ static int fsi_ak4642_probe(struct platform_device *pdev) | |||
69 | fsi_dai_link.cpu_dai_name = pdata->cpu_dai; | 69 | fsi_dai_link.cpu_dai_name = pdata->cpu_dai; |
70 | fsi_dai_link.platform_name = pdata->platform; | 70 | fsi_dai_link.platform_name = pdata->platform; |
71 | fsi_dai_link.codec_name = pdata->codec; | 71 | fsi_dai_link.codec_name = pdata->codec; |
72 | fsi_soc_card.name = pdata->card; | ||
72 | 73 | ||
73 | platform_set_drvdata(fsi_snd_device, &fsi_soc_card); | 74 | platform_set_drvdata(fsi_snd_device, &fsi_soc_card); |
74 | ret = platform_device_add(fsi_snd_device); | 75 | ret = platform_device_add(fsi_snd_device); |
@@ -88,6 +89,7 @@ static int fsi_ak4642_remove(struct platform_device *pdev) | |||
88 | 89 | ||
89 | static struct fsi_ak4642_data fsi_a_ak4642 = { | 90 | static struct fsi_ak4642_data fsi_a_ak4642 = { |
90 | .name = "AK4642", | 91 | .name = "AK4642", |
92 | .card = "FSIA (AK4642)", | ||
91 | .cpu_dai = "fsia-dai", | 93 | .cpu_dai = "fsia-dai", |
92 | .codec = "ak4642-codec.0-0012", | 94 | .codec = "ak4642-codec.0-0012", |
93 | .platform = "sh_fsi.0", | 95 | .platform = "sh_fsi.0", |
@@ -95,6 +97,7 @@ static struct fsi_ak4642_data fsi_a_ak4642 = { | |||
95 | 97 | ||
96 | static struct fsi_ak4642_data fsi_b_ak4642 = { | 98 | static struct fsi_ak4642_data fsi_b_ak4642 = { |
97 | .name = "AK4642", | 99 | .name = "AK4642", |
100 | .card = "FSIB (AK4642)", | ||
98 | .cpu_dai = "fsib-dai", | 101 | .cpu_dai = "fsib-dai", |
99 | .codec = "ak4642-codec.0-0012", | 102 | .codec = "ak4642-codec.0-0012", |
100 | .platform = "sh_fsi.0", | 103 | .platform = "sh_fsi.0", |
@@ -102,6 +105,7 @@ static struct fsi_ak4642_data fsi_b_ak4642 = { | |||
102 | 105 | ||
103 | static struct fsi_ak4642_data fsi_a_ak4643 = { | 106 | static struct fsi_ak4642_data fsi_a_ak4643 = { |
104 | .name = "AK4643", | 107 | .name = "AK4643", |
108 | .card = "FSIA (AK4643)", | ||
105 | .cpu_dai = "fsia-dai", | 109 | .cpu_dai = "fsia-dai", |
106 | .codec = "ak4642-codec.0-0013", | 110 | .codec = "ak4642-codec.0-0013", |
107 | .platform = "sh_fsi.0", | 111 | .platform = "sh_fsi.0", |
@@ -109,6 +113,7 @@ static struct fsi_ak4642_data fsi_a_ak4643 = { | |||
109 | 113 | ||
110 | static struct fsi_ak4642_data fsi_b_ak4643 = { | 114 | static struct fsi_ak4642_data fsi_b_ak4643 = { |
111 | .name = "AK4643", | 115 | .name = "AK4643", |
116 | .card = "FSIB (AK4643)", | ||
112 | .cpu_dai = "fsib-dai", | 117 | .cpu_dai = "fsib-dai", |
113 | .codec = "ak4642-codec.0-0013", | 118 | .codec = "ak4642-codec.0-0013", |
114 | .platform = "sh_fsi.0", | 119 | .platform = "sh_fsi.0", |
@@ -116,6 +121,7 @@ static struct fsi_ak4642_data fsi_b_ak4643 = { | |||
116 | 121 | ||
117 | static struct fsi_ak4642_data fsi2_a_ak4642 = { | 122 | static struct fsi_ak4642_data fsi2_a_ak4642 = { |
118 | .name = "AK4642", | 123 | .name = "AK4642", |
124 | .card = "FSI2A (AK4642)", | ||
119 | .cpu_dai = "fsia-dai", | 125 | .cpu_dai = "fsia-dai", |
120 | .codec = "ak4642-codec.0-0012", | 126 | .codec = "ak4642-codec.0-0012", |
121 | .platform = "sh_fsi2", | 127 | .platform = "sh_fsi2", |
@@ -123,6 +129,7 @@ static struct fsi_ak4642_data fsi2_a_ak4642 = { | |||
123 | 129 | ||
124 | static struct fsi_ak4642_data fsi2_b_ak4642 = { | 130 | static struct fsi_ak4642_data fsi2_b_ak4642 = { |
125 | .name = "AK4642", | 131 | .name = "AK4642", |
132 | .card = "FSI2B (AK4642)", | ||
126 | .cpu_dai = "fsib-dai", | 133 | .cpu_dai = "fsib-dai", |
127 | .codec = "ak4642-codec.0-0012", | 134 | .codec = "ak4642-codec.0-0012", |
128 | .platform = "sh_fsi2", | 135 | .platform = "sh_fsi2", |
@@ -130,6 +137,7 @@ static struct fsi_ak4642_data fsi2_b_ak4642 = { | |||
130 | 137 | ||
131 | static struct fsi_ak4642_data fsi2_a_ak4643 = { | 138 | static struct fsi_ak4642_data fsi2_a_ak4643 = { |
132 | .name = "AK4643", | 139 | .name = "AK4643", |
140 | .card = "FSI2A (AK4643)", | ||
133 | .cpu_dai = "fsia-dai", | 141 | .cpu_dai = "fsia-dai", |
134 | .codec = "ak4642-codec.0-0013", | 142 | .codec = "ak4642-codec.0-0013", |
135 | .platform = "sh_fsi2", | 143 | .platform = "sh_fsi2", |
@@ -137,6 +145,7 @@ static struct fsi_ak4642_data fsi2_a_ak4643 = { | |||
137 | 145 | ||
138 | static struct fsi_ak4642_data fsi2_b_ak4643 = { | 146 | static struct fsi_ak4642_data fsi2_b_ak4643 = { |
139 | .name = "AK4643", | 147 | .name = "AK4643", |
148 | .card = "FSI2B (AK4643)", | ||
140 | .cpu_dai = "fsib-dai", | 149 | .cpu_dai = "fsib-dai", |
141 | .codec = "ak4642-codec.0-0013", | 150 | .codec = "ak4642-codec.0-0013", |
142 | .platform = "sh_fsi2", | 151 | .platform = "sh_fsi2", |