summaryrefslogtreecommitdiffstats
path: root/arch/mips/jz4740
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2012-01-06 11:30:10 +0800
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-01-20 13:58:29 +0000
commitb33005f3ef6a85be3202ee1b8a2513ed1ef4019d (patch)
treefd8d00e704125e71c77f8cdc2d5b26636b7cd32e /arch/mips/jz4740
parentcef6d1d450ba217dc173a83a50d12de9aaa32bb6 (diff)
downloadop-kernel-dev-b33005f3ef6a85be3202ee1b8a2513ed1ef4019d.zip
op-kernel-dev-b33005f3ef6a85be3202ee1b8a2513ed1ef4019d.tar.gz
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/jz4740')
-rw-r--r--arch/mips/jz4740/board-qi_lb60.c6
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 639e3ce..9a91fe9 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 = {
},
};
+/* audio */
+static struct platform_device qi_lb60_audio_device = {
+ .name = "qi-lb60-audio",
+ .id = -1,
+};
static struct platform_device *jz_platform_devices[] __initdata = {
&jz4740_udc_device,
@@ -434,6 +439,7 @@ static struct platform_device *jz_platform_devices[] __initdata = {
&qi_lb60_gpio_keys,
&qi_lb60_pwm_beeper,
&qi_lb60_charger_device,
+ &qi_lb60_audio_device,
};
static void __init board_gpio_setup(void)
OpenPOWER on IntegriCloud