diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2008-12-02 11:01:14 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2008-12-02 11:03:40 -0500 |
commit | 87689d567a45f80416feea0a2aa6d3a2a6b8963a (patch) | |
tree | d33d923e9e359f3be124d0a63c30b41637b9f933 /sound/soc/atmel | |
parent | 6308419a199eed66086cd756ab8dc81b88d54a6b (diff) |
ASoC: Push platform registration down into the card
As part of the deprecation of snd_soc_device push the registration of
the platform down into the card structure.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/atmel')
-rw-r--r-- | sound/soc/atmel/playpaq_wm8510.c | 2 | ||||
-rw-r--r-- | sound/soc/atmel/sam9g20_wm8731.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/atmel/playpaq_wm8510.c b/sound/soc/atmel/playpaq_wm8510.c index d40b5a52a8d2..43dd8cee83c6 100644 --- a/sound/soc/atmel/playpaq_wm8510.c +++ b/sound/soc/atmel/playpaq_wm8510.c | |||
@@ -363,6 +363,7 @@ static struct snd_soc_dai_link playpaq_wm8510_dai = { | |||
363 | 363 | ||
364 | static struct snd_soc_card snd_soc_playpaq = { | 364 | static struct snd_soc_card snd_soc_playpaq = { |
365 | .name = "LRS_PlayPaq_WM8510", | 365 | .name = "LRS_PlayPaq_WM8510", |
366 | .platform = &at32_soc_platform, | ||
366 | .dai_link = &playpaq_wm8510_dai, | 367 | .dai_link = &playpaq_wm8510_dai, |
367 | .num_links = 1, | 368 | .num_links = 1, |
368 | }; | 369 | }; |
@@ -378,7 +379,6 @@ static struct wm8510_setup_data playpaq_wm8510_setup = { | |||
378 | 379 | ||
379 | static struct snd_soc_device playpaq_wm8510_snd_devdata = { | 380 | static struct snd_soc_device playpaq_wm8510_snd_devdata = { |
380 | .card = &snd_soc_playpaq, | 381 | .card = &snd_soc_playpaq, |
381 | .platform = &at32_soc_platform, | ||
382 | .codec_dev = &soc_codec_dev_wm8510, | 382 | .codec_dev = &soc_codec_dev_wm8510, |
383 | .codec_data = &playpaq_wm8510_setup, | 383 | .codec_data = &playpaq_wm8510_setup, |
384 | }; | 384 | }; |
diff --git a/sound/soc/atmel/sam9g20_wm8731.c b/sound/soc/atmel/sam9g20_wm8731.c index fdc1d0206e0b..1fb59a9d3719 100644 --- a/sound/soc/atmel/sam9g20_wm8731.c +++ b/sound/soc/atmel/sam9g20_wm8731.c | |||
@@ -244,6 +244,7 @@ static struct snd_soc_dai_link at91sam9g20ek_dai = { | |||
244 | 244 | ||
245 | static struct snd_soc_card snd_soc_at91sam9g20ek = { | 245 | static struct snd_soc_card snd_soc_at91sam9g20ek = { |
246 | .name = "WM8731", | 246 | .name = "WM8731", |
247 | .platform = &atmel_soc_platform, | ||
247 | .dai_link = &at91sam9g20ek_dai, | 248 | .dai_link = &at91sam9g20ek_dai, |
248 | .num_links = 1, | 249 | .num_links = 1, |
249 | }; | 250 | }; |
@@ -255,7 +256,6 @@ static struct wm8731_setup_data at91sam9g20ek_wm8731_setup = { | |||
255 | 256 | ||
256 | static struct snd_soc_device at91sam9g20ek_snd_devdata = { | 257 | static struct snd_soc_device at91sam9g20ek_snd_devdata = { |
257 | .card = &snd_soc_at91sam9g20ek, | 258 | .card = &snd_soc_at91sam9g20ek, |
258 | .platform = &atmel_soc_platform, | ||
259 | .codec_dev = &soc_codec_dev_wm8731, | 259 | .codec_dev = &soc_codec_dev_wm8731, |
260 | .codec_data = &at91sam9g20ek_wm8731_setup, | 260 | .codec_data = &at91sam9g20ek_wm8731_setup, |
261 | }; | 261 | }; |