ASoC: au1x: update db1200 machine to the new way of things

The use of the "soc-audio" platform device is no longer en vogue,
update the code to the newer, simpler way of doing things.

Signed-off-by: Manuel Lauss <manuel.lauss@googlemail.com>
Acked-by: Ralf Baechle <ralf@linux-mips.org>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

1 files changed, 10 insertions, 0 deletions

diff --git a/arch/mips/alchemy/devboards/db1200/platform.c b/arch/mips/alchemy/devboards/db1200/platform.c
index cfb71aed4cb9..dda090bf74e6 100644
--- a/arch/mips/alchemy/devboards/db1200/platform.c
+++ b/arch/mips/alchemy/devboards/db1200/platform.c
@@ -422,6 +422,7 @@ static struct resource au1200_psc1_res[] = {
         },
 };
 
+/* AC97 or I2S device */
 static struct platform_device db1200_audio_dev = {
         /* name assigned later based on switch setting */
         .id             = 1,    /* PSC ID */
@@ -429,6 +430,12 @@ static struct platform_device db1200_audio_dev = {
         .resource       = au1200_psc1_res,
 };
 
+/* DB1200 ASoC card device */
+static struct platform_device db1200_sound_dev = {
+        /* name assigned later based on switch setting */
+        .id             = 1,    /* PSC ID */
+};
+
 static struct platform_device db1200_stac_dev = {
         .name           = "ac97-codec",
         .id             = 1,    /* on PSC1 */
@@ -448,6 +455,7 @@ static struct platform_device *db1200_devs[] __initdata = {
         &db1200_audiodma_dev,
         &db1200_audio_dev,
         &db1200_stac_dev,
+        &db1200_sound_dev,
 };
 
 static int __init db1200_dev_init(void)
@@ -507,10 +515,12 @@ static int __init db1200_dev_init(void)
         if (sw == BCSR_SWITCHES_DIP_8) {
                 bcsr_mod(BCSR_RESETS, 0, BCSR_RESETS_PSC1MUX);
                 db1200_audio_dev.name = "au1xpsc_i2s";
+                db1200_sound_dev.name = "db1200-i2s";
                 printk(KERN_INFO " S6.7 ON : PSC1 mode I2S\n");
         } else {
                 bcsr_mod(BCSR_RESETS, BCSR_RESETS_PSC1MUX, 0);
                 db1200_audio_dev.name = "au1xpsc_ac97";
+                db1200_sound_dev.name = "db1200-ac97";
                 printk(KERN_INFO " S6.7 OFF: PSC1 mode AC97\n");
         }