Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (214 commits)
  ALSA: hda - Add pin-fix for HP dc5750
  ALSA: als4000: Fix potentially invalid DMA mode setup
  ALSA: als4000: enable burst mode
  ALSA: hda - Fix initial capsrc selection in patch_alc269()
  ASoC: TWL4030: Capture route runtime DAPM ordering fix
  ALSA: hda - Add PC-beep whitelist for an Intel board
  ALSA: hda - More relax for pending period handling
  ALSA: hda - Define AC_FMT_* constants
  ALSA: hda - Fix beep frequency on IDT 92HD73xx and 92HD71Bxx codecs
  ALSA: hda - Add support for HDMI HBR passthrough
  ALSA: hda - Set Stream Type in Stream Format according to AES0
  ALSA: hda - Fix Thinkpad X300 so SPDIF is not exposed
  ALSA: hda - FIX to not expose SPDIF on Thinkpad X301, since it does not have the ability to use SPDIF
  ASoC: wm9081: fix resource reclaim in wm9081_register error path
  ASoC: wm8978: fix a memory leak if a wm8978_register fail
  ASoC: wm8974: fix a memory leak if another WM8974 is registered
  ASoC: wm8961: fix resource reclaim in wm8961_register error path
  ASoC: wm8955: fix resource reclaim in wm8955_register error path
  ASoC: wm8940: fix a memory leak if wm8940_register return error
  ASoC: wm8904: fix resource reclaim in wm8904_register error path
  ...

7 files changed, 1155 insertions, 0 deletions

diff --git a/sound/soc/jz4740/Kconfig b/sound/soc/jz4740/Kconfig
new file mode 100644
index 000000000000..5351cba66c9e
--- /dev/null
+++ b/sound/soc/jz4740/Kconfig
@@ -0,0 +1,23 @@
+config SND_JZ4740_SOC
+        tristate "SoC Audio for Ingenic JZ4740 SoC"
+        depends on MACH_JZ4740 && SND_SOC
+        help
+          Say Y or M if you want to add support for codecs attached to
+          the JZ4740 I2S interface. You will also need to select the audio
+          interfaces to support below.
+
+config SND_JZ4740_SOC_I2S
+        depends on SND_JZ4740_SOC
+        tristate "SoC Audio (I2S protocol) for Ingenic JZ4740 SoC"
+        help
+          Say Y if you want to use I2S protocol and I2S codec on Ingenic JZ4740
+          based boards.
+
+config SND_JZ4740_SOC_QI_LB60
+        tristate "SoC Audio support for Qi LB60"
+        depends on SND_JZ4740_SOC && JZ4740_QI_LB60
+        select SND_JZ4740_SOC_I2S
+    select SND_SOC_JZ4740_CODEC
+        help
+          Say Y if you want to add support for ASoC audio on the Qi LB60 board
+          a.k.a Qi Ben NanoNote.
diff --git a/sound/soc/jz4740/Makefile b/sound/soc/jz4740/Makefile
new file mode 100644
index 000000000000..be873c1b0c20
--- /dev/null
+++ b/sound/soc/jz4740/Makefile
@@ -0,0 +1,13 @@
+#
+# Jz4740 Platform Support
+#
+snd-soc-jz4740-objs := jz4740-pcm.o
+snd-soc-jz4740-i2s-objs := jz4740-i2s.o
+
+obj-$(CONFIG_SND_JZ4740_SOC) += snd-soc-jz4740.o
+obj-$(CONFIG_SND_JZ4740_SOC_I2S) += snd-soc-jz4740-i2s.o
+
+# Jz4740 Machine Support
+snd-soc-qi-lb60-objs := qi_lb60.o
+
+obj-$(CONFIG_SND_JZ4740_SOC_QI_LB60) += snd-soc-qi-lb60.o
diff --git a/sound/soc/jz4740/jz4740-i2s.c b/sound/soc/jz4740/jz4740-i2s.c
new file mode 100644
index 000000000000..eb518f0c5e01
--- /dev/null
+++ b/sound/soc/jz4740/jz4740-i2s.c
@@ -0,0 +1,540 @@
+/*
+ *  Copyright (C) 2010, Lars-Peter Clausen <lars@metafoo.de>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under  the terms of the GNU General  Public License as published by the
+ *  Free Software Foundation;  either version 2 of the License, or (at your
+ *  option) any later version.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#include <linux/init.h>
+#include <linux/io.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+
+#include <linux/clk.h>
+#include <linux/delay.h>
+
+#include <linux/dma-mapping.h>
+
+#include <sound/core.h>
+#include <sound/pcm.h>
+#include <sound/pcm_params.h>
+#include <sound/soc.h>
+#include <sound/soc-dapm.h>
+#include <sound/initval.h>
+
+#include "jz4740-i2s.h"
+#include "jz4740-pcm.h"
+
+#define JZ_REG_AIC_CONF         0x00
+#define JZ_REG_AIC_CTRL         0x04
+#define JZ_REG_AIC_I2S_FMT      0x10
+#define JZ_REG_AIC_FIFO_STATUS  0x14
+#define JZ_REG_AIC_I2S_STATUS   0x1c
+#define JZ_REG_AIC_CLK_DIV      0x30
+#define JZ_REG_AIC_FIFO         0x34
+
+#define JZ_AIC_CONF_FIFO_RX_THRESHOLD_MASK (0xf << 12)
+#define JZ_AIC_CONF_FIFO_TX_THRESHOLD_MASK (0xf <<  8)
+#define JZ_AIC_CONF_OVERFLOW_PLAY_LAST BIT(6)
+#define JZ_AIC_CONF_INTERNAL_CODEC BIT(5)
+#define JZ_AIC_CONF_I2S BIT(4)
+#define JZ_AIC_CONF_RESET BIT(3)
+#define JZ_AIC_CONF_BIT_CLK_MASTER BIT(2)
+#define JZ_AIC_CONF_SYNC_CLK_MASTER BIT(1)
+#define JZ_AIC_CONF_ENABLE BIT(0)
+
+#define JZ_AIC_CONF_FIFO_RX_THRESHOLD_OFFSET 12
+#define JZ_AIC_CONF_FIFO_TX_THRESHOLD_OFFSET 8
+
+#define JZ_AIC_CTRL_OUTPUT_SAMPLE_SIZE_MASK (0x7 << 19)
+#define JZ_AIC_CTRL_INPUT_SAMPLE_SIZE_MASK (0x7 << 16)
+#define JZ_AIC_CTRL_ENABLE_RX_DMA BIT(15)
+#define JZ_AIC_CTRL_ENABLE_TX_DMA BIT(14)
+#define JZ_AIC_CTRL_MONO_TO_STEREO BIT(11)
+#define JZ_AIC_CTRL_SWITCH_ENDIANNESS BIT(10)
+#define JZ_AIC_CTRL_SIGNED_TO_UNSIGNED BIT(9)
+#define JZ_AIC_CTRL_FLUSH               BIT(8)
+#define JZ_AIC_CTRL_ENABLE_ROR_INT BIT(6)
+#define JZ_AIC_CTRL_ENABLE_TUR_INT BIT(5)
+#define JZ_AIC_CTRL_ENABLE_RFS_INT BIT(4)
+#define JZ_AIC_CTRL_ENABLE_TFS_INT BIT(3)
+#define JZ_AIC_CTRL_ENABLE_LOOPBACK BIT(2)
+#define JZ_AIC_CTRL_ENABLE_PLAYBACK BIT(1)
+#define JZ_AIC_CTRL_ENABLE_CAPTURE BIT(0)
+
+#define JZ_AIC_CTRL_OUTPUT_SAMPLE_SIZE_OFFSET 19
+#define JZ_AIC_CTRL_INPUT_SAMPLE_SIZE_OFFSET  16
+
+#define JZ_AIC_I2S_FMT_DISABLE_BIT_CLK BIT(12)
+#define JZ_AIC_I2S_FMT_ENABLE_SYS_CLK BIT(4)
+#define JZ_AIC_I2S_FMT_MSB BIT(0)
+
+#define JZ_AIC_I2S_STATUS_BUSY BIT(2)
+
+#define JZ_AIC_CLK_DIV_MASK 0xf
+
+struct jz4740_i2s {
+        struct resource *mem;
+        void __iomem *base;
+        dma_addr_t phys_base;
+
+        struct clk *clk_aic;
+        struct clk *clk_i2s;
+
+        struct jz4740_pcm_config pcm_config_playback;
+        struct jz4740_pcm_config pcm_config_capture;
+};
+
+static inline uint32_t jz4740_i2s_read(const struct jz4740_i2s *i2s,
+        unsigned int reg)
+{
+        return readl(i2s->base + reg);
+}
+
+static inline void jz4740_i2s_write(const struct jz4740_i2s *i2s,
+        unsigned int reg, uint32_t value)
+{
+        writel(value, i2s->base + reg);
+}
+
+static inline struct jz4740_i2s *jz4740_dai_to_i2s(struct snd_soc_dai *dai)
+{
+        return dai->private_data;
+}
+
+static int jz4740_i2s_startup(struct snd_pcm_substream *substream,
+        struct snd_soc_dai *dai)
+{
+        struct jz4740_i2s *i2s = jz4740_dai_to_i2s(dai);
+        uint32_t conf, ctrl;
+
+        if (dai->active)
+                return 0;
+
+        ctrl = jz4740_i2s_read(i2s, JZ_REG_AIC_CTRL);
+        ctrl |= JZ_AIC_CTRL_FLUSH;
+        jz4740_i2s_write(i2s, JZ_REG_AIC_CTRL, ctrl);
+
+        clk_enable(i2s->clk_i2s);
+
+        conf = jz4740_i2s_read(i2s, JZ_REG_AIC_CONF);
+        conf |= JZ_AIC_CONF_ENABLE;
+        jz4740_i2s_write(i2s, JZ_REG_AIC_CONF, conf);
+
+        return 0;
+}
+
+static void jz4740_i2s_shutdown(struct snd_pcm_substream *substream,
+        struct snd_soc_dai *dai)
+{
+        struct jz4740_i2s *i2s = jz4740_dai_to_i2s(dai);
+        uint32_t conf;
+
+        if (!dai->active)
+                return;
+
+        conf = jz4740_i2s_read(i2s, JZ_REG_AIC_CONF);
+        conf &= ~JZ_AIC_CONF_ENABLE;
+        jz4740_i2s_write(i2s, JZ_REG_AIC_CONF, conf);
+
+        clk_disable(i2s->clk_i2s);
+}
+
+static int jz4740_i2s_trigger(struct snd_pcm_substream *substream, int cmd,
+        struct snd_soc_dai *dai)
+{
+        struct jz4740_i2s *i2s = jz4740_dai_to_i2s(dai);
+
+        uint32_t ctrl;
+        uint32_t mask;
+
+        if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
+                mask = JZ_AIC_CTRL_ENABLE_PLAYBACK | JZ_AIC_CTRL_ENABLE_TX_DMA;
+        else
+                mask = JZ_AIC_CTRL_ENABLE_CAPTURE | JZ_AIC_CTRL_ENABLE_RX_DMA;
+
+        ctrl = jz4740_i2s_read(i2s, JZ_REG_AIC_CTRL);
+
+        switch (cmd) {
+        case SNDRV_PCM_TRIGGER_START:
+        case SNDRV_PCM_TRIGGER_RESUME:
+        case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
+                ctrl |= mask;
+                break;
+        case SNDRV_PCM_TRIGGER_STOP:
+        case SNDRV_PCM_TRIGGER_SUSPEND:
+        case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
+                ctrl &= ~mask;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        jz4740_i2s_write(i2s, JZ_REG_AIC_CTRL, ctrl);
+
+        return 0;
+}
+
+static int jz4740_i2s_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
+{
+        struct jz4740_i2s *i2s = jz4740_dai_to_i2s(dai);
+
+        uint32_t format = 0;
+        uint32_t conf;
+
+        conf = jz4740_i2s_read(i2s, JZ_REG_AIC_CONF);
+
+        conf &= ~(JZ_AIC_CONF_BIT_CLK_MASTER | JZ_AIC_CONF_SYNC_CLK_MASTER);
+
+        switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
+        case SND_SOC_DAIFMT_CBS_CFS:
+                conf |= JZ_AIC_CONF_BIT_CLK_MASTER | JZ_AIC_CONF_SYNC_CLK_MASTER;
+                format |= JZ_AIC_I2S_FMT_ENABLE_SYS_CLK;
+                break;
+        case SND_SOC_DAIFMT_CBM_CFS:
+                conf |= JZ_AIC_CONF_SYNC_CLK_MASTER;
+                break;
+        case SND_SOC_DAIFMT_CBS_CFM:
+                conf |= JZ_AIC_CONF_BIT_CLK_MASTER;
+                break;
+        case SND_SOC_DAIFMT_CBM_CFM:
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
+        case SND_SOC_DAIFMT_MSB:
+                format |= JZ_AIC_I2S_FMT_MSB;
+                break;
+        case SND_SOC_DAIFMT_I2S:
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        switch (fmt & SND_SOC_DAIFMT_INV_MASK) {
+        case SND_SOC_DAIFMT_NB_NF:
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        jz4740_i2s_write(i2s, JZ_REG_AIC_CONF, conf);
+        jz4740_i2s_write(i2s, JZ_REG_AIC_I2S_FMT, format);
+
+        return 0;
+}
+
+static int jz4740_i2s_hw_params(struct snd_pcm_substream *substream,
+        struct snd_pcm_hw_params *params, struct snd_soc_dai *dai)
+{
+        struct jz4740_i2s *i2s = jz4740_dai_to_i2s(dai);
+        enum jz4740_dma_width dma_width;
+        struct jz4740_pcm_config *pcm_config;
+        unsigned int sample_size;
+        uint32_t ctrl;
+
+        ctrl = jz4740_i2s_read(i2s, JZ_REG_AIC_CTRL);
+
+        switch (params_format(params)) {
+        case SNDRV_PCM_FORMAT_S8:
+                sample_size = 0;
+                dma_width = JZ4740_DMA_WIDTH_8BIT;
+                break;
+        case SNDRV_PCM_FORMAT_S16:
+                sample_size = 1;
+                dma_width = JZ4740_DMA_WIDTH_16BIT;
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
+                ctrl &= ~JZ_AIC_CTRL_OUTPUT_SAMPLE_SIZE_MASK;
+                ctrl |= sample_size << JZ_AIC_CTRL_OUTPUT_SAMPLE_SIZE_OFFSET;
+                if (params_channels(params) == 1)
+                        ctrl |= JZ_AIC_CTRL_MONO_TO_STEREO;
+                else
+                        ctrl &= ~JZ_AIC_CTRL_MONO_TO_STEREO;
+
+                pcm_config = &i2s->pcm_config_playback;
+                pcm_config->dma_config.dst_width = dma_width;
+
+        } else {
+                ctrl &= ~JZ_AIC_CTRL_INPUT_SAMPLE_SIZE_MASK;
+                ctrl |= sample_size << JZ_AIC_CTRL_INPUT_SAMPLE_SIZE_OFFSET;
+
+                pcm_config = &i2s->pcm_config_capture;
+                pcm_config->dma_config.src_width = dma_width;
+        }
+
+        jz4740_i2s_write(i2s, JZ_REG_AIC_CTRL, ctrl);
+
+        snd_soc_dai_set_dma_data(dai, substream, pcm_config);
+
+        return 0;
+}
+
+static int jz4740_i2s_set_sysclk(struct snd_soc_dai *dai, int clk_id,
+        unsigned int freq, int dir)
+{
+        struct jz4740_i2s *i2s = jz4740_dai_to_i2s(dai);
+        struct clk *parent;
+        int ret = 0;
+
+        switch (clk_id) {
+        case JZ4740_I2S_CLKSRC_EXT:
+                parent = clk_get(NULL, "ext");
+                clk_set_parent(i2s->clk_i2s, parent);
+                break;
+        case JZ4740_I2S_CLKSRC_PLL:
+                parent = clk_get(NULL, "pll half");
+                clk_set_parent(i2s->clk_i2s, parent);
+                ret = clk_set_rate(i2s->clk_i2s, freq);
+                break;
+        default:
+                return -EINVAL;
+        }
+        clk_put(parent);
+
+        return ret;
+}
+
+static int jz4740_i2s_suspend(struct snd_soc_dai *dai)
+{
+        struct jz4740_i2s *i2s = jz4740_dai_to_i2s(dai);
+        uint32_t conf;
+
+        if (dai->active) {
+                conf = jz4740_i2s_read(i2s, JZ_REG_AIC_CONF);
+                conf &= ~JZ_AIC_CONF_ENABLE;
+                jz4740_i2s_write(i2s, JZ_REG_AIC_CONF, conf);
+
+                clk_disable(i2s->clk_i2s);
+        }
+
+        clk_disable(i2s->clk_aic);
+
+        return 0;
+}
+
+static int jz4740_i2s_resume(struct snd_soc_dai *dai)
+{
+        struct jz4740_i2s *i2s = jz4740_dai_to_i2s(dai);
+        uint32_t conf;
+
+        clk_enable(i2s->clk_aic);
+
+        if (dai->active) {
+                clk_enable(i2s->clk_i2s);
+
+                conf = jz4740_i2s_read(i2s, JZ_REG_AIC_CONF);
+                conf |= JZ_AIC_CONF_ENABLE;
+                jz4740_i2s_write(i2s, JZ_REG_AIC_CONF, conf);
+        }
+
+        return 0;
+}
+
+static int jz4740_i2s_probe(struct platform_device *pdev, struct snd_soc_dai *dai)
+{
+        struct jz4740_i2s *i2s = jz4740_dai_to_i2s(dai);
+        uint32_t conf;
+
+        conf = (7 << JZ_AIC_CONF_FIFO_RX_THRESHOLD_OFFSET) |
+                (8 << JZ_AIC_CONF_FIFO_TX_THRESHOLD_OFFSET) |
+                JZ_AIC_CONF_OVERFLOW_PLAY_LAST |
+                JZ_AIC_CONF_I2S |
+                JZ_AIC_CONF_INTERNAL_CODEC;
+
+        jz4740_i2s_write(i2s, JZ_REG_AIC_CONF, JZ_AIC_CONF_RESET);
+        jz4740_i2s_write(i2s, JZ_REG_AIC_CONF, conf);
+
+        return 0;
+}
+
+static struct snd_soc_dai_ops jz4740_i2s_dai_ops = {
+        .startup = jz4740_i2s_startup,
+        .shutdown = jz4740_i2s_shutdown,
+        .trigger = jz4740_i2s_trigger,
+        .hw_params = jz4740_i2s_hw_params,
+        .set_fmt = jz4740_i2s_set_fmt,
+        .set_sysclk = jz4740_i2s_set_sysclk,
+};
+
+#define JZ4740_I2S_FMTS (SNDRV_PCM_FMTBIT_S8 | \
+                SNDRV_PCM_FMTBIT_S16_LE)
+
+struct snd_soc_dai jz4740_i2s_dai = {
+        .name = "jz4740-i2s",
+        .probe = jz4740_i2s_probe,
+        .playback = {
+                .channels_min = 1,
+                .channels_max = 2,
+                .rates = SNDRV_PCM_RATE_8000_48000,
+                .formats = JZ4740_I2S_FMTS,
+        },
+        .capture = {
+                .channels_min = 2,
+                .channels_max = 2,
+                .rates = SNDRV_PCM_RATE_8000_48000,
+                .formats = JZ4740_I2S_FMTS,
+        },
+        .symmetric_rates = 1,
+        .ops = &jz4740_i2s_dai_ops,
+        .suspend = jz4740_i2s_suspend,
+        .resume = jz4740_i2s_resume,
+};
+EXPORT_SYMBOL_GPL(jz4740_i2s_dai);
+
+static void __devinit jz4740_i2c_init_pcm_config(struct jz4740_i2s *i2s)
+{
+        struct jz4740_dma_config *dma_config;
+
+        /* Playback */
+        dma_config = &i2s->pcm_config_playback.dma_config;
+        dma_config->src_width = JZ4740_DMA_WIDTH_32BIT,
+        dma_config->transfer_size = JZ4740_DMA_TRANSFER_SIZE_16BYTE;
+        dma_config->request_type = JZ4740_DMA_TYPE_AIC_TRANSMIT;
+        dma_config->flags = JZ4740_DMA_SRC_AUTOINC;
+        dma_config->mode = JZ4740_DMA_MODE_SINGLE;
+        i2s->pcm_config_playback.fifo_addr = i2s->phys_base + JZ_REG_AIC_FIFO;
+
+        /* Capture */
+        dma_config = &i2s->pcm_config_capture.dma_config;
+        dma_config->dst_width = JZ4740_DMA_WIDTH_32BIT,
+        dma_config->transfer_size = JZ4740_DMA_TRANSFER_SIZE_16BYTE;
+        dma_config->request_type = JZ4740_DMA_TYPE_AIC_RECEIVE;
+        dma_config->flags = JZ4740_DMA_DST_AUTOINC;
+        dma_config->mode = JZ4740_DMA_MODE_SINGLE;
+        i2s->pcm_config_capture.fifo_addr = i2s->phys_base + JZ_REG_AIC_FIFO;
+}
+
+static int __devinit jz4740_i2s_dev_probe(struct platform_device *pdev)
+{
+        struct jz4740_i2s *i2s;
+        int ret;
+
+        i2s = kzalloc(sizeof(*i2s), GFP_KERNEL);
+
+        if (!i2s)
+                return -ENOMEM;
+
+        i2s->mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!i2s->mem) {
+                ret = -ENOENT;
+                goto err_free;
+        }
+
+        i2s->mem = request_mem_region(i2s->mem->start, resource_size(i2s->mem),
+                                pdev->name);
+        if (!i2s->mem) {
+                ret = -EBUSY;
+                goto err_free;
+        }
+
+        i2s->base = ioremap_nocache(i2s->mem->start, resource_size(i2s->mem));
+        if (!i2s->base) {
+                ret = -EBUSY;
+                goto err_release_mem_region;
+        }
+
+        i2s->phys_base = i2s->mem->start;
+
+        i2s->clk_aic = clk_get(&pdev->dev, "aic");
+        if (IS_ERR(i2s->clk_aic)) {
+                ret = PTR_ERR(i2s->clk_aic);
+                goto err_iounmap;
+        }
+
+        i2s->clk_i2s = clk_get(&pdev->dev, "i2s");
+        if (IS_ERR(i2s->clk_i2s)) {
+                ret = PTR_ERR(i2s->clk_i2s);
+                goto err_clk_put_aic;
+        }
+
+        clk_enable(i2s->clk_aic);
+
+        jz4740_i2c_init_pcm_config(i2s);
+
+        jz4740_i2s_dai.private_data = i2s;
+        ret = snd_soc_register_dai(&jz4740_i2s_dai);
+
+        if (ret) {
+                dev_err(&pdev->dev, "Failed to register DAI\n");
+                goto err_clk_put_i2s;
+        }
+
+        platform_set_drvdata(pdev, i2s);
+
+        return 0;
+
+err_clk_put_i2s:
+        clk_disable(i2s->clk_aic);
+        clk_put(i2s->clk_i2s);
+err_clk_put_aic:
+        clk_put(i2s->clk_aic);
+err_iounmap:
+        iounmap(i2s->base);
+err_release_mem_region:
+        release_mem_region(i2s->mem->start, resource_size(i2s->mem));
+err_free:
+        kfree(i2s);
+
+        return ret;
+}
+
+static int __devexit jz4740_i2s_dev_remove(struct platform_device *pdev)
+{
+        struct jz4740_i2s *i2s = platform_get_drvdata(pdev);
+
+        snd_soc_unregister_dai(&jz4740_i2s_dai);
+
+        clk_disable(i2s->clk_aic);
+        clk_put(i2s->clk_i2s);
+        clk_put(i2s->clk_aic);
+
+        iounmap(i2s->base);
+        release_mem_region(i2s->mem->start, resource_size(i2s->mem));
+
+        platform_set_drvdata(pdev, NULL);
+        kfree(i2s);
+
+        return 0;
+}
+
+static struct platform_driver jz4740_i2s_driver = {
+        .probe = jz4740_i2s_dev_probe,
+        .remove = __devexit_p(jz4740_i2s_dev_remove),
+        .driver = {
+                .name = "jz4740-i2s",
+                .owner = THIS_MODULE,
+        },
+};
+
+static int __init jz4740_i2s_init(void)
+{
+        return platform_driver_register(&jz4740_i2s_driver);
+}
+module_init(jz4740_i2s_init);
+
+static void __exit jz4740_i2s_exit(void)
+{
+        platform_driver_unregister(&jz4740_i2s_driver);
+}
+module_exit(jz4740_i2s_exit);
+
+MODULE_AUTHOR("Lars-Peter Clausen, <lars@metafoo.de>");
+MODULE_DESCRIPTION("Ingenic JZ4740 SoC I2S driver");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:jz4740-i2s");
diff --git a/sound/soc/jz4740/jz4740-i2s.h b/sound/soc/jz4740/jz4740-i2s.h
new file mode 100644
index 000000000000..da22ed88a589
--- /dev/null
+++ b/sound/soc/jz4740/jz4740-i2s.h
@@ -0,0 +1,18 @@
+/*
+ * 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 _JZ4740_I2S_H
+#define _JZ4740_I2S_H
+
+/* I2S clock source */
+#define JZ4740_I2S_CLKSRC_EXT 0
+#define JZ4740_I2S_CLKSRC_PLL 1
+
+#define JZ4740_I2S_BIT_CLK              0
+
+extern struct snd_soc_dai jz4740_i2s_dai;
+
+#endif
diff --git a/sound/soc/jz4740/jz4740-pcm.c b/sound/soc/jz4740/jz4740-pcm.c
new file mode 100644
index 000000000000..ee68d850c8dd
--- /dev/null
+++ b/sound/soc/jz4740/jz4740-pcm.c
@@ -0,0 +1,373 @@
+/*
+ *  Copyright (C) 2010, Lars-Peter Clausen <lars@metafoo.de>
+ *
+ *  This program is free software; you can redistribute  it and/or modify it
+ *  under  the terms of  the GNU General  Public License as published by the
+ *  Free Software Foundation;  either version 2 of the  License, or (at your
+ *  option) any later version.
+ *
+ *  You should have received a copy of the  GNU General Public License along
+ *  with this program; if not, write  to the Free Software Foundation, Inc.,
+ *  675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+
+#include <linux/dma-mapping.h>
+
+#include <sound/core.h>
+#include <sound/pcm.h>
+#include <sound/pcm_params.h>
+#include <sound/soc.h>
+
+#include <asm/mach-jz4740/dma.h>
+#include "jz4740-pcm.h"
+
+struct jz4740_runtime_data {
+        unsigned long dma_period;
+        dma_addr_t dma_start;
+        dma_addr_t dma_pos;
+        dma_addr_t dma_end;
+
+        struct jz4740_dma_chan *dma;
+
+        dma_addr_t fifo_addr;
+};
+
+/* identify hardware playback capabilities */
+static const struct snd_pcm_hardware jz4740_pcm_hardware = {
+        .info = SNDRV_PCM_INFO_MMAP |
+                SNDRV_PCM_INFO_MMAP_VALID |
+                SNDRV_PCM_INFO_INTERLEAVED |
+                SNDRV_PCM_INFO_BLOCK_TRANSFER,
+        .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S8,
+
+        .rates                  = SNDRV_PCM_RATE_8000_48000,
+        .channels_min           = 1,
+        .channels_max           = 2,
+        .period_bytes_min       = 16,
+        .period_bytes_max       = 2 * PAGE_SIZE,
+        .periods_min            = 2,
+        .periods_max            = 128,
+        .buffer_bytes_max       = 128 * 2 * PAGE_SIZE,
+        .fifo_size              = 32,
+};
+
+static void jz4740_pcm_start_transfer(struct jz4740_runtime_data *prtd,
+        struct snd_pcm_substream *substream)
+{
+        unsigned long count;
+
+        if (prtd->dma_pos == prtd->dma_end)
+                prtd->dma_pos = prtd->dma_start;
+
+        if (prtd->dma_pos + prtd->dma_period > prtd->dma_end)
+                count = prtd->dma_end - prtd->dma_pos;
+        else
+                count = prtd->dma_period;
+
+        jz4740_dma_disable(prtd->dma);
+
+        if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
+                jz4740_dma_set_src_addr(prtd->dma, prtd->dma_pos);
+                jz4740_dma_set_dst_addr(prtd->dma, prtd->fifo_addr);
+        } else {
+                jz4740_dma_set_src_addr(prtd->dma, prtd->fifo_addr);
+                jz4740_dma_set_dst_addr(prtd->dma, prtd->dma_pos);
+        }
+
+        jz4740_dma_set_transfer_count(prtd->dma, count);
+
+        prtd->dma_pos += count;
+
+        jz4740_dma_enable(prtd->dma);
+}
+
+static void jz4740_pcm_dma_transfer_done(struct jz4740_dma_chan *dma, int err,
+        void *dev_id)
+{
+        struct snd_pcm_substream *substream = dev_id;
+        struct snd_pcm_runtime *runtime = substream->runtime;
+        struct jz4740_runtime_data *prtd = runtime->private_data;
+
+        snd_pcm_period_elapsed(substream);
+
+        jz4740_pcm_start_transfer(prtd, substream);
+}
+
+static int jz4740_pcm_hw_params(struct snd_pcm_substream *substream,
+        struct snd_pcm_hw_params *params)
+{
+        struct snd_pcm_runtime *runtime = substream->runtime;
+        struct jz4740_runtime_data *prtd = runtime->private_data;
+        struct snd_soc_pcm_runtime *rtd = substream->private_data;
+        struct jz4740_pcm_config *config;
+
+        config = snd_soc_dai_get_dma_data(rtd->dai->cpu_dai, substream);
+
+        if (!config)
+                return 0;
+
+        if (!prtd->dma) {
+                if (substream->stream == SNDRV_PCM_STREAM_CAPTURE)
+                        prtd->dma = jz4740_dma_request(substream, "PCM Capture");
+                else
+                        prtd->dma = jz4740_dma_request(substream, "PCM Playback");
+        }
+
+        if (!prtd->dma)
+                return -EBUSY;
+
+        jz4740_dma_configure(prtd->dma, &config->dma_config);
+        prtd->fifo_addr = config->fifo_addr;
+
+        jz4740_dma_set_complete_cb(prtd->dma, jz4740_pcm_dma_transfer_done);
+
+        snd_pcm_set_runtime_buffer(substream, &substream->dma_buffer);
+        runtime->dma_bytes = params_buffer_bytes(params);
+
+        prtd->dma_period = params_period_bytes(params);
+        prtd->dma_start = runtime->dma_addr;
+        prtd->dma_pos = prtd->dma_start;
+        prtd->dma_end = prtd->dma_start + runtime->dma_bytes;
+
+        return 0;
+}
+
+static int jz4740_pcm_hw_free(struct snd_pcm_substream *substream)
+{
+        struct jz4740_runtime_data *prtd = substream->runtime->private_data;
+
+        snd_pcm_set_runtime_buffer(substream, NULL);
+        if (prtd->dma) {
+                jz4740_dma_free(prtd->dma);
+                prtd->dma = NULL;
+        }
+
+        return 0;
+}
+
+static int jz4740_pcm_prepare(struct snd_pcm_substream *substream)
+{
+        struct jz4740_runtime_data *prtd = substream->runtime->private_data;
+
+        if (!prtd->dma)
+                return -EBUSY;
+
+        prtd->dma_pos = prtd->dma_start;
+
+        return 0;
+}
+
+static int jz4740_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
+{
+        struct snd_pcm_runtime *runtime = substream->runtime;
+        struct jz4740_runtime_data *prtd = runtime->private_data;
+
+        switch (cmd) {
+        case SNDRV_PCM_TRIGGER_START:
+        case SNDRV_PCM_TRIGGER_RESUME:
+        case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
+                jz4740_pcm_start_transfer(prtd, substream);
+                break;
+        case SNDRV_PCM_TRIGGER_STOP:
+        case SNDRV_PCM_TRIGGER_SUSPEND:
+        case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
+                jz4740_dma_disable(prtd->dma);
+                break;
+        default:
+                break;
+        }
+
+        return 0;
+}
+
+static snd_pcm_uframes_t jz4740_pcm_pointer(struct snd_pcm_substream *substream)
+{
+        struct snd_pcm_runtime *runtime = substream->runtime;
+        struct jz4740_runtime_data *prtd = runtime->private_data;
+        unsigned long byte_offset;
+        snd_pcm_uframes_t offset;
+        struct jz4740_dma_chan *dma = prtd->dma;
+
+        /* prtd->dma_pos points to the end of the current transfer. So by
+         * subtracting prdt->dma_start we get the offset to the end of the
+         * current period in bytes. By subtracting the residue of the transfer
+         * we get the current offset in bytes. */
+        byte_offset = prtd->dma_pos - prtd->dma_start;
+        byte_offset -= jz4740_dma_get_residue(dma);
+
+        offset = bytes_to_frames(runtime, byte_offset);
+        if (offset >= runtime->buffer_size)
+                offset = 0;
+
+        return offset;
+}
+
+static int jz4740_pcm_open(struct snd_pcm_substream *substream)
+{
+        struct snd_pcm_runtime *runtime = substream->runtime;
+        struct jz4740_runtime_data *prtd;
+
+        prtd = kzalloc(sizeof(*prtd), GFP_KERNEL);
+        if (prtd == NULL)
+                return -ENOMEM;
+
+        snd_soc_set_runtime_hwparams(substream, &jz4740_pcm_hardware);
+
+        runtime->private_data = prtd;
+
+        return 0;
+}
+
+static int jz4740_pcm_close(struct snd_pcm_substream *substream)
+{
+        struct snd_pcm_runtime *runtime = substream->runtime;
+        struct jz4740_runtime_data *prtd = runtime->private_data;
+
+        kfree(prtd);
+
+        return 0;
+}
+
+static int jz4740_pcm_mmap(struct snd_pcm_substream *substream,
+        struct vm_area_struct *vma)
+{
+        return remap_pfn_range(vma, vma->vm_start,
+                        substream->dma_buffer.addr >> PAGE_SHIFT,
+                        vma->vm_end - vma->vm_start, vma->vm_page_prot);
+}
+
+static struct snd_pcm_ops jz4740_pcm_ops = {
+        .open           = jz4740_pcm_open,
+        .close          = jz4740_pcm_close,
+        .ioctl          = snd_pcm_lib_ioctl,
+        .hw_params      = jz4740_pcm_hw_params,
+        .hw_free        = jz4740_pcm_hw_free,
+        .prepare        = jz4740_pcm_prepare,
+        .trigger        = jz4740_pcm_trigger,
+        .pointer        = jz4740_pcm_pointer,
+        .mmap           = jz4740_pcm_mmap,
+};
+
+static int jz4740_pcm_preallocate_dma_buffer(struct snd_pcm *pcm, int stream)
+{
+        struct snd_pcm_substream *substream = pcm->streams[stream].substream;
+        struct snd_dma_buffer *buf = &substream->dma_buffer;
+        size_t size = jz4740_pcm_hardware.buffer_bytes_max;
+
+        buf->dev.type = SNDRV_DMA_TYPE_DEV;
+        buf->dev.dev = pcm->card->dev;
+        buf->private_data = NULL;
+
+        buf->area = dma_alloc_noncoherent(pcm->card->dev, size,
+                                          &buf->addr, GFP_KERNEL);
+        if (!buf->area)
+                return -ENOMEM;
+
+        buf->bytes = size;
+
+        return 0;
+}
+
+static void jz4740_pcm_free(struct snd_pcm *pcm)
+{
+        struct snd_pcm_substream *substream;
+        struct snd_dma_buffer *buf;
+        int stream;
+
+        for (stream = 0; stream < SNDRV_PCM_STREAM_LAST; ++stream) {
+                substream = pcm->streams[stream].substream;
+                if (!substream)
+                        continue;
+
+                buf = &substream->dma_buffer;
+                if (!buf->area)
+                        continue;
+
+                dma_free_noncoherent(pcm->card->dev, buf->bytes, buf->area,
+                                buf->addr);
+                buf->area = NULL;
+        }
+}
+
+static u64 jz4740_pcm_dmamask = DMA_BIT_MASK(32);
+
+int jz4740_pcm_new(struct snd_card *card, struct snd_soc_dai *dai,
+        struct snd_pcm *pcm)
+{
+        int ret = 0;
+
+        if (!card->dev->dma_mask)
+                card->dev->dma_mask = &jz4740_pcm_dmamask;
+
+        if (!card->dev->coherent_dma_mask)
+                card->dev->coherent_dma_mask = DMA_BIT_MASK(32);
+
+        if (dai->playback.channels_min) {
+                ret = jz4740_pcm_preallocate_dma_buffer(pcm,
+                        SNDRV_PCM_STREAM_PLAYBACK);
+                if (ret)
+                        goto err;
+        }
+
+        if (dai->capture.channels_min) {
+                ret = jz4740_pcm_preallocate_dma_buffer(pcm,
+                        SNDRV_PCM_STREAM_CAPTURE);
+                if (ret)
+                        goto err;
+        }
+
+err:
+        return ret;
+}
+
+struct snd_soc_platform jz4740_soc_platform = {
+                .name           = "jz4740-pcm",
+                .pcm_ops        = &jz4740_pcm_ops,
+                .pcm_new        = jz4740_pcm_new,
+                .pcm_free       = jz4740_pcm_free,
+};
+EXPORT_SYMBOL_GPL(jz4740_soc_platform);
+
+static int __devinit jz4740_pcm_probe(struct platform_device *pdev)
+{
+        return snd_soc_register_platform(&jz4740_soc_platform);
+}
+
+static int __devexit jz4740_pcm_remove(struct platform_device *pdev)
+{
+        snd_soc_unregister_platform(&jz4740_soc_platform);
+        return 0;
+}
+
+static struct platform_driver jz4740_pcm_driver = {
+        .probe = jz4740_pcm_probe,
+        .remove = __devexit_p(jz4740_pcm_remove),
+        .driver = {
+                .name = "jz4740-pcm",
+                .owner = THIS_MODULE,
+        },
+};
+
+static int __init jz4740_soc_platform_init(void)
+{
+        return platform_driver_register(&jz4740_pcm_driver);
+}
+module_init(jz4740_soc_platform_init);
+
+static void __exit jz4740_soc_platform_exit(void)
+{
+        return platform_driver_unregister(&jz4740_pcm_driver);
+}
+module_exit(jz4740_soc_platform_exit);
+
+MODULE_AUTHOR("Lars-Peter Clausen <lars@metafoo.de>");
+MODULE_DESCRIPTION("Ingenic SoC JZ4740 PCM driver");
+MODULE_LICENSE("GPL");
diff --git a/sound/soc/jz4740/jz4740-pcm.h b/sound/soc/jz4740/jz4740-pcm.h
new file mode 100644
index 000000000000..e3f221e2779c
--- /dev/null
+++ b/sound/soc/jz4740/jz4740-pcm.h
@@ -0,0 +1,22 @@
+/*
+ *
+ * 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 _JZ4740_PCM_H
+#define _JZ4740_PCM_H
+
+#include <linux/dma-mapping.h>
+#include <asm/mach-jz4740/dma.h>
+
+/* platform data */
+extern struct snd_soc_platform jz4740_soc_platform;
+
+struct jz4740_pcm_config {
+        struct jz4740_dma_config dma_config;
+        phys_addr_t fifo_addr;
+};
+
+#endif
diff --git a/sound/soc/jz4740/qi_lb60.c b/sound/soc/jz4740/qi_lb60.c
new file mode 100644
index 000000000000..f15f4918f15f
--- /dev/null
+++ b/sound/soc/jz4740/qi_lb60.c
@@ -0,0 +1,166 @@
+/*
+ * Copyright (C) 2009, Lars-Peter Clausen <lars@metafoo.de>
+ *
+ * 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.
+ *
+ *  You should have received a copy of the  GNU General Public License along
+ *  with this program; if not, write  to the Free Software Foundation, Inc.,
+ *  675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#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 <linux/gpio.h>
+
+#include "../codecs/jz4740.h"
+#include "jz4740-pcm.h"
+#include "jz4740-i2s.h"
+
+
+#define QI_LB60_SND_GPIO JZ_GPIO_PORTB(29)
+#define QI_LB60_AMP_GPIO JZ_GPIO_PORTD(4)
+
+static int qi_lb60_spk_event(struct snd_soc_dapm_widget *widget,
+                             struct snd_kcontrol *ctrl, int event)
+{
+        int on = 0;
+        if (event & SND_SOC_DAPM_POST_PMU)
+                on = 1;
+        else if (event & SND_SOC_DAPM_PRE_PMD)
+                on = 0;
+
+        gpio_set_value(QI_LB60_SND_GPIO, on);
+        gpio_set_value(QI_LB60_AMP_GPIO, on);
+
+        return 0;
+}
+
+static const struct snd_soc_dapm_widget qi_lb60_widgets[] = {
+        SND_SOC_DAPM_SPK("Speaker", qi_lb60_spk_event),
+        SND_SOC_DAPM_MIC("Mic", NULL),
+};
+
+static const struct snd_soc_dapm_route qi_lb60_routes[] = {
+        {"Mic", NULL, "MIC"},
+        {"Speaker", NULL, "LOUT"},
+        {"Speaker", NULL, "ROUT"},
+};
+
+#define QI_LB60_DAIFMT (SND_SOC_DAIFMT_I2S | \
+                        SND_SOC_DAIFMT_NB_NF | \
+                        SND_SOC_DAIFMT_CBM_CFM)
+
+static int qi_lb60_codec_init(struct snd_soc_codec *codec)
+{
+        int ret;
+        struct snd_soc_dai *cpu_dai = codec->socdev->card->dai_link->cpu_dai;
+
+        snd_soc_dapm_nc_pin(codec, "LIN");
+        snd_soc_dapm_nc_pin(codec, "RIN");
+
+        ret = snd_soc_dai_set_fmt(cpu_dai, QI_LB60_DAIFMT);
+        if (ret < 0) {
+                dev_err(codec->dev, "Failed to set cpu dai format: %d\n", ret);
+                return ret;
+        }
+
+        snd_soc_dapm_new_controls(codec, qi_lb60_widgets, ARRAY_SIZE(qi_lb60_widgets));
+        snd_soc_dapm_add_routes(codec, qi_lb60_routes, ARRAY_SIZE(qi_lb60_routes));
+        snd_soc_dapm_sync(codec);
+
+        return 0;
+}
+
+static struct snd_soc_dai_link qi_lb60_dai = {
+        .name = "jz4740",
+        .stream_name = "jz4740",
+        .cpu_dai = &jz4740_i2s_dai,
+        .codec_dai = &jz4740_codec_dai,
+        .init = qi_lb60_codec_init,
+};
+
+static struct snd_soc_card qi_lb60 = {
+        .name = "QI LB60",
+        .dai_link = &qi_lb60_dai,
+        .num_links = 1,
+        .platform = &jz4740_soc_platform,
+};
+
+static struct snd_soc_device qi_lb60_snd_devdata = {
+        .card = &qi_lb60,
+        .codec_dev = &soc_codec_dev_jz4740_codec,
+};
+
+static struct platform_device *qi_lb60_snd_device;
+
+static int __init qi_lb60_init(void)
+{
+        int ret;
+
+        qi_lb60_snd_device = platform_device_alloc("soc-audio", -1);
+
+        if (!qi_lb60_snd_device)
+                return -ENOMEM;
+
+        ret = gpio_request(QI_LB60_SND_GPIO, "SND");
+        if (ret) {
+                pr_err("qi_lb60 snd: Failed to request SND GPIO(%d): %d\n",
+                                QI_LB60_SND_GPIO, ret);
+                goto err_device_put;
+        }
+
+        ret = gpio_request(QI_LB60_AMP_GPIO, "AMP");
+        if (ret) {
+                pr_err("qi_lb60 snd: Failed to request AMP GPIO(%d): %d\n",
+                                QI_LB60_AMP_GPIO, ret);
+                goto err_gpio_free_snd;
+        }
+
+        gpio_direction_output(QI_LB60_SND_GPIO, 0);
+        gpio_direction_output(QI_LB60_AMP_GPIO, 0);
+
+        platform_set_drvdata(qi_lb60_snd_device, &qi_lb60_snd_devdata);
+        qi_lb60_snd_devdata.dev = &qi_lb60_snd_device->dev;
+
+        ret = platform_device_add(qi_lb60_snd_device);
+        if (ret) {
+                pr_err("qi_lb60 snd: Failed to add snd soc device: %d\n", ret);
+                goto err_unset_pdata;
+        }
+
+         return 0;
+
+err_unset_pdata:
+        platform_set_drvdata(qi_lb60_snd_device, NULL);
+/*err_gpio_free_amp:*/
+        gpio_free(QI_LB60_AMP_GPIO);
+err_gpio_free_snd:
+        gpio_free(QI_LB60_SND_GPIO);
+err_device_put:
+        platform_device_put(qi_lb60_snd_device);
+
+        return ret;
+}
+module_init(qi_lb60_init);
+
+static void __exit qi_lb60_exit(void)
+{
+        gpio_free(QI_LB60_AMP_GPIO);
+        gpio_free(QI_LB60_SND_GPIO);
+        platform_device_unregister(qi_lb60_snd_device);
+}
+module_exit(qi_lb60_exit);
+
+MODULE_AUTHOR("Lars-Peter Clausen <lars@metafoo.de>");
+MODULE_DESCRIPTION("ALSA SoC QI LB60 Audio support");
+MODULE_LICENSE("GPL v2");