ASoC: ams-delta: Convert to use snd_soc_register_card()

The old method of registering with the ASoC core by creating a
"soc-audio" platform device no longer works for Amstrad Delta sound card
after recent changes to drvdata handling (commit
0998d0631001288a5974afc0b2a5f568bcdecb4d, 'device-core: Ensure drvdata =
NULL when no driver is bound'.

Use snd_soc_register_card() method instead, as suggested by the ASoC
core generated warning message, and move both the card and codec
platform device registration to the arch board file where those belong.

Created and tested against linux-3.6-rc5.

Signed-off-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

1 files changed, 12 insertions, 0 deletions

diff --git a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c
index c53469802c03..5ab9c6bdce84 100644
--- a/arch/arm/mach-omap1/board-ams-delta.c
+++ b/arch/arm/mach-omap1/board-ams-delta.c
@@ -444,16 +444,28 @@ static struct omap1_cam_platform_data ams_delta_camera_platform_data = {
         .lclk_khz_max   = 1334,         /* results in 5fps CIF, 10fps QCIF */
 };
 
+static struct platform_device ams_delta_audio_device = {
+        .name   = "ams-delta-audio",
+        .id     = -1,
+};
+
+static struct platform_device cx20442_codec_device = {
+        .name   = "cx20442-codec",
+        .id     = -1,
+};
+
 static struct platform_device *ams_delta_devices[] __initdata = {
         &latch1_gpio_device,
         &latch2_gpio_device,
         &ams_delta_kp_device,
         &ams_delta_camera_device,
+        &ams_delta_audio_device,
 };
 
 static struct platform_device *late_devices[] __initdata = {
         &ams_delta_nand_device,
         &ams_delta_lcd_device,
+        &cx20442_codec_device,
 };
 
 static void __init ams_delta_init(void)