diff options
author | Axel Lin <axel.lin@gmail.com> | 2011-12-28 07:32:42 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-02-07 14:40:53 -0500 |
commit | 6d6761aa9b36e2da18669b9948ee6849064a84e9 (patch) | |
tree | 670abb63f184c239a0f6ffaeecf717e8efcdcd41 /arch/arm/mach-kirkwood | |
parent | 49915a54f0dceeff15a5d008dc9ce7a1d25f2a98 (diff) |
ASoC: Convert kirkwood-openrd 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>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'arch/arm/mach-kirkwood')
-rw-r--r-- | arch/arm/mach-kirkwood/openrd-setup.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-kirkwood/openrd-setup.c b/arch/arm/mach-kirkwood/openrd-setup.c index 01f8c8992880..7e99c3f340fc 100644 --- a/arch/arm/mach-kirkwood/openrd-setup.c +++ b/arch/arm/mach-kirkwood/openrd-setup.c | |||
@@ -83,6 +83,11 @@ static struct i2c_board_info i2c_board_info[] __initdata = { | |||
83 | }, | 83 | }, |
84 | }; | 84 | }; |
85 | 85 | ||
86 | static struct platform_device openrd_client_audio_device = { | ||
87 | .name = "openrd-client-audio", | ||
88 | .id = -1, | ||
89 | }; | ||
90 | |||
86 | static int __initdata uart1; | 91 | static int __initdata uart1; |
87 | 92 | ||
88 | static int __init sd_uart_selection(char *str) | 93 | static int __init sd_uart_selection(char *str) |
@@ -172,6 +177,7 @@ static void __init openrd_init(void) | |||
172 | kirkwood_i2c_init(); | 177 | kirkwood_i2c_init(); |
173 | 178 | ||
174 | if (machine_is_openrd_client() || machine_is_openrd_ultimate()) { | 179 | if (machine_is_openrd_client() || machine_is_openrd_ultimate()) { |
180 | platform_device_register(&openrd_client_audio_device); | ||
175 | i2c_register_board_info(0, i2c_board_info, | 181 | i2c_register_board_info(0, i2c_board_info, |
176 | ARRAY_SIZE(i2c_board_info)); | 182 | ARRAY_SIZE(i2c_board_info)); |
177 | kirkwood_audio_init(); | 183 | kirkwood_audio_init(); |