9 files changed, 627 insertions, 65 deletions

diff --git a/sound/soc/ep93xx/Kconfig b/sound/soc/ep93xx/Kconfig
index f617f560f46b..57429041189c 100644
--- a/sound/soc/ep93xx/Kconfig
+++ b/sound/soc/ep93xx/Kconfig
@@ -3,11 +3,16 @@ config SND_EP93XX_SOC
         depends on ARCH_EP93XX && SND_SOC
         help
           Say Y or M if you want to add support for codecs attached to
-          the EP93xx I2S interface.
+          the EP93xx I2S or AC97 interfaces.
 
 config SND_EP93XX_SOC_I2S
         tristate
 
+config SND_EP93XX_SOC_AC97
+        tristate
+        select AC97_BUS
+        select SND_SOC_AC97_BUS
+
 config SND_EP93XX_SOC_SNAPPERCL15
         tristate "SoC Audio support for Bluewater Systems Snapper CL15 module"
         depends on SND_EP93XX_SOC && MACH_SNAPPER_CL15
@@ -16,3 +21,12 @@ config SND_EP93XX_SOC_SNAPPERCL15
         help
           Say Y or M here if you want to add support for I2S audio on the
           Bluewater Systems Snapper CL15 module.
+
+config SND_EP93XX_SOC_SIMONE
+        tristate "SoC Audio support for Simplemachines Sim.One board"
+        depends on SND_EP93XX_SOC && MACH_SIM_ONE
+        select SND_EP93XX_SOC_AC97
+        select SND_SOC_AC97_CODEC
+        help
+          Say Y or M here if you want to add support for AC97 audio on the
+          Simplemachines Sim.One board.
diff --git a/sound/soc/ep93xx/Makefile b/sound/soc/ep93xx/Makefile
index 272e60f57b9a..8e7977fb6b7d 100644
--- a/sound/soc/ep93xx/Makefile
+++ b/sound/soc/ep93xx/Makefile
@@ -1,11 +1,15 @@
 # EP93xx Platform Support
 snd-soc-ep93xx-objs                             := ep93xx-pcm.o
 snd-soc-ep93xx-i2s-objs                         := ep93xx-i2s.o
+snd-soc-ep93xx-ac97-objs                        := ep93xx-ac97.o
 
 obj-$(CONFIG_SND_EP93XX_SOC)                    += snd-soc-ep93xx.o
 obj-$(CONFIG_SND_EP93XX_SOC_I2S)                += snd-soc-ep93xx-i2s.o
+obj-$(CONFIG_SND_EP93XX_SOC_AC97)               += snd-soc-ep93xx-ac97.o
 
 # EP93XX Machine Support
 snd-soc-snappercl15-objs                        := snappercl15.o
+snd-soc-simone-objs                             := simone.o
 
 obj-$(CONFIG_SND_EP93XX_SOC_SNAPPERCL15)        += snd-soc-snappercl15.o
+obj-$(CONFIG_SND_EP93XX_SOC_SIMONE)             += snd-soc-simone.o
diff --git a/sound/soc/ep93xx/ep93xx-ac97.c b/sound/soc/ep93xx/ep93xx-ac97.c
new file mode 100644
index 000000000000..68a0bae1208a
--- /dev/null
+++ b/sound/soc/ep93xx/ep93xx-ac97.c
@@ -0,0 +1,468 @@
+/*
+ * ASoC driver for Cirrus Logic EP93xx AC97 controller.
+ *
+ * Copyright (c) 2010 Mika Westerberg
+ *
+ * Based on s3c-ac97 ASoC driver by Jaswinder Singh.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/delay.h>
+#include <linux/io.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+
+#include <sound/core.h>
+#include <sound/ac97_codec.h>
+#include <sound/soc.h>
+
+#include <mach/dma.h>
+#include "ep93xx-pcm.h"
+
+/*
+ * Per channel (1-4) registers.
+ */
+#define AC97CH(n)               (((n) - 1) * 0x20)
+
+#define AC97DR(n)               (AC97CH(n) + 0x0000)
+
+#define AC97RXCR(n)             (AC97CH(n) + 0x0004)
+#define AC97RXCR_REN            BIT(0)
+#define AC97RXCR_RX3            BIT(3)
+#define AC97RXCR_RX4            BIT(4)
+#define AC97RXCR_CM             BIT(15)
+
+#define AC97TXCR(n)             (AC97CH(n) + 0x0008)
+#define AC97TXCR_TEN            BIT(0)
+#define AC97TXCR_TX3            BIT(3)
+#define AC97TXCR_TX4            BIT(4)
+#define AC97TXCR_CM             BIT(15)
+
+#define AC97SR(n)               (AC97CH(n) + 0x000c)
+#define AC97SR_TXFE             BIT(1)
+#define AC97SR_TXUE             BIT(6)
+
+#define AC97RISR(n)             (AC97CH(n) + 0x0010)
+#define AC97ISR(n)              (AC97CH(n) + 0x0014)
+#define AC97IE(n)               (AC97CH(n) + 0x0018)
+
+/*
+ * Global AC97 controller registers.
+ */
+#define AC97S1DATA              0x0080
+#define AC97S2DATA              0x0084
+#define AC97S12DATA             0x0088
+
+#define AC97RGIS                0x008c
+#define AC97GIS                 0x0090
+#define AC97IM                  0x0094
+/*
+ * Common bits for RGIS, GIS and IM registers.
+ */
+#define AC97_SLOT2RXVALID       BIT(1)
+#define AC97_CODECREADY         BIT(5)
+#define AC97_SLOT2TXCOMPLETE    BIT(6)
+
+#define AC97EOI                 0x0098
+#define AC97EOI_WINT            BIT(0)
+#define AC97EOI_CODECREADY      BIT(1)
+
+#define AC97GCR                 0x009c
+#define AC97GCR_AC97IFE         BIT(0)
+
+#define AC97RESET               0x00a0
+#define AC97RESET_TIMEDRESET    BIT(0)
+
+#define AC97SYNC                0x00a4
+#define AC97SYNC_TIMEDSYNC      BIT(0)
+
+#define AC97_TIMEOUT            msecs_to_jiffies(5)
+
+/**
+ * struct ep93xx_ac97_info - EP93xx AC97 controller info structure
+ * @lock: mutex serializing access to the bus (slot 1 & 2 ops)
+ * @dev: pointer to the platform device dev structure
+ * @mem: physical memory resource for the registers
+ * @regs: mapped AC97 controller registers
+ * @irq: AC97 interrupt number
+ * @done: bus ops wait here for an interrupt
+ */
+struct ep93xx_ac97_info {
+        struct mutex            lock;
+        struct device           *dev;
+        struct resource         *mem;
+        void __iomem            *regs;
+        int                     irq;
+        struct completion       done;
+};
+
+/* currently ALSA only supports a single AC97 device */
+static struct ep93xx_ac97_info *ep93xx_ac97_info;
+
+static struct ep93xx_pcm_dma_params ep93xx_ac97_pcm_out = {
+        .name           = "ac97-pcm-out",
+        .dma_port       = EP93XX_DMA_M2P_PORT_AAC1,
+};
+
+static struct ep93xx_pcm_dma_params ep93xx_ac97_pcm_in = {
+        .name           = "ac97-pcm-in",
+        .dma_port       = EP93XX_DMA_M2P_PORT_AAC1,
+};
+
+static inline unsigned ep93xx_ac97_read_reg(struct ep93xx_ac97_info *info,
+                                            unsigned reg)
+{
+        return __raw_readl(info->regs + reg);
+}
+
+static inline void ep93xx_ac97_write_reg(struct ep93xx_ac97_info *info,
+                                         unsigned reg, unsigned val)
+{
+        __raw_writel(val, info->regs + reg);
+}
+
+static unsigned short ep93xx_ac97_read(struct snd_ac97 *ac97,
+                                       unsigned short reg)
+{
+        struct ep93xx_ac97_info *info = ep93xx_ac97_info;
+        unsigned short val;
+
+        mutex_lock(&info->lock);
+
+        ep93xx_ac97_write_reg(info, AC97S1DATA, reg);
+        ep93xx_ac97_write_reg(info, AC97IM, AC97_SLOT2RXVALID);
+        if (!wait_for_completion_timeout(&info->done, AC97_TIMEOUT)) {
+                dev_warn(info->dev, "timeout reading register %x\n", reg);
+                mutex_unlock(&info->lock);
+                return -ETIMEDOUT;
+        }
+        val = (unsigned short)ep93xx_ac97_read_reg(info, AC97S2DATA);
+
+        mutex_unlock(&info->lock);
+        return val;
+}
+
+static void ep93xx_ac97_write(struct snd_ac97 *ac97,
+                              unsigned short reg,
+                              unsigned short val)
+{
+        struct ep93xx_ac97_info *info = ep93xx_ac97_info;
+
+        mutex_lock(&info->lock);
+
+        /*
+         * Writes to the codec need to be done so that slot 2 is filled in
+         * before slot 1.
+         */
+        ep93xx_ac97_write_reg(info, AC97S2DATA, val);
+        ep93xx_ac97_write_reg(info, AC97S1DATA, reg);
+
+        ep93xx_ac97_write_reg(info, AC97IM, AC97_SLOT2TXCOMPLETE);
+        if (!wait_for_completion_timeout(&info->done, AC97_TIMEOUT))
+                dev_warn(info->dev, "timeout writing register %x\n", reg);
+
+        mutex_unlock(&info->lock);
+}
+
+static void ep93xx_ac97_warm_reset(struct snd_ac97 *ac97)
+{
+        struct ep93xx_ac97_info *info = ep93xx_ac97_info;
+
+        mutex_lock(&info->lock);
+
+        /*
+         * We are assuming that before this functions gets called, the codec
+         * BIT_CLK is stopped by forcing the codec into powerdown mode. We can
+         * control the SYNC signal directly via AC97SYNC register. Using
+         * TIMEDSYNC the controller will keep the SYNC high > 1us.
+         */
+        ep93xx_ac97_write_reg(info, AC97SYNC, AC97SYNC_TIMEDSYNC);
+        ep93xx_ac97_write_reg(info, AC97IM, AC97_CODECREADY);
+        if (!wait_for_completion_timeout(&info->done, AC97_TIMEOUT))
+                dev_warn(info->dev, "codec warm reset timeout\n");
+
+        mutex_unlock(&info->lock);
+}
+
+static void ep93xx_ac97_cold_reset(struct snd_ac97 *ac97)
+{
+        struct ep93xx_ac97_info *info = ep93xx_ac97_info;
+
+        mutex_lock(&info->lock);
+
+        /*
+         * For doing cold reset, we disable the AC97 controller interface, clear
+         * WINT and CODECREADY bits, and finally enable the interface again.
+         */
+        ep93xx_ac97_write_reg(info, AC97GCR, 0);
+        ep93xx_ac97_write_reg(info, AC97EOI, AC97EOI_CODECREADY | AC97EOI_WINT);
+        ep93xx_ac97_write_reg(info, AC97GCR, AC97GCR_AC97IFE);
+
+        /*
+         * Now, assert the reset and wait for the codec to become ready.
+         */
+        ep93xx_ac97_write_reg(info, AC97RESET, AC97RESET_TIMEDRESET);
+        ep93xx_ac97_write_reg(info, AC97IM, AC97_CODECREADY);
+        if (!wait_for_completion_timeout(&info->done, AC97_TIMEOUT))
+                dev_warn(info->dev, "codec cold reset timeout\n");
+
+        /*
+         * Give the codec some time to come fully out from the reset. This way
+         * we ensure that the subsequent reads/writes will work.
+         */
+        usleep_range(15000, 20000);
+
+        mutex_unlock(&info->lock);
+}
+
+static irqreturn_t ep93xx_ac97_interrupt(int irq, void *dev_id)
+{
+        struct ep93xx_ac97_info *info = dev_id;
+        unsigned status, mask;
+
+        /*
+         * Just mask out the interrupt and wake up the waiting thread.
+         * Interrupts are cleared via reading/writing to slot 1 & 2 registers by
+         * the waiting thread.
+         */
+        status = ep93xx_ac97_read_reg(info, AC97GIS);
+        mask = ep93xx_ac97_read_reg(info, AC97IM);
+        mask &= ~status;
+        ep93xx_ac97_write_reg(info, AC97IM, mask);
+
+        complete(&info->done);
+        return IRQ_HANDLED;
+}
+
+struct snd_ac97_bus_ops soc_ac97_ops = {
+        .read           = ep93xx_ac97_read,
+        .write          = ep93xx_ac97_write,
+        .reset          = ep93xx_ac97_cold_reset,
+        .warm_reset     = ep93xx_ac97_warm_reset,
+};
+EXPORT_SYMBOL_GPL(soc_ac97_ops);
+
+static int ep93xx_ac97_trigger(struct snd_pcm_substream *substream,
+                               int cmd, struct snd_soc_dai *dai)
+{
+        struct ep93xx_ac97_info *info = snd_soc_dai_get_drvdata(dai);
+        unsigned v = 0;
+
+
+        switch (cmd) {
+        case SNDRV_PCM_TRIGGER_START:
+        case SNDRV_PCM_TRIGGER_RESUME:
+        case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
+                if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
+                        /*
+                         * Enable compact mode, TX slots 3 & 4, and the TX FIFO
+                         * itself.
+                         */
+                        v |= AC97TXCR_CM;
+                        v |= AC97TXCR_TX3 | AC97TXCR_TX4;
+                        v |= AC97TXCR_TEN;
+                        ep93xx_ac97_write_reg(info, AC97TXCR(1), v);
+                } else {
+                        /*
+                         * Enable compact mode, RX slots 3 & 4, and the RX FIFO
+                         * itself.
+                         */
+                        v |= AC97RXCR_CM;
+                        v |= AC97RXCR_RX3 | AC97RXCR_RX4;
+                        v |= AC97RXCR_REN;
+                        ep93xx_ac97_write_reg(info, AC97RXCR(1), v);
+                }
+                break;
+
+        case SNDRV_PCM_TRIGGER_STOP:
+        case SNDRV_PCM_TRIGGER_SUSPEND:
+        case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
+                if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
+                        /*
+                         * As per Cirrus EP93xx errata described below:
+                         *
+                         * http://www.cirrus.com/en/pubs/errata/ER667E2B.pdf
+                         *
+                         * we will wait for the TX FIFO to be empty before
+                         * clearing the TEN bit.
+                         */
+                        unsigned long timeout = jiffies + AC97_TIMEOUT;
+
+                        do {
+                                v = ep93xx_ac97_read_reg(info, AC97SR(1));
+                                if (time_after(jiffies, timeout)) {
+                                        dev_warn(info->dev, "TX timeout\n");
+                                        break;
+                                }
+                        } while (!(v & (AC97SR_TXFE | AC97SR_TXUE)));
+
+                        /* disable the TX FIFO */
+                        ep93xx_ac97_write_reg(info, AC97TXCR(1), 0);
+                } else {
+                        /* disable the RX FIFO */
+                        ep93xx_ac97_write_reg(info, AC97RXCR(1), 0);
+                }
+                break;
+
+        default:
+                dev_warn(info->dev, "unknown command %d\n", cmd);
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
+static int ep93xx_ac97_startup(struct snd_pcm_substream *substream,
+                               struct snd_soc_dai *dai)
+{
+        struct ep93xx_pcm_dma_params *dma_data;
+
+        if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
+                dma_data = &ep93xx_ac97_pcm_out;
+        else
+                dma_data = &ep93xx_ac97_pcm_in;
+
+        snd_soc_dai_set_dma_data(dai, substream, dma_data);
+        return 0;
+}
+
+static struct snd_soc_dai_ops ep93xx_ac97_dai_ops = {
+        .startup        = ep93xx_ac97_startup,
+        .trigger        = ep93xx_ac97_trigger,
+};
+
+struct snd_soc_dai_driver ep93xx_ac97_dai = {
+        .name           = "ep93xx-ac97",
+        .id             = 0,
+        .ac97_control   = 1,
+        .playback       = {
+                .stream_name    = "AC97 Playback",
+                .channels_min   = 2,
+                .channels_max   = 2,
+                .rates          = SNDRV_PCM_RATE_8000_48000,
+                .formats        = SNDRV_PCM_FMTBIT_S16_LE,
+        },
+        .capture        = {
+                .stream_name    = "AC97 Capture",
+                .channels_min   = 2,
+                .channels_max   = 2,
+                .rates          = SNDRV_PCM_RATE_8000_48000,
+                .formats        = SNDRV_PCM_FMTBIT_S16_LE,
+        },
+        .ops                    = &ep93xx_ac97_dai_ops,
+};
+
+static int __devinit ep93xx_ac97_probe(struct platform_device *pdev)
+{
+        struct ep93xx_ac97_info *info;
+        int ret;
+
+        info = kzalloc(sizeof(struct ep93xx_ac97_info), GFP_KERNEL);
+        if (!info)
+                return -ENOMEM;
+
+        dev_set_drvdata(&pdev->dev, info);
+
+        mutex_init(&info->lock);
+        init_completion(&info->done);
+        info->dev = &pdev->dev;
+
+        info->mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!info->mem) {
+                ret = -ENXIO;
+                goto fail_free_info;
+        }
+
+        info->irq = platform_get_irq(pdev, 0);
+        if (!info->irq) {
+                ret = -ENXIO;
+                goto fail_free_info;
+        }
+
+        if (!request_mem_region(info->mem->start, resource_size(info->mem),
+                                pdev->name)) {
+                ret = -EBUSY;
+                goto fail_free_info;
+        }
+
+        info->regs = ioremap(info->mem->start, resource_size(info->mem));
+        if (!info->regs) {
+                ret = -ENOMEM;
+                goto fail_release_mem;
+        }
+
+        ret = request_irq(info->irq, ep93xx_ac97_interrupt, IRQF_TRIGGER_HIGH,
+                          pdev->name, info);
+        if (ret)
+                goto fail_unmap_mem;
+
+        ep93xx_ac97_info = info;
+        platform_set_drvdata(pdev, info);
+
+        ret = snd_soc_register_dai(&pdev->dev, &ep93xx_ac97_dai);
+        if (ret)
+                goto fail_free_irq;
+
+        return 0;
+
+fail_free_irq:
+        platform_set_drvdata(pdev, NULL);
+        free_irq(info->irq, info);
+fail_unmap_mem:
+        iounmap(info->regs);
+fail_release_mem:
+        release_mem_region(info->mem->start, resource_size(info->mem));
+fail_free_info:
+        kfree(info);
+
+        return ret;
+}
+
+static int __devexit ep93xx_ac97_remove(struct platform_device *pdev)
+{
+        struct ep93xx_ac97_info *info = platform_get_drvdata(pdev);
+
+        snd_soc_unregister_dai(&pdev->dev);
+
+        /* disable the AC97 controller */
+        ep93xx_ac97_write_reg(info, AC97GCR, 0);
+
+        free_irq(info->irq, info);
+        iounmap(info->regs);
+        release_mem_region(info->mem->start, resource_size(info->mem));
+        platform_set_drvdata(pdev, NULL);
+        kfree(info);
+
+        return 0;
+}
+
+static struct platform_driver ep93xx_ac97_driver = {
+        .probe  = ep93xx_ac97_probe,
+        .remove = __devexit_p(ep93xx_ac97_remove),
+        .driver = {
+                .name = "ep93xx-ac97",
+                .owner = THIS_MODULE,
+        },
+};
+
+static int __init ep93xx_ac97_init(void)
+{
+        return platform_driver_register(&ep93xx_ac97_driver);
+}
+module_init(ep93xx_ac97_init);
+
+static void __exit ep93xx_ac97_exit(void)
+{
+        platform_driver_unregister(&ep93xx_ac97_driver);
+}
+module_exit(ep93xx_ac97_exit);
+
+MODULE_DESCRIPTION("EP93xx AC97 ASoC Driver");
+MODULE_AUTHOR("Mika Westerberg <mika.westerberg@iki.fi>");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:ep93xx-ac97");
diff --git a/sound/soc/ep93xx/ep93xx-i2s.c b/sound/soc/ep93xx/ep93xx-i2s.c
index 00b946632184..4f4873359613 100644
--- a/sound/soc/ep93xx/ep93xx-i2s.c
+++ b/sound/soc/ep93xx/ep93xx-i2s.c
@@ -31,7 +31,6 @@
 #include <mach/dma.h>
 
 #include "ep93xx-pcm.h"
-#include "ep93xx-i2s.h"
 
 #define EP93XX_I2S_TXCLKCFG             0x00
 #define EP93XX_I2S_RXCLKCFG             0x04
@@ -145,8 +144,8 @@ static int ep93xx_i2s_startup(struct snd_pcm_substream *substream,
                               struct snd_soc_dai *dai)
 {
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
-        struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai;
-        struct ep93xx_i2s_info *info = rtd->dai->cpu_dai->private_data;
+        struct ep93xx_i2s_info *info = snd_soc_dai_get_drvdata(dai);
+        struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
 
         snd_soc_dai_set_dma_data(cpu_dai, substream,
                                  &info->dma_params[substream->stream]);
@@ -156,8 +155,7 @@ static int ep93xx_i2s_startup(struct snd_pcm_substream *substream,
 static void ep93xx_i2s_shutdown(struct snd_pcm_substream *substream,
                                 struct snd_soc_dai *dai)
 {
-        struct snd_soc_pcm_runtime *rtd = substream->private_data;
-        struct ep93xx_i2s_info *info = rtd->dai->cpu_dai->private_data;
+        struct ep93xx_i2s_info *info = snd_soc_dai_get_drvdata(dai);
 
         ep93xx_i2s_disable(info, substream->stream);
 }
@@ -165,7 +163,7 @@ static void ep93xx_i2s_shutdown(struct snd_pcm_substream *substream,
 static int ep93xx_i2s_set_dai_fmt(struct snd_soc_dai *cpu_dai,
                                   unsigned int fmt)
 {
-        struct ep93xx_i2s_info *info = cpu_dai->private_data;
+        struct ep93xx_i2s_info *info = snd_soc_dai_get_drvdata(cpu_dai);
         unsigned int clk_cfg, lin_ctrl;
 
         clk_cfg  = ep93xx_i2s_read_reg(info, EP93XX_I2S_RXCLKCFG);
@@ -242,9 +240,7 @@ static int ep93xx_i2s_hw_params(struct snd_pcm_substream *substream,
                                 struct snd_pcm_hw_params *params,
                                 struct snd_soc_dai *dai)
 {
-        struct snd_soc_pcm_runtime *rtd = substream->private_data;
-        struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai;
-        struct ep93xx_i2s_info *info = cpu_dai->private_data;
+        struct ep93xx_i2s_info *info = snd_soc_dai_get_drvdata(dai);
         unsigned word_len, div, sdiv, lrdiv;
         int found = 0, err;
 
@@ -302,7 +298,7 @@ out:
 static int ep93xx_i2s_set_sysclk(struct snd_soc_dai *cpu_dai, int clk_id,
                                  unsigned int freq, int dir)
 {
-        struct ep93xx_i2s_info *info = cpu_dai->private_data;
+        struct ep93xx_i2s_info *info = snd_soc_dai_get_drvdata(cpu_dai);
 
         if (dir == SND_SOC_CLOCK_IN || clk_id != 0)
                 return -EINVAL;
@@ -313,7 +309,7 @@ static int ep93xx_i2s_set_sysclk(struct snd_soc_dai *cpu_dai, int clk_id,
 #ifdef CONFIG_PM
 static int ep93xx_i2s_suspend(struct snd_soc_dai *dai)
 {
-        struct ep93xx_i2s_info *info = dai->private_data;
+        struct ep93xx_i2s_info *info = snd_soc_dai_get_drvdata(dai);
 
         if (!dai->active)
                 return;
@@ -324,7 +320,7 @@ static int ep93xx_i2s_suspend(struct snd_soc_dai *dai)
 
 static int ep93xx_i2s_resume(struct snd_soc_dai *dai)
 {
-        struct ep93xx_i2s_info *info = dai->private_data;
+        struct ep93xx_i2s_info *info = snd_soc_dai_get_drvdata(dai);
 
         if (!dai->active)
                 return;
@@ -349,9 +345,7 @@ static struct snd_soc_dai_ops ep93xx_i2s_dai_ops = {
                             SNDRV_PCM_FMTBIT_S24_LE | \
                             SNDRV_PCM_FMTBIT_S32_LE)
 
-struct snd_soc_dai ep93xx_i2s_dai = {
-        .name           = "ep93xx-i2s",
-        .id             = 0,
+static struct snd_soc_dai_driver ep93xx_i2s_dai = {
         .symmetric_rates= 1,
         .suspend        = ep93xx_i2s_suspend,
         .resume         = ep93xx_i2s_resume,
@@ -369,7 +363,6 @@ struct snd_soc_dai ep93xx_i2s_dai = {
         },
         .ops            = &ep93xx_i2s_dai_ops,
 };
-EXPORT_SYMBOL_GPL(ep93xx_i2s_dai);
 
 static int ep93xx_i2s_probe(struct platform_device *pdev)
 {
@@ -383,8 +376,7 @@ static int ep93xx_i2s_probe(struct platform_device *pdev)
                 goto fail;
         }
 
-        ep93xx_i2s_dai.dev = &pdev->dev;
-        ep93xx_i2s_dai.private_data = info;
+        dev_set_drvdata(&pdev->dev, info);
         info->dma_params = ep93xx_i2s_dma_params;
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -424,7 +416,7 @@ static int ep93xx_i2s_probe(struct platform_device *pdev)
                 goto fail_put_sclk;
         }
 
-        err = snd_soc_register_dai(&ep93xx_i2s_dai);
+        err = snd_soc_register_dai(&pdev->dev, &ep93xx_i2s_dai);
         if (err)
                 goto fail_put_lrclk;
 
@@ -447,9 +439,9 @@ fail:
 
 static int __devexit ep93xx_i2s_remove(struct platform_device *pdev)
 {
-        struct ep93xx_i2s_info *info = ep93xx_i2s_dai.private_data;
+        struct ep93xx_i2s_info *info = dev_get_drvdata(&pdev->dev);
 
-        snd_soc_unregister_dai(&ep93xx_i2s_dai);
+        snd_soc_unregister_dai(&pdev->dev);
         clk_put(info->lrclk);
         clk_put(info->sclk);
         clk_put(info->mclk);
diff --git a/sound/soc/ep93xx/ep93xx-i2s.h b/sound/soc/ep93xx/ep93xx-i2s.h
deleted file mode 100644
index 3bd4ebfaa1de..000000000000
--- a/sound/soc/ep93xx/ep93xx-i2s.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * linux/sound/soc/ep93xx-i2s.h
- * EP93xx I2S driver
- *
- * Copyright (C) 2010 Ryan Mallon <ryan@bluewatersys.com>
- *  
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- */
-
-#ifndef _EP93XX_SND_SOC_I2S_H
-#define _EP93XX_SND_SOC_I2S_H
-
-extern struct snd_soc_dai ep93xx_i2s_dai;
-
-#endif /* _EP93XX_SND_SOC_I2S_H */
diff --git a/sound/soc/ep93xx/ep93xx-pcm.c b/sound/soc/ep93xx/ep93xx-pcm.c
index 4ba938400791..2f121ddbe4bb 100644
--- a/sound/soc/ep93xx/ep93xx-pcm.c
+++ b/sound/soc/ep93xx/ep93xx-pcm.c
@@ -95,7 +95,7 @@ static void ep93xx_pcm_buffer_finished(void *cookie,
 static int ep93xx_pcm_open(struct snd_pcm_substream *substream)
 {
         struct snd_soc_pcm_runtime *soc_rtd = substream->private_data;
-        struct snd_soc_dai *cpu_dai = soc_rtd->dai->cpu_dai;
+        struct snd_soc_dai *cpu_dai = soc_rtd->cpu_dai;
         struct ep93xx_pcm_dma_params *dma_params;
         struct ep93xx_runtime_data *rtd;    
         int ret;
@@ -276,14 +276,14 @@ static int ep93xx_pcm_new(struct snd_card *card, struct snd_soc_dai *dai,
         if (!card->dev->coherent_dma_mask)
                 card->dev->coherent_dma_mask = 0xffffffff;
 
-        if (dai->playback.channels_min) {
+        if (dai->driver->playback.channels_min) {
                 ret = ep93xx_pcm_preallocate_dma_buffer(pcm,
                                         SNDRV_PCM_STREAM_PLAYBACK);
                 if (ret)
                         return ret;
         }
 
-        if (dai->capture.channels_min) {
+        if (dai->driver->capture.channels_min) {
                 ret = ep93xx_pcm_preallocate_dma_buffer(pcm,
                                         SNDRV_PCM_STREAM_CAPTURE);
                 if (ret)
@@ -293,22 +293,41 @@ static int ep93xx_pcm_new(struct snd_card *card, struct snd_soc_dai *dai,
         return 0;
 }
 
-struct snd_soc_platform ep93xx_soc_platform = {
-        .name           = "ep93xx-audio",
-        .pcm_ops        = &ep93xx_pcm_ops,
+static struct snd_soc_platform_driver ep93xx_soc_platform = {
+        .ops            = &ep93xx_pcm_ops,
         .pcm_new        = &ep93xx_pcm_new,
         .pcm_free       = &ep93xx_pcm_free_dma_buffers,
 };
-EXPORT_SYMBOL_GPL(ep93xx_soc_platform);
+
+static int __devinit ep93xx_soc_platform_probe(struct platform_device *pdev)
+{
+        return snd_soc_register_platform(&pdev->dev, &ep93xx_soc_platform);
+}
+
+static int __devexit ep93xx_soc_platform_remove(struct platform_device *pdev)
+{
+        snd_soc_unregister_platform(&pdev->dev);
+        return 0;
+}
+
+static struct platform_driver ep93xx_pcm_driver = {
+        .driver = {
+                        .name = "ep93xx-pcm-audio",
+                        .owner = THIS_MODULE,
+        },
+
+        .probe = ep93xx_soc_platform_probe,
+        .remove = __devexit_p(ep93xx_soc_platform_remove),
+};
 
 static int __init ep93xx_soc_platform_init(void)
 {
-        return snd_soc_register_platform(&ep93xx_soc_platform);
+        return platform_driver_register(&ep93xx_pcm_driver);
 }
 
 static void __exit ep93xx_soc_platform_exit(void)
 {
-        snd_soc_unregister_platform(&ep93xx_soc_platform);
+        platform_driver_unregister(&ep93xx_pcm_driver);
 }
 
 module_init(ep93xx_soc_platform_init);
diff --git a/sound/soc/ep93xx/ep93xx-pcm.h b/sound/soc/ep93xx/ep93xx-pcm.h
index 4ffdd3f62fe9..111e1121ecb8 100644
--- a/sound/soc/ep93xx/ep93xx-pcm.h
+++ b/sound/soc/ep93xx/ep93xx-pcm.h
@@ -17,6 +17,4 @@ struct ep93xx_pcm_dma_params {
         int     dma_port;
 };
 
-extern struct snd_soc_platform ep93xx_soc_platform;
-
 #endif /* _EP93XX_SND_SOC_PCM_H */
diff --git a/sound/soc/ep93xx/simone.c b/sound/soc/ep93xx/simone.c
new file mode 100644
index 000000000000..4b0d19913728
--- /dev/null
+++ b/sound/soc/ep93xx/simone.c
@@ -0,0 +1,89 @@
+/*
+ * simone.c -- ASoC audio for Simplemachines Sim.One board
+ *
+ * Copyright (c) 2010 Mika Westerberg
+ *
+ * Based on snappercl15 machine driver by Ryan Mallon.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+
+#include <sound/core.h>
+#include <sound/pcm.h>
+#include <sound/soc.h>
+
+#include <asm/mach-types.h>
+#include <mach/hardware.h>
+
+#include "ep93xx-pcm.h"
+
+static struct snd_soc_dai_link simone_dai = {
+        .name           = "AC97",
+        .stream_name    = "AC97 HiFi",
+        .cpu_dai_name   = "ep93xx-ac97",
+        .codec_dai_name = "ac97-hifi",
+        .codec_name     = "ac97-codec",
+        .platform_name  = "ep93xx-pcm-audio",
+};
+
+static struct snd_soc_card snd_soc_simone = {
+        .name           = "Sim.One",
+        .dai_link       = &simone_dai,
+        .num_links      = 1,
+};
+
+static struct platform_device *simone_snd_ac97_device;
+static struct platform_device *simone_snd_device;
+
+static int __init simone_init(void)
+{
+        int ret;
+
+        if (!machine_is_sim_one())
+                return -ENODEV;
+
+        simone_snd_ac97_device = platform_device_alloc("ac97-codec", -1);
+        if (!simone_snd_ac97_device)
+                return -ENOMEM;
+
+        ret = platform_device_add(simone_snd_ac97_device);
+        if (ret)
+                goto fail;
+
+        simone_snd_device = platform_device_alloc("soc-audio", -1);
+        if (!simone_snd_device) {
+                ret = -ENOMEM;
+                goto fail;
+        }
+
+        platform_set_drvdata(simone_snd_device, &snd_soc_simone);
+        ret = platform_device_add(simone_snd_device);
+        if (ret) {
+                platform_device_put(simone_snd_device);
+                goto fail;
+        }
+
+        return ret;
+
+fail:
+        platform_device_put(simone_snd_ac97_device);
+        return ret;
+}
+module_init(simone_init);
+
+static void __exit simone_exit(void)
+{
+        platform_device_unregister(simone_snd_device);
+        platform_device_unregister(simone_snd_ac97_device);
+}
+module_exit(simone_exit);
+
+MODULE_DESCRIPTION("ALSA SoC Simplemachines Sim.One");
+MODULE_AUTHOR("Mika Westerberg <mika.westerberg@iki.fi>");
+MODULE_LICENSE("GPL");
diff --git a/sound/soc/ep93xx/snappercl15.c b/sound/soc/ep93xx/snappercl15.c
index 64955340ff75..28ab5ff772ac 100644
--- a/sound/soc/ep93xx/snappercl15.c
+++ b/sound/soc/ep93xx/snappercl15.c
@@ -22,7 +22,6 @@
 
 #include "../codecs/tlv320aic23.h"
 #include "ep93xx-pcm.h"
-#include "ep93xx-i2s.h"
 
 #define CODEC_CLOCK 5644800
 
@@ -30,8 +29,8 @@ static int snappercl15_hw_params(struct snd_pcm_substream *substream,
                                  struct snd_pcm_hw_params *params)
 {
         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;
+        struct snd_soc_dai *codec_dai = rtd->codec_dai;
+        struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
         int err;
 
         err = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S |
@@ -77,8 +76,10 @@ static const struct snd_soc_dapm_route audio_map[] = {
         {"MICIN", NULL, "Mic Jack"},
 };
 
-static int snappercl15_tlv320aic23_init(struct snd_soc_codec *codec)
+static int snappercl15_tlv320aic23_init(struct snd_soc_pcm_runtime *rtd)
 {
+        struct snd_soc_codec *codec = rtd->codec;
+
         snd_soc_dapm_new_controls(codec, tlv320aic23_dapm_widgets,
                                   ARRAY_SIZE(tlv320aic23_dapm_widgets));
 
@@ -89,24 +90,20 @@ static int snappercl15_tlv320aic23_init(struct snd_soc_codec *codec)
 static struct snd_soc_dai_link snappercl15_dai = {
         .name           = "tlv320aic23",
         .stream_name    = "AIC23",
-        .cpu_dai        = &ep93xx_i2s_dai,
-        .codec_dai      = &tlv320aic23_dai,
+        .cpu_dai_name   = "ep93xx-i2s",
+        .codec_dai_name = "tlv320aic23-hifi",
+        .codec_name     = "tlv320aic23-codec.0-001a",
+        .platform_name  =  "ep93xx-pcm-audio",
         .init           = snappercl15_tlv320aic23_init,
         .ops            = &snappercl15_ops,
 };
 
 static struct snd_soc_card snd_soc_snappercl15 = {
         .name           = "Snapper CL15",
-        .platform       = &ep93xx_soc_platform,
         .dai_link       = &snappercl15_dai,
         .num_links      = 1,
 };
 
-static struct snd_soc_device snappercl15_snd_devdata = {
-        .card           = &snd_soc_snappercl15,
-        .codec_dev      = &soc_codec_dev_tlv320aic23,
-};
-
 static struct platform_device *snappercl15_snd_device;
 
 static int __init snappercl15_init(void)
@@ -126,8 +123,7 @@ static int __init snappercl15_init(void)
         if (!snappercl15_snd_device)
                 return -ENOMEM;
         
-        platform_set_drvdata(snappercl15_snd_device, &snappercl15_snd_devdata);
-        snappercl15_snd_devdata.dev = &snappercl15_snd_device->dev;
+        platform_set_drvdata(snappercl15_snd_device, &snd_soc_snappercl15);
         ret = platform_device_add(snappercl15_snd_device);
         if (ret)
                 platform_device_put(snappercl15_snd_device);