diff options
author | Axel Lin <axel.lin@gmail.com> | 2012-01-05 22:30:10 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-01-20 08:58:29 -0500 |
commit | b33005f3ef6a85be3202ee1b8a2513ed1ef4019d (patch) | |
tree | fd8d00e704125e71c77f8cdc2d5b26636b7cd32e /arch/mips | |
parent | cef6d1d450ba217dc173a83a50d12de9aaa32bb6 (diff) |
ASoC: jz4740: Convert qi_lb60 to use snd_soc_register_card()
Use snd_soc_register_card() instead of creating a "soc-audio" platform device.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'arch/mips')
-rw-r--r-- | arch/mips/jz4740/board-qi_lb60.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/mips/jz4740/board-qi_lb60.c b/arch/mips/jz4740/board-qi_lb60.c index 639e3ce6c264..9a91fe9de696 100644 --- a/arch/mips/jz4740/board-qi_lb60.c +++ b/arch/mips/jz4740/board-qi_lb60.c | |||
@@ -418,6 +418,11 @@ static struct platform_device qi_lb60_charger_device = { | |||
418 | }, | 418 | }, |
419 | }; | 419 | }; |
420 | 420 | ||
421 | /* audio */ | ||
422 | static struct platform_device qi_lb60_audio_device = { | ||
423 | .name = "qi-lb60-audio", | ||
424 | .id = -1, | ||
425 | }; | ||
421 | 426 | ||
422 | static struct platform_device *jz_platform_devices[] __initdata = { | 427 | static struct platform_device *jz_platform_devices[] __initdata = { |
423 | &jz4740_udc_device, | 428 | &jz4740_udc_device, |
@@ -434,6 +439,7 @@ static struct platform_device *jz_platform_devices[] __initdata = { | |||
434 | &qi_lb60_gpio_keys, | 439 | &qi_lb60_gpio_keys, |
435 | &qi_lb60_pwm_beeper, | 440 | &qi_lb60_pwm_beeper, |
436 | &qi_lb60_charger_device, | 441 | &qi_lb60_charger_device, |
442 | &qi_lb60_audio_device, | ||
437 | }; | 443 | }; |
438 | 444 | ||
439 | static void __init board_gpio_setup(void) | 445 | static void __init board_gpio_setup(void) |