12 files changed, 191 insertions, 190 deletions

diff --git a/sound/aoa/fabrics/layout.c b/sound/aoa/fabrics/layout.c
index 586965f9605f..7a437da05646 100644
--- a/sound/aoa/fabrics/layout.c
+++ b/sound/aoa/fabrics/layout.c
@@ -768,7 +768,7 @@ static int check_codec(struct aoa_codec *codec,
                                 "required property %s not present\n", propname);
                         return -ENODEV;
                 }
-                if (*ref != codec->node->linux_phandle) {
+                if (*ref != codec->node->phandle) {
                         printk(KERN_INFO "snd-aoa-fabric-layout: "
                                 "%s doesn't match!\n", propname);
                         return -ENODEV;
diff --git a/sound/oss/au1550_ac97.c b/sound/oss/au1550_ac97.c
index 4191acccbcdb..c1070e33b32f 100644
--- a/sound/oss/au1550_ac97.c
+++ b/sound/oss/au1550_ac97.c
@@ -614,7 +614,8 @@ start_adc(struct au1550_state *s)
         /* Put two buffers on the ring to get things started.
         */
         for (i=0; i<2; i++) {
-                au1xxx_dbdma_put_dest(db->dmanr, db->nextIn, db->dma_fragsize);
+                au1xxx_dbdma_put_dest(db->dmanr, virt_to_phys(db->nextIn),
+                                db->dma_fragsize, DDMA_FLAGS_IE);
 
                 db->nextIn += db->dma_fragsize;
                 if (db->nextIn >= db->rawbuf + db->dmasize)
@@ -732,8 +733,9 @@ static void dac_dma_interrupt(int irq, void *dev_id)
         db->dma_qcount--;
 
         if (db->count >= db->fragsize) {
-                if (au1xxx_dbdma_put_source(db->dmanr, db->nextOut,
-                                                        db->fragsize) == 0) {
+                if (au1xxx_dbdma_put_source(db->dmanr,
+                                virt_to_phys(db->nextOut), db->fragsize,
+                                DDMA_FLAGS_IE) == 0) {
                         err("qcount < 2 and no ring room!");
                 }
                 db->nextOut += db->fragsize;
@@ -777,7 +779,8 @@ static void adc_dma_interrupt(int irq, void *dev_id)
 
         /* Put a new empty buffer on the destination DMA.
         */
-        au1xxx_dbdma_put_dest(dp->dmanr, dp->nextIn, dp->dma_fragsize);
+        au1xxx_dbdma_put_dest(dp->dmanr, virt_to_phys(dp->nextIn),
+                              dp->dma_fragsize, DDMA_FLAGS_IE);
 
         dp->nextIn += dp->dma_fragsize;
         if (dp->nextIn >= dp->rawbuf + dp->dmasize)
@@ -1177,8 +1180,9 @@ au1550_write(struct file *file, const char *buffer, size_t count, loff_t * ppos)
                  * we know the dma has stopped.
                  */
                 while ((db->dma_qcount < 2) && (db->count >= db->fragsize)) {
-                        if (au1xxx_dbdma_put_source(db->dmanr, db->nextOut,
-                                                        db->fragsize) == 0) {
+                        if (au1xxx_dbdma_put_source(db->dmanr,
+                                virt_to_phys(db->nextOut), db->fragsize,
+                                DDMA_FLAGS_IE) == 0) {
                                 err("qcount < 2 and no ring room!");
                         }
                         db->nextOut += db->fragsize;
diff --git a/sound/ppc/awacs.c b/sound/ppc/awacs.c
index 2e156467b814..b36679384b27 100644
--- a/sound/ppc/awacs.c
+++ b/sound/ppc/awacs.c
@@ -751,8 +751,8 @@ static void snd_pmac_awacs_suspend(struct snd_pmac *chip)
 
 static void snd_pmac_awacs_resume(struct snd_pmac *chip)
 {
-        if (machine_is_compatible("PowerBook3,1")
-            || machine_is_compatible("PowerBook3,2")) {
+        if (of_machine_is_compatible("PowerBook3,1")
+            || of_machine_is_compatible("PowerBook3,2")) {
                 msleep(100);
                 snd_pmac_awacs_write_reg(chip, 1,
                         chip->awacs_reg[1] & ~MASK_PAROUT);
@@ -780,16 +780,16 @@ static void snd_pmac_awacs_resume(struct snd_pmac *chip)
 }
 #endif /* CONFIG_PM */
 
-#define IS_PM7500 (machine_is_compatible("AAPL,7500") \
-                || machine_is_compatible("AAPL,8500") \
-                || machine_is_compatible("AAPL,9500"))
-#define IS_PM5500 (machine_is_compatible("AAPL,e411"))
-#define IS_BEIGE (machine_is_compatible("AAPL,Gossamer"))
-#define IS_IMAC1 (machine_is_compatible("PowerMac2,1"))
-#define IS_IMAC2 (machine_is_compatible("PowerMac2,2") \
-                || machine_is_compatible("PowerMac4,1"))
-#define IS_G4AGP (machine_is_compatible("PowerMac3,1"))
-#define IS_LOMBARD (machine_is_compatible("PowerBook1,1"))
+#define IS_PM7500 (of_machine_is_compatible("AAPL,7500") \
+                || of_machine_is_compatible("AAPL,8500") \
+                || of_machine_is_compatible("AAPL,9500"))
+#define IS_PM5500 (of_machine_is_compatible("AAPL,e411"))
+#define IS_BEIGE (of_machine_is_compatible("AAPL,Gossamer"))
+#define IS_IMAC1 (of_machine_is_compatible("PowerMac2,1"))
+#define IS_IMAC2 (of_machine_is_compatible("PowerMac2,2") \
+                || of_machine_is_compatible("PowerMac4,1"))
+#define IS_G4AGP (of_machine_is_compatible("PowerMac3,1"))
+#define IS_LOMBARD (of_machine_is_compatible("PowerBook1,1"))
 
 static int imac1, imac2;
 
diff --git a/sound/ppc/burgundy.c b/sound/ppc/burgundy.c
index 0accfe49735b..1f72e1c786bf 100644
--- a/sound/ppc/burgundy.c
+++ b/sound/ppc/burgundy.c
@@ -582,7 +582,7 @@ static int snd_pmac_burgundy_detect_headphone(struct snd_pmac *chip)
 static void snd_pmac_burgundy_update_automute(struct snd_pmac *chip, int do_notify)
 {
         if (chip->auto_mute) {
-                int imac = machine_is_compatible("iMac");
+                int imac = of_machine_is_compatible("iMac");
                 int reg, oreg;
                 reg = oreg = snd_pmac_burgundy_rcb(chip,
                                 MASK_ADDR_BURGUNDY_MORE_OUTPUTENABLES);
@@ -620,7 +620,7 @@ static void snd_pmac_burgundy_update_automute(struct snd_pmac *chip, int do_noti
  */
 int __devinit snd_pmac_burgundy_init(struct snd_pmac *chip)
 {
-        int imac = machine_is_compatible("iMac");
+        int imac = of_machine_is_compatible("iMac");
         int i, err;
 
         /* Checks to see the chip is alive and kicking */
diff --git a/sound/ppc/pmac.c b/sound/ppc/pmac.c
index 7bc492ee77ec..85081172403f 100644
--- a/sound/ppc/pmac.c
+++ b/sound/ppc/pmac.c
@@ -922,11 +922,11 @@ static void __devinit detect_byte_swap(struct snd_pmac *chip)
         }
 
         /* it seems the Pismo & iBook can't byte-swap in hardware. */
-        if (machine_is_compatible("PowerBook3,1") ||
-            machine_is_compatible("PowerBook2,1"))
+        if (of_machine_is_compatible("PowerBook3,1") ||
+            of_machine_is_compatible("PowerBook2,1"))
                 chip->can_byte_swap = 0 ;
 
-        if (machine_is_compatible("PowerBook2,1"))
+        if (of_machine_is_compatible("PowerBook2,1"))
                 chip->can_duplex = 0;
 }
 
@@ -959,11 +959,11 @@ static int __devinit snd_pmac_detect(struct snd_pmac *chip)
         chip->control_mask = MASK_IEPC | MASK_IEE | 0x11; /* default */
 
         /* check machine type */
-        if (machine_is_compatible("AAPL,3400/2400")
-            || machine_is_compatible("AAPL,3500"))
+        if (of_machine_is_compatible("AAPL,3400/2400")
+            || of_machine_is_compatible("AAPL,3500"))
                 chip->is_pbook_3400 = 1;
-        else if (machine_is_compatible("PowerBook1,1")
-                 || machine_is_compatible("AAPL,PowerBook1998"))
+        else if (of_machine_is_compatible("PowerBook1,1")
+                 || of_machine_is_compatible("AAPL,PowerBook1998"))
                 chip->is_pbook_G3 = 1;
         chip->node = of_find_node_by_name(NULL, "awacs");
         sound = of_node_get(chip->node);
@@ -1033,8 +1033,8 @@ static int __devinit snd_pmac_detect(struct snd_pmac *chip)
         }
         if (of_device_is_compatible(sound, "tumbler")) {
                 chip->model = PMAC_TUMBLER;
-                chip->can_capture = machine_is_compatible("PowerMac4,2")
-                                || machine_is_compatible("PowerBook4,1");
+                chip->can_capture = of_machine_is_compatible("PowerMac4,2")
+                                || of_machine_is_compatible("PowerBook4,1");
                 chip->can_duplex = 0;
                 // chip->can_byte_swap = 0; /* FIXME: check this */
                 chip->num_freqs = ARRAY_SIZE(tumbler_freqs);
diff --git a/sound/soc/au1x/Kconfig b/sound/soc/au1x/Kconfig
index 410a893aa66b..4b67140fdec3 100644
--- a/sound/soc/au1x/Kconfig
+++ b/sound/soc/au1x/Kconfig
@@ -22,11 +22,13 @@ config SND_SOC_AU1XPSC_AC97
 ##
 ## Boards
 ##
-config SND_SOC_SAMPLE_PSC_AC97
-        tristate "Sample Au12x0/Au1550 PSC AC97 sound machine"
+config SND_SOC_DB1200
+        tristate "DB1200 AC97+I2S audio support"
         depends on SND_SOC_AU1XPSC
         select SND_SOC_AU1XPSC_AC97
         select SND_SOC_AC97_CODEC
+        select SND_SOC_AU1XPSC_I2S
+        select SND_SOC_WM8731
         help
-          This is a sample AC97 sound machine for use in Au12x0/Au1550
-          based systems which have audio on PSC1 (e.g. Db1200 demoboard).
+          Select this option to enable audio (AC97 or I2S) on the
+          Alchemy/AMD/RMI DB1200 demoboard.
diff --git a/sound/soc/au1x/Makefile b/sound/soc/au1x/Makefile
index 6c6950b8003a..16873076e8c4 100644
--- a/sound/soc/au1x/Makefile
+++ b/sound/soc/au1x/Makefile
@@ -8,6 +8,6 @@ obj-$(CONFIG_SND_SOC_AU1XPSC_I2S) += snd-soc-au1xpsc-i2s.o
 obj-$(CONFIG_SND_SOC_AU1XPSC_AC97) += snd-soc-au1xpsc-ac97.o
 
 # Boards
-snd-soc-sample-ac97-objs := sample-ac97.o
+snd-soc-db1200-objs := db1200.o
 
-obj-$(CONFIG_SND_SOC_SAMPLE_PSC_AC97) += snd-soc-sample-ac97.o
+obj-$(CONFIG_SND_SOC_DB1200) += snd-soc-db1200.o
diff --git a/sound/soc/au1x/db1200.c b/sound/soc/au1x/db1200.c
new file mode 100644
index 000000000000..cdf7be1b9b91
--- /dev/null
+++ b/sound/soc/au1x/db1200.c
@@ -0,0 +1,141 @@
+/*
+ * DB1200 ASoC audio fabric support code.
+ *
+ * (c) 2008-9 Manuel Lauss <manuel.lauss@gmail.com>
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/timer.h>
+#include <linux/interrupt.h>
+#include <linux/platform_device.h>
+#include <sound/core.h>
+#include <sound/pcm.h>
+#include <sound/soc.h>
+#include <sound/soc-dapm.h>
+#include <asm/mach-au1x00/au1000.h>
+#include <asm/mach-au1x00/au1xxx_psc.h>
+#include <asm/mach-au1x00/au1xxx_dbdma.h>
+#include <asm/mach-db1x00/bcsr.h>
+
+#include "../codecs/ac97.h"
+#include "../codecs/wm8731.h"
+#include "psc.h"
+
+/*-------------------------  AC97 PART  ---------------------------*/
+
+static struct snd_soc_dai_link db1200_ac97_dai = {
+        .name           = "AC97",
+        .stream_name    = "AC97 HiFi",
+        .cpu_dai        = &au1xpsc_ac97_dai,
+        .codec_dai      = &ac97_dai,
+};
+
+static struct snd_soc_card db1200_ac97_machine = {
+        .name           = "DB1200_AC97",
+        .dai_link       = &db1200_ac97_dai,
+        .num_links      = 1,
+        .platform       = &au1xpsc_soc_platform,
+};
+
+static struct snd_soc_device db1200_ac97_devdata = {
+        .card           = &db1200_ac97_machine,
+        .codec_dev      = &soc_codec_dev_ac97,
+};
+
+/*-------------------------  I2S PART  ---------------------------*/
+
+static int db1200_i2s_startup(struct snd_pcm_substream *substream)
+{
+        struct snd_soc_pcm_runtime *rtd = substream->private_data;
+        struct snd_soc_dai *codec_dai = rtd->dai->codec_dai;
+        struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai;
+        int ret;
+
+        /* WM8731 has its own 12MHz crystal */
+        snd_soc_dai_set_sysclk(codec_dai, WM8731_SYSCLK,
+                                12000000, SND_SOC_CLOCK_IN);
+
+        /* codec is bitclock and lrclk master */
+        ret = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_LEFT_J |
+                        SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBM_CFM);
+        if (ret < 0)
+                goto out;
+
+        ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_LEFT_J |
+                        SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBM_CFM);
+        if (ret < 0)
+                goto out;
+
+        ret = 0;
+out:
+        return ret;
+}
+
+static struct snd_soc_ops db1200_i2s_wm8731_ops = {
+        .startup        = db1200_i2s_startup,
+};
+
+static struct snd_soc_dai_link db1200_i2s_dai = {
+        .name           = "WM8731",
+        .stream_name    = "WM8731 PCM",
+        .cpu_dai        = &au1xpsc_i2s_dai,
+        .codec_dai      = &wm8731_dai,
+        .ops            = &db1200_i2s_wm8731_ops,
+};
+
+static struct snd_soc_card db1200_i2s_machine = {
+        .name           = "DB1200_I2S",
+        .dai_link       = &db1200_i2s_dai,
+        .num_links      = 1,
+        .platform       = &au1xpsc_soc_platform,
+};
+
+static struct snd_soc_device db1200_i2s_devdata = {
+        .card           = &db1200_i2s_machine,
+        .codec_dev      = &soc_codec_dev_wm8731,
+};
+
+/*-------------------------  COMMON PART  ---------------------------*/
+
+static struct platform_device *db1200_asoc_dev;
+
+static int __init db1200_audio_load(void)
+{
+        int ret;
+
+        ret = -ENOMEM;
+        db1200_asoc_dev = platform_device_alloc("soc-audio", -1);
+        if (!db1200_asoc_dev)
+                goto out;
+
+        /* DB1200 board setup set PSC1MUX to preferred audio device */
+        if (bcsr_read(BCSR_RESETS) & BCSR_RESETS_PSC1MUX)
+                platform_set_drvdata(db1200_asoc_dev, &db1200_i2s_devdata);
+        else
+                platform_set_drvdata(db1200_asoc_dev, &db1200_ac97_devdata);
+
+        db1200_ac97_devdata.dev = &db1200_asoc_dev->dev;
+        db1200_i2s_devdata.dev = &db1200_asoc_dev->dev;
+        ret = platform_device_add(db1200_asoc_dev);
+
+        if (ret) {
+                platform_device_put(db1200_asoc_dev);
+                db1200_asoc_dev = NULL;
+        }
+out:
+        return ret;
+}
+
+static void __exit db1200_audio_unload(void)
+{
+        platform_device_unregister(db1200_asoc_dev);
+}
+
+module_init(db1200_audio_load);
+module_exit(db1200_audio_unload);
+
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("DB1200 ASoC audio support");
+MODULE_AUTHOR("Manuel Lauss");
diff --git a/sound/soc/au1x/dbdma2.c b/sound/soc/au1x/dbdma2.c
index 19e4d37eba1c..6d9f4c624949 100644
--- a/sound/soc/au1x/dbdma2.c
+++ b/sound/soc/au1x/dbdma2.c
@@ -51,8 +51,8 @@ struct au1xpsc_audio_dmadata {
         struct snd_pcm_substream *substream;
         unsigned long curr_period;      /* current segment DDMA is working on */
         unsigned long q_period;         /* queue period(s) */
-        unsigned long dma_area;         /* address of queued DMA area */
-        unsigned long dma_area_s;       /* start address of DMA area */
+        dma_addr_t dma_area;            /* address of queued DMA area */
+        dma_addr_t dma_area_s;          /* start address of DMA area */
         unsigned long pos;              /* current byte position being played */
         unsigned long periods;          /* number of SG segments in total */
         unsigned long period_bytes;     /* size in bytes of one SG segment */
@@ -94,8 +94,7 @@ static const struct snd_pcm_hardware au1xpsc_pcm_hardware = {
 
 static void au1x_pcm_queue_tx(struct au1xpsc_audio_dmadata *cd)
 {
-        au1xxx_dbdma_put_source_flags(cd->ddma_chan,
-                                (void *)phys_to_virt(cd->dma_area),
+        au1xxx_dbdma_put_source(cd->ddma_chan, cd->dma_area,
                                 cd->period_bytes, DDMA_FLAGS_IE);
 
         /* update next-to-queue period */
@@ -109,9 +108,8 @@ static void au1x_pcm_queue_tx(struct au1xpsc_audio_dmadata *cd)
 
 static void au1x_pcm_queue_rx(struct au1xpsc_audio_dmadata *cd)
 {
-        au1xxx_dbdma_put_dest_flags(cd->ddma_chan,
-                                (void *)phys_to_virt(cd->dma_area),
-                                cd->period_bytes, DDMA_FLAGS_IE);
+        au1xxx_dbdma_put_dest(cd->ddma_chan, cd->dma_area,
+                              cd->period_bytes, DDMA_FLAGS_IE);
 
         /* update next-to-queue period */
         ++cd->q_period;
@@ -233,7 +231,7 @@ static int au1xpsc_pcm_hw_params(struct snd_pcm_substream *substream,
         pcd->substream = substream;
         pcd->period_bytes = params_period_bytes(params);
         pcd->periods = params_periods(params);
-        pcd->dma_area_s = pcd->dma_area = (unsigned long)runtime->dma_addr;
+        pcd->dma_area_s = pcd->dma_area = runtime->dma_addr;
         pcd->q_period = 0;
         pcd->curr_period = 0;
         pcd->pos = 0;
diff --git a/sound/soc/au1x/sample-ac97.c b/sound/soc/au1x/sample-ac97.c
deleted file mode 100644
index 27683eb7905e..000000000000
--- a/sound/soc/au1x/sample-ac97.c
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Sample Au12x0/Au1550 PSC AC97 sound machine.
- *
- * Copyright (c) 2007-2008 Manuel Lauss <mano@roarinelk.homelinux.net>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms outlined in the file COPYING at the root of this
- *  source archive.
- *
- * This is a very generic AC97 sound machine driver for boards which
- * have (AC97) audio at PSC1 (e.g. DB1200 demoboards).
- */
-
-#include <linux/module.h>
-#include <linux/moduleparam.h>
-#include <linux/timer.h>
-#include <linux/interrupt.h>
-#include <linux/platform_device.h>
-#include <sound/core.h>
-#include <sound/pcm.h>
-#include <sound/soc.h>
-#include <sound/soc-dapm.h>
-#include <asm/mach-au1x00/au1000.h>
-#include <asm/mach-au1x00/au1xxx_psc.h>
-#include <asm/mach-au1x00/au1xxx_dbdma.h>
-
-#include "../codecs/ac97.h"
-#include "psc.h"
-
-static int au1xpsc_sample_ac97_init(struct snd_soc_codec *codec)
-{
-        snd_soc_dapm_sync(codec);
-        return 0;
-}
-
-static struct snd_soc_dai_link au1xpsc_sample_ac97_dai = {
-        .name           = "AC97",
-        .stream_name    = "AC97 HiFi",
-        .cpu_dai        = &au1xpsc_ac97_dai,    /* see psc-ac97.c */
-        .codec_dai      = &ac97_dai,            /* see codecs/ac97.c */
-        .init           = au1xpsc_sample_ac97_init,
-        .ops            = NULL,
-};
-
-static struct snd_soc_card au1xpsc_sample_ac97_machine = {
-        .name           = "Au1xxx PSC AC97 Audio",
-        .dai_link       = &au1xpsc_sample_ac97_dai,
-        .num_links      = 1,
-};
-
-static struct snd_soc_device au1xpsc_sample_ac97_devdata = {
-        .card           = &au1xpsc_sample_ac97_machine,
-        .platform       = &au1xpsc_soc_platform, /* see dbdma2.c */
-        .codec_dev      = &soc_codec_dev_ac97,
-};
-
-static struct resource au1xpsc_psc1_res[] = {
-        [0] = {
-                .start  = CPHYSADDR(PSC1_BASE_ADDR),
-                .end    = CPHYSADDR(PSC1_BASE_ADDR) + 0x000fffff,
-                .flags  = IORESOURCE_MEM,
-        },
-        [1] = {
-#ifdef CONFIG_SOC_AU1200
-                .start  = AU1200_PSC1_INT,
-                .end    = AU1200_PSC1_INT,
-#elif defined(CONFIG_SOC_AU1550)
-                .start  = AU1550_PSC1_INT,
-                .end    = AU1550_PSC1_INT,
-#endif
-                .flags  = IORESOURCE_IRQ,
-        },
-        [2] = {
-                .start  = DSCR_CMD0_PSC1_TX,
-                .end    = DSCR_CMD0_PSC1_TX,
-                .flags  = IORESOURCE_DMA,
-        },
-        [3] = {
-                .start  = DSCR_CMD0_PSC1_RX,
-                .end    = DSCR_CMD0_PSC1_RX,
-                .flags  = IORESOURCE_DMA,
-        },
-};
-
-static struct platform_device *au1xpsc_sample_ac97_dev;
-
-static int __init au1xpsc_sample_ac97_load(void)
-{
-        int ret;
-
-#ifdef CONFIG_SOC_AU1200
-        unsigned long io;
-
-        /* modify sys_pinfunc for AC97 on PSC1 */
-        io = au_readl(SYS_PINFUNC);
-        io |= SYS_PINFUNC_P1C;
-        io &= ~(SYS_PINFUNC_P1A | SYS_PINFUNC_P1B);
-        au_writel(io, SYS_PINFUNC);
-        au_sync();
-#endif
-
-        ret = -ENOMEM;
-
-        /* setup PSC clock source for AC97 part: external clock provided
-         * by codec.  The psc-ac97.c driver depends on this setting!
-         */
-        au_writel(PSC_SEL_CLK_SERCLK, PSC1_BASE_ADDR + PSC_SEL_OFFSET);
-        au_sync();
-
-        au1xpsc_sample_ac97_dev = platform_device_alloc("soc-audio", -1);
-        if (!au1xpsc_sample_ac97_dev)
-                goto out;
-
-        au1xpsc_sample_ac97_dev->resource =
-                kmemdup(au1xpsc_psc1_res, sizeof(struct resource) *
-                        ARRAY_SIZE(au1xpsc_psc1_res), GFP_KERNEL);
-        au1xpsc_sample_ac97_dev->num_resources = ARRAY_SIZE(au1xpsc_psc1_res);
-        au1xpsc_sample_ac97_dev->id = 1;
-
-        platform_set_drvdata(au1xpsc_sample_ac97_dev,
-                             &au1xpsc_sample_ac97_devdata);
-        au1xpsc_sample_ac97_devdata.dev = &au1xpsc_sample_ac97_dev->dev;
-        ret = platform_device_add(au1xpsc_sample_ac97_dev);
-
-        if (ret) {
-                platform_device_put(au1xpsc_sample_ac97_dev);
-                au1xpsc_sample_ac97_dev = NULL;
-        }
-
-out:
-        return ret;
-}
-
-static void __exit au1xpsc_sample_ac97_exit(void)
-{
-        platform_device_unregister(au1xpsc_sample_ac97_dev);
-}
-
-module_init(au1xpsc_sample_ac97_load);
-module_exit(au1xpsc_sample_ac97_exit);
-
-MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("Au1xxx PSC sample AC97 machine");
-MODULE_AUTHOR("Manuel Lauss <mano@roarinelk.homelinux.net>");
diff --git a/sound/soc/fsl/efika-audio-fabric.c b/sound/soc/fsl/efika-audio-fabric.c
index 3326e2a1e863..1a5b8e0d6a34 100644
--- a/sound/soc/fsl/efika-audio-fabric.c
+++ b/sound/soc/fsl/efika-audio-fabric.c
@@ -55,7 +55,7 @@ static __init int efika_fabric_init(void)
         struct platform_device *pdev;
         int rc;
 
-        if (!machine_is_compatible("bplan,efika"))
+        if (!of_machine_is_compatible("bplan,efika"))
                 return -ENODEV;
 
         card.platform = &mpc5200_audio_dma_platform;
diff --git a/sound/soc/fsl/pcm030-audio-fabric.c b/sound/soc/fsl/pcm030-audio-fabric.c
index b928ef7d28eb..6644cba7cbf2 100644
--- a/sound/soc/fsl/pcm030-audio-fabric.c
+++ b/sound/soc/fsl/pcm030-audio-fabric.c
@@ -55,7 +55,7 @@ static __init int pcm030_fabric_init(void)
         struct platform_device *pdev;
         int rc;
 
-        if (!machine_is_compatible("phytec,pcm030"))
+        if (!of_machine_is_compatible("phytec,pcm030"))
                 return -ENODEV;
 
         card.platform = &mpc5200_audio_dma_platform;