aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/pxa
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/pxa')
-rw-r--r--sound/soc/pxa/corgi.c2
-rw-r--r--sound/soc/pxa/e800_wm9712.c2
-rw-r--r--sound/soc/pxa/em-x270.c2
-rw-r--r--sound/soc/pxa/palm27x.c2
-rw-r--r--sound/soc/pxa/poodle.c2
-rw-r--r--sound/soc/pxa/spitz.c2
-rw-r--r--sound/soc/pxa/tosa.c2
-rw-r--r--sound/soc/pxa/zylonite.c2
8 files changed, 8 insertions, 8 deletions
diff --git a/sound/soc/pxa/corgi.c b/sound/soc/pxa/corgi.c
index e56bf4b6c2af..1ba25a559524 100644
--- a/sound/soc/pxa/corgi.c
+++ b/sound/soc/pxa/corgi.c
@@ -312,6 +312,7 @@ static struct snd_soc_dai_link corgi_dai = {
312/* corgi audio machine driver */ 312/* corgi audio machine driver */
313static struct snd_soc_card snd_soc_corgi = { 313static struct snd_soc_card snd_soc_corgi = {
314 .name = "Corgi", 314 .name = "Corgi",
315 .platform = &pxa2xx_soc_platform,
315 .dai_link = &corgi_dai, 316 .dai_link = &corgi_dai,
316 .num_links = 1, 317 .num_links = 1,
317}; 318};
@@ -325,7 +326,6 @@ static struct wm8731_setup_data corgi_wm8731_setup = {
325/* corgi audio subsystem */ 326/* corgi audio subsystem */
326static struct snd_soc_device corgi_snd_devdata = { 327static struct snd_soc_device corgi_snd_devdata = {
327 .card = &snd_soc_corgi, 328 .card = &snd_soc_corgi,
328 .platform = &pxa2xx_soc_platform,
329 .codec_dev = &soc_codec_dev_wm8731, 329 .codec_dev = &soc_codec_dev_wm8731,
330 .codec_data = &corgi_wm8731_setup, 330 .codec_data = &corgi_wm8731_setup,
331}; 331};
diff --git a/sound/soc/pxa/e800_wm9712.c b/sound/soc/pxa/e800_wm9712.c
index 60c64861512a..2e3386dfa0f0 100644
--- a/sound/soc/pxa/e800_wm9712.c
+++ b/sound/soc/pxa/e800_wm9712.c
@@ -42,13 +42,13 @@ static struct snd_soc_dai_link e800_dai[] = {
42 42
43static struct snd_soc_card e800 = { 43static struct snd_soc_card e800 = {
44 .name = "Toshiba e800", 44 .name = "Toshiba e800",
45 .platform = &pxa2xx_soc_platform,
45 .dai_link = e800_dai, 46 .dai_link = e800_dai,
46 .num_links = ARRAY_SIZE(e800_dai), 47 .num_links = ARRAY_SIZE(e800_dai),
47}; 48};
48 49
49static struct snd_soc_device e800_snd_devdata = { 50static struct snd_soc_device e800_snd_devdata = {
50 .card = &e800, 51 .card = &e800,
51 .platform = &pxa2xx_soc_platform,
52 .codec_dev = &soc_codec_dev_wm9712, 52 .codec_dev = &soc_codec_dev_wm9712,
53}; 53};
54 54
diff --git a/sound/soc/pxa/em-x270.c b/sound/soc/pxa/em-x270.c
index d6884b755d55..fe4a729ea648 100644
--- a/sound/soc/pxa/em-x270.c
+++ b/sound/soc/pxa/em-x270.c
@@ -54,13 +54,13 @@ static struct snd_soc_dai_link em_x270_dai[] = {
54 54
55static struct snd_soc_card em_x270 = { 55static struct snd_soc_card em_x270 = {
56 .name = "EM-X270", 56 .name = "EM-X270",
57 .platform = &pxa2xx_soc_platform,
57 .dai_link = em_x270_dai, 58 .dai_link = em_x270_dai,
58 .num_links = ARRAY_SIZE(em_x270_dai), 59 .num_links = ARRAY_SIZE(em_x270_dai),
59}; 60};
60 61
61static struct snd_soc_device em_x270_snd_devdata = { 62static struct snd_soc_device em_x270_snd_devdata = {
62 .card = &em_x270, 63 .card = &em_x270,
63 .platform = &pxa2xx_soc_platform,
64 .codec_dev = &soc_codec_dev_wm9712, 64 .codec_dev = &soc_codec_dev_wm9712,
65}; 65};
66 66
diff --git a/sound/soc/pxa/palm27x.c b/sound/soc/pxa/palm27x.c
index 3bb8879ac8a2..4a9cf3083af0 100644
--- a/sound/soc/pxa/palm27x.c
+++ b/sound/soc/pxa/palm27x.c
@@ -191,13 +191,13 @@ static struct snd_soc_dai_link palm27x_dai[] = {
191 191
192static struct snd_soc_card palm27x_asoc = { 192static struct snd_soc_card palm27x_asoc = {
193 .name = "Palm/PXA27x", 193 .name = "Palm/PXA27x",
194 .platform = &pxa2xx_soc_platform,
194 .dai_link = palm27x_dai, 195 .dai_link = palm27x_dai,
195 .num_links = ARRAY_SIZE(palm27x_dai), 196 .num_links = ARRAY_SIZE(palm27x_dai),
196}; 197};
197 198
198static struct snd_soc_device palm27x_snd_devdata = { 199static struct snd_soc_device palm27x_snd_devdata = {
199 .card = &palm27x_asoc, 200 .card = &palm27x_asoc,
200 .platform = &pxa2xx_soc_platform,
201 .codec_dev = &soc_codec_dev_wm9712, 201 .codec_dev = &soc_codec_dev_wm9712,
202}; 202};
203 203
diff --git a/sound/soc/pxa/poodle.c b/sound/soc/pxa/poodle.c
index 03b510ab2824..6e9827189fff 100644
--- a/sound/soc/pxa/poodle.c
+++ b/sound/soc/pxa/poodle.c
@@ -278,6 +278,7 @@ static struct snd_soc_dai_link poodle_dai = {
278/* poodle audio machine driver */ 278/* poodle audio machine driver */
279static struct snd_soc_card snd_soc_poodle = { 279static struct snd_soc_card snd_soc_poodle = {
280 .name = "Poodle", 280 .name = "Poodle",
281 .platform = &pxa2xx_soc_platform,
281 .dai_link = &poodle_dai, 282 .dai_link = &poodle_dai,
282 .num_links = 1, 283 .num_links = 1,
283}; 284};
@@ -291,7 +292,6 @@ static struct wm8731_setup_data poodle_wm8731_setup = {
291/* poodle audio subsystem */ 292/* poodle audio subsystem */
292static struct snd_soc_device poodle_snd_devdata = { 293static struct snd_soc_device poodle_snd_devdata = {
293 .card = &snd_soc_poodle, 294 .card = &snd_soc_poodle,
294 .platform = &pxa2xx_soc_platform,
295 .codec_dev = &soc_codec_dev_wm8731, 295 .codec_dev = &soc_codec_dev_wm8731,
296 .codec_data = &poodle_wm8731_setup, 296 .codec_data = &poodle_wm8731_setup,
297}; 297};
diff --git a/sound/soc/pxa/spitz.c b/sound/soc/pxa/spitz.c
index 579d93368f14..a3b9e6bdf979 100644
--- a/sound/soc/pxa/spitz.c
+++ b/sound/soc/pxa/spitz.c
@@ -321,6 +321,7 @@ static struct snd_soc_dai_link spitz_dai = {
321/* spitz audio machine driver */ 321/* spitz audio machine driver */
322static struct snd_soc_card snd_soc_spitz = { 322static struct snd_soc_card snd_soc_spitz = {
323 .name = "Spitz", 323 .name = "Spitz",
324 .platform = &pxa2xx_soc_platform,
324 .dai_link = &spitz_dai, 325 .dai_link = &spitz_dai,
325 .num_links = 1, 326 .num_links = 1,
326}; 327};
@@ -334,7 +335,6 @@ static struct wm8750_setup_data spitz_wm8750_setup = {
334/* spitz audio subsystem */ 335/* spitz audio subsystem */
335static struct snd_soc_device spitz_snd_devdata = { 336static struct snd_soc_device spitz_snd_devdata = {
336 .card = &snd_soc_spitz, 337 .card = &snd_soc_spitz,
337 .platform = &pxa2xx_soc_platform,
338 .codec_dev = &soc_codec_dev_wm8750, 338 .codec_dev = &soc_codec_dev_wm8750,
339 .codec_data = &spitz_wm8750_setup, 339 .codec_data = &spitz_wm8750_setup,
340}; 340};
diff --git a/sound/soc/pxa/tosa.c b/sound/soc/pxa/tosa.c
index 48242b32a28b..c77194f74c9b 100644
--- a/sound/soc/pxa/tosa.c
+++ b/sound/soc/pxa/tosa.c
@@ -252,6 +252,7 @@ static int tosa_remove(struct platform_device *dev)
252 252
253static struct snd_soc_card tosa = { 253static struct snd_soc_card tosa = {
254 .name = "Tosa", 254 .name = "Tosa",
255 .platform = &pxa2xx_soc_platform,
255 .dai_link = tosa_dai, 256 .dai_link = tosa_dai,
256 .num_links = ARRAY_SIZE(tosa_dai), 257 .num_links = ARRAY_SIZE(tosa_dai),
257 .probe = tosa_probe, 258 .probe = tosa_probe,
@@ -260,7 +261,6 @@ static struct snd_soc_card tosa = {
260 261
261static struct snd_soc_device tosa_snd_devdata = { 262static struct snd_soc_device tosa_snd_devdata = {
262 .card = &tosa, 263 .card = &tosa,
263 .platform = &pxa2xx_soc_platform,
264 .codec_dev = &soc_codec_dev_wm9712, 264 .codec_dev = &soc_codec_dev_wm9712,
265}; 265};
266 266
diff --git a/sound/soc/pxa/zylonite.c b/sound/soc/pxa/zylonite.c
index 842d6500d61f..f8e9ecd589d3 100644
--- a/sound/soc/pxa/zylonite.c
+++ b/sound/soc/pxa/zylonite.c
@@ -175,13 +175,13 @@ static struct snd_soc_dai_link zylonite_dai[] = {
175 175
176static struct snd_soc_card zylonite = { 176static struct snd_soc_card zylonite = {
177 .name = "Zylonite", 177 .name = "Zylonite",
178 .platform = &pxa2xx_soc_platform,
178 .dai_link = zylonite_dai, 179 .dai_link = zylonite_dai,
179 .num_links = ARRAY_SIZE(zylonite_dai), 180 .num_links = ARRAY_SIZE(zylonite_dai),
180}; 181};
181 182
182static struct snd_soc_device zylonite_snd_ac97_devdata = { 183static struct snd_soc_device zylonite_snd_ac97_devdata = {
183 .card = &zylonite, 184 .card = &zylonite,
184 .platform = &pxa2xx_soc_platform,
185 .codec_dev = &soc_codec_dev_wm9713, 185 .codec_dev = &soc_codec_dev_wm9713,
186}; 186};
187 187