Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: fixes for 3.4

A bunch of driver-specific fixes and one generic fix for the new support
for platform DAPM contexts - we were picking the wrong default for the
idle_bias_off setting which was meaning we weren't actually achieving
any useful runtime PM on platform devices.

38 files changed, 257 insertions, 185 deletions

diff --git a/sound/arm/aaci.c b/sound/arm/aaci.c
index b37b702a3a6a..5119fdabcb98 100644
--- a/sound/arm/aaci.c
+++ b/sound/arm/aaci.c
@@ -1110,18 +1110,7 @@ static struct amba_driver aaci_driver = {
         .id_table       = aaci_ids,
 };
 
-static int __init aaci_init(void)
-{
-        return amba_driver_register(&aaci_driver);
-}
-
-static void __exit aaci_exit(void)
-{
-        amba_driver_unregister(&aaci_driver);
-}
-
-module_init(aaci_init);
-module_exit(aaci_exit);
+module_amba_driver(aaci_driver);
 
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("ARM PrimeCell PL041 Advanced Audio CODEC Interface driver");
diff --git a/sound/arm/pxa2xx-ac97-lib.c b/sound/arm/pxa2xx-ac97-lib.c
index d1aa4218f129..48d7c0aa5073 100644
--- a/sound/arm/pxa2xx-ac97-lib.c
+++ b/sound/arm/pxa2xx-ac97-lib.c
@@ -17,11 +17,12 @@
 #include <linux/clk.h>
 #include <linux/delay.h>
 #include <linux/module.h>
+#include <linux/io.h>
 
 #include <sound/ac97_codec.h>
 #include <sound/pxa2xx-lib.h>
 
-#include <asm/irq.h>
+#include <mach/irqs.h>
 #include <mach/regs-ac97.h>
 #include <mach/audio.h>
 
diff --git a/sound/arm/pxa2xx-ac97.c b/sound/arm/pxa2xx-ac97.c
index 3a39626a82d6..afef72c4f0d3 100644
--- a/sound/arm/pxa2xx-ac97.c
+++ b/sound/arm/pxa2xx-ac97.c
@@ -11,6 +11,7 @@
  */
 
 #include <linux/init.h>
+#include <linux/io.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 
diff --git a/sound/atmel/abdac.c b/sound/atmel/abdac.c
index 4fa1dbd8ee83..f7c2bb08055d 100644
--- a/sound/atmel/abdac.c
+++ b/sound/atmel/abdac.c
@@ -16,6 +16,7 @@
 #include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
+#include <linux/types.h>
 #include <linux/io.h>
 
 #include <sound/core.h>
@@ -467,15 +468,24 @@ static int __devinit atmel_abdac_probe(struct platform_device *pdev)
         snd_card_set_dev(card, &pdev->dev);
 
         if (pdata->dws.dma_dev) {
-                struct dw_dma_slave *dws = &pdata->dws;
                 dma_cap_mask_t mask;
 
-                dws->tx_reg = regs->start + DAC_DATA;
-
                 dma_cap_zero(mask);
                 dma_cap_set(DMA_SLAVE, mask);
 
-                dac->dma.chan = dma_request_channel(mask, filter, dws);
+                dac->dma.chan = dma_request_channel(mask, filter, &pdata->dws);
+                if (dac->dma.chan) {
+                        struct dma_slave_config dma_conf = {
+                                .dst_addr = regs->start + DAC_DATA,
+                                .dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES,
+                                .src_maxburst = 1,
+                                .dst_maxburst = 1,
+                                .direction = DMA_MEM_TO_DEV,
+                                .device_fc = false,
+                        };
+
+                        dmaengine_slave_config(dac->dma.chan, &dma_conf);
+                }
         }
         if (!pdata->dws.dma_dev || !dac->dma.chan) {
                 dev_dbg(&pdev->dev, "DMA not available\n");
diff --git a/sound/atmel/ac97c.c b/sound/atmel/ac97c.c
index 61dade698358..115313ef54d6 100644
--- a/sound/atmel/ac97c.c
+++ b/sound/atmel/ac97c.c
@@ -20,6 +20,7 @@
 #include <linux/platform_device.h>
 #include <linux/mutex.h>
 #include <linux/gpio.h>
+#include <linux/types.h>
 #include <linux/io.h>
 
 #include <sound/core.h>
@@ -1014,16 +1015,28 @@ static int __devinit atmel_ac97c_probe(struct platform_device *pdev)
 
         if (cpu_is_at32ap7000()) {
                 if (pdata->rx_dws.dma_dev) {
-                        struct dw_dma_slave *dws = &pdata->rx_dws;
                         dma_cap_mask_t mask;
 
-                        dws->rx_reg = regs->start + AC97C_CARHR + 2;
-
                         dma_cap_zero(mask);
                         dma_cap_set(DMA_SLAVE, mask);
 
                         chip->dma.rx_chan = dma_request_channel(mask, filter,
-                                                                dws);
+                                                                &pdata->rx_dws);
+                        if (chip->dma.rx_chan) {
+                                struct dma_slave_config dma_conf = {
+                                        .src_addr = regs->start + AC97C_CARHR +
+                                                2,
+                                        .src_addr_width =
+                                                DMA_SLAVE_BUSWIDTH_2_BYTES,
+                                        .src_maxburst = 1,
+                                        .dst_maxburst = 1,
+                                        .direction = DMA_DEV_TO_MEM,
+                                        .device_fc = false,
+                                };
+
+                                dmaengine_slave_config(chip->dma.rx_chan,
+                                                &dma_conf);
+                        }
 
                         dev_info(&chip->pdev->dev, "using %s for DMA RX\n",
                                 dev_name(&chip->dma.rx_chan->dev->device));
@@ -1031,16 +1044,28 @@ static int __devinit atmel_ac97c_probe(struct platform_device *pdev)
                 }
 
                 if (pdata->tx_dws.dma_dev) {
-                        struct dw_dma_slave *dws = &pdata->tx_dws;
                         dma_cap_mask_t mask;
 
-                        dws->tx_reg = regs->start + AC97C_CATHR + 2;
-
                         dma_cap_zero(mask);
                         dma_cap_set(DMA_SLAVE, mask);
 
                         chip->dma.tx_chan = dma_request_channel(mask, filter,
-                                                                dws);
+                                                                &pdata->tx_dws);
+                        if (chip->dma.tx_chan) {
+                                struct dma_slave_config dma_conf = {
+                                        .dst_addr = regs->start + AC97C_CATHR +
+                                                2,
+                                        .dst_addr_width =
+                                                DMA_SLAVE_BUSWIDTH_2_BYTES,
+                                        .src_maxburst = 1,
+                                        .dst_maxburst = 1,
+                                        .direction = DMA_MEM_TO_DEV,
+                                        .device_fc = false,
+                                };
+
+                                dmaengine_slave_config(chip->dma.tx_chan,
+                                                &dma_conf);
+                        }
 
                         dev_info(&chip->pdev->dev, "using %s for DMA TX\n",
                                 dev_name(&chip->dma.tx_chan->dev->device));
diff --git a/sound/core/init.c b/sound/core/init.c
index 068cf08d3ffb..d8ec849af128 100644
--- a/sound/core/init.c
+++ b/sound/core/init.c
@@ -22,6 +22,7 @@
 #include <linux/init.h>
 #include <linux/sched.h>
 #include <linux/module.h>
+#include <linux/device.h>
 #include <linux/file.h>
 #include <linux/slab.h>
 #include <linux/time.h>
diff --git a/sound/core/pcm.c b/sound/core/pcm.c
index 6e4bfcc14254..1a3070b4e5b5 100644
--- a/sound/core/pcm.c
+++ b/sound/core/pcm.c
@@ -24,6 +24,7 @@
 #include <linux/module.h>
 #include <linux/time.h>
 #include <linux/mutex.h>
+#include <linux/device.h>
 #include <sound/core.h>
 #include <sound/minors.h>
 #include <sound/pcm.h>
diff --git a/sound/core/seq/seq.c b/sound/core/seq/seq.c
index 9d8379aedf40..712110561082 100644
--- a/sound/core/seq/seq.c
+++ b/sound/core/seq/seq.c
@@ -21,6 +21,7 @@
 
 #include <linux/init.h>
 #include <linux/module.h>
+#include <linux/device.h>
 #include <sound/core.h>
 #include <sound/initval.h>
 
diff --git a/sound/core/seq/seq_dummy.c b/sound/core/seq/seq_dummy.c
index bbe32d2177d9..dbc550716790 100644
--- a/sound/core/seq/seq_dummy.c
+++ b/sound/core/seq/seq_dummy.c
@@ -46,7 +46,7 @@
 
   The number of ports to be created can be specified via the module
   parameter "ports".  For example, to create four ports, add the
-  following option in /etc/modprobe.conf:
+  following option in a configuration file under /etc/modprobe.d/:
 
         option snd-seq-dummy ports=4
 
diff --git a/sound/core/timer.c b/sound/core/timer.c
index 8e7561dfc5fc..6ddcf06f52f9 100644
--- a/sound/core/timer.c
+++ b/sound/core/timer.c
@@ -24,6 +24,7 @@
 #include <linux/slab.h>
 #include <linux/time.h>
 #include <linux/mutex.h>
+#include <linux/device.h>
 #include <linux/module.h>
 #include <linux/string.h>
 #include <sound/core.h>
diff --git a/sound/drivers/Kconfig b/sound/drivers/Kconfig
index c8961165277c..fe5ae09ffccb 100644
--- a/sound/drivers/Kconfig
+++ b/sound/drivers/Kconfig
@@ -50,7 +50,8 @@ config SND_PCSP
           before the other sound driver of yours, making the
           pc-speaker a default sound device. Which is likely not
           what you want. To make this driver play nicely with other
-          sound driver, you can add this into your /etc/modprobe.conf:
+          sound driver, you can add this in a configuration file under
+          /etc/modprobe.d/ directory:
           options snd-pcsp index=2
 
           You don't need this driver if you only want your pc-speaker to beep.
diff --git a/sound/firewire/isight.c b/sound/firewire/isight.c
index cd094ecaca3b..d428ffede4f3 100644
--- a/sound/firewire/isight.c
+++ b/sound/firewire/isight.c
@@ -611,7 +611,6 @@ static void isight_card_free(struct snd_card *card)
 
         fw_iso_resources_destroy(&isight->resources);
         fw_unit_put(isight->unit);
-        fw_device_put(isight->device);
         mutex_destroy(&isight->mutex);
 }
 
@@ -644,7 +643,7 @@ static int isight_probe(struct device *unit_dev)
         isight->card = card;
         mutex_init(&isight->mutex);
         isight->unit = fw_unit_get(unit);
-        isight->device = fw_device_get(fw_dev);
+        isight->device = fw_dev;
         isight->audio_base = get_unit_base(unit);
         if (!isight->audio_base) {
                 dev_err(&unit->device, "audio unit base not found\n");
@@ -681,7 +680,6 @@ static int isight_probe(struct device *unit_dev)
 
 err_unit:
         fw_unit_put(isight->unit);
-        fw_device_put(isight->device);
         mutex_destroy(&isight->mutex);
 error:
         snd_card_free(card);
diff --git a/sound/firewire/speakers.c b/sound/firewire/speakers.c
index cbe6bb9e53b6..297244e658d9 100644
--- a/sound/firewire/speakers.c
+++ b/sound/firewire/speakers.c
@@ -656,12 +656,10 @@ static u32 fwspk_read_firmware_version(struct fw_unit *unit)
 static void fwspk_card_free(struct snd_card *card)
 {
         struct fwspk *fwspk = card->private_data;
-        struct fw_device *dev = fw_parent_device(fwspk->unit);
 
         amdtp_out_stream_destroy(&fwspk->stream);
         cmp_connection_destroy(&fwspk->connection);
         fw_unit_put(fwspk->unit);
-        fw_device_put(dev);
         mutex_destroy(&fwspk->mutex);
 }
 
@@ -718,7 +716,6 @@ static int __devinit fwspk_probe(struct device *unit_dev)
         fwspk = card->private_data;
         fwspk->card = card;
         mutex_init(&fwspk->mutex);
-        fw_device_get(fw_dev);
         fwspk->unit = fw_unit_get(unit);
         fwspk->device_info = fwspk_detect(fw_dev);
         if (!fwspk->device_info) {
@@ -767,7 +764,6 @@ err_connection:
         cmp_connection_destroy(&fwspk->connection);
 err_unit:
         fw_unit_put(fwspk->unit);
-        fw_device_put(fw_dev);
         mutex_destroy(&fwspk->mutex);
 error:
         snd_card_free(card);
diff --git a/sound/i2c/other/tea575x-tuner.c b/sound/i2c/other/tea575x-tuner.c
index 6b68c8206805..a63faec5e7fd 100644
--- a/sound/i2c/other/tea575x-tuner.c
+++ b/sound/i2c/other/tea575x-tuner.c
@@ -25,21 +25,20 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
-#include <linux/version.h>
+#include <linux/sched.h>
+#include <media/v4l2-device.h>
 #include <media/v4l2-dev.h>
+#include <media/v4l2-fh.h>
 #include <media/v4l2-ioctl.h>
+#include <media/v4l2-event.h>
 #include <sound/tea575x-tuner.h>
 
 MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_DESCRIPTION("Routines for control of TEA5757/5759 Philips AM/FM radio tuner chips");
 MODULE_LICENSE("GPL");
 
-static int radio_nr = -1;
-module_param(radio_nr, int, 0);
-
-#define RADIO_VERSION KERNEL_VERSION(0, 0, 2)
-#define FREQ_LO          (50UL * 16000)
-#define FREQ_HI         (150UL * 16000)
+#define FREQ_LO          (76U * 16000)
+#define FREQ_HI         (108U * 16000)
 
 /*
  * definitions
@@ -90,7 +89,7 @@ static void snd_tea575x_write(struct snd_tea575x *tea, unsigned int val)
                 tea->ops->set_pins(tea, 0);
 }
 
-static unsigned int snd_tea575x_read(struct snd_tea575x *tea)
+static u32 snd_tea575x_read(struct snd_tea575x *tea)
 {
         u16 l, rdata;
         u32 data = 0;
@@ -121,11 +120,13 @@ static unsigned int snd_tea575x_read(struct snd_tea575x *tea)
         return data;
 }
 
-static void snd_tea575x_get_freq(struct snd_tea575x *tea)
+static u32 snd_tea575x_get_freq(struct snd_tea575x *tea)
 {
-        unsigned long freq;
+        u32 freq = snd_tea575x_read(tea) & TEA575X_BIT_FREQ_MASK;
+
+        if (freq == 0)
+                return freq;
 
-        freq = snd_tea575x_read(tea) & TEA575X_BIT_FREQ_MASK;
         /* freq *= 12.5 */
         freq *= 125;
         freq /= 10;
@@ -135,14 +136,13 @@ static void snd_tea575x_get_freq(struct snd_tea575x *tea)
         else
                 freq -= TEA575X_FMIF;
 
-        tea->freq = freq * 16;          /* from kHz */
+        return clamp(freq * 16, FREQ_LO, FREQ_HI); /* from kHz */
 }
 
 static void snd_tea575x_set_freq(struct snd_tea575x *tea)
 {
-        unsigned long freq;
+        u32 freq = tea->freq;
 
-        freq = clamp(tea->freq, FREQ_LO, FREQ_HI);
         freq /= 16;             /* to kHz */
         /* crystal fixup */
         if (tea->tea5759)
@@ -167,12 +167,14 @@ static int vidioc_querycap(struct file *file, void  *priv,
 {
         struct snd_tea575x *tea = video_drvdata(file);
 
-        strlcpy(v->driver, "tea575x-tuner", sizeof(v->driver));
+        strlcpy(v->driver, tea->v4l2_dev->name, sizeof(v->driver));
         strlcpy(v->card, tea->card, sizeof(v->card));
         strlcat(v->card, tea->tea5759 ? " TEA5759" : " TEA5757", sizeof(v->card));
         strlcpy(v->bus_info, tea->bus_info, sizeof(v->bus_info));
-        v->version = RADIO_VERSION;
-        v->capabilities = V4L2_CAP_TUNER | V4L2_CAP_RADIO;
+        v->device_caps = V4L2_CAP_TUNER | V4L2_CAP_RADIO;
+        if (!tea->cannot_read_data)
+                v->device_caps |= V4L2_CAP_HW_FREQ_SEEK;
+        v->capabilities = v->device_caps | V4L2_CAP_DEVICE_CAPS;
         return 0;
 }
 
@@ -191,18 +193,24 @@ static int vidioc_g_tuner(struct file *file, void *priv,
         v->capability = V4L2_TUNER_CAP_LOW | V4L2_TUNER_CAP_STEREO;
         v->rangelow = FREQ_LO;
         v->rangehigh = FREQ_HI;
-        v->rxsubchans = V4L2_TUNER_SUB_MONO | V4L2_TUNER_SUB_STEREO;
-        v->audmode = tea->stereo ? V4L2_TUNER_MODE_STEREO : V4L2_TUNER_MODE_MONO;
+        v->rxsubchans = tea->stereo ? V4L2_TUNER_SUB_STEREO : V4L2_TUNER_SUB_MONO;
+        v->audmode = (tea->val & TEA575X_BIT_MONO) ?
+                V4L2_TUNER_MODE_MONO : V4L2_TUNER_MODE_STEREO;
         v->signal = tea->tuned ? 0xffff : 0;
-
         return 0;
 }
 
 static int vidioc_s_tuner(struct file *file, void *priv,
                                         struct v4l2_tuner *v)
 {
-        if (v->index > 0)
+        struct snd_tea575x *tea = video_drvdata(file);
+
+        if (v->index)
                 return -EINVAL;
+        tea->val &= ~TEA575X_BIT_MONO;
+        if (v->audmode == V4L2_TUNER_MODE_MONO)
+                tea->val |= TEA575X_BIT_MONO;
+        snd_tea575x_write(tea, tea->val);
         return 0;
 }
 
@@ -214,7 +222,6 @@ static int vidioc_g_frequency(struct file *file, void *priv,
         if (f->tuner != 0)
                 return -EINVAL;
         f->type = V4L2_TUNER_RADIO;
-        snd_tea575x_get_freq(tea);
         f->frequency = tea->freq;
         return 0;
 }
@@ -227,33 +234,72 @@ static int vidioc_s_frequency(struct file *file, void *priv,
         if (f->tuner != 0 || f->type != V4L2_TUNER_RADIO)
                 return -EINVAL;
 
-        if (f->frequency < FREQ_LO || f->frequency > FREQ_HI)
-                return -EINVAL;
-
-        tea->freq = f->frequency;
-
+        tea->val &= ~TEA575X_BIT_SEARCH;
+        tea->freq = clamp(f->frequency, FREQ_LO, FREQ_HI);
         snd_tea575x_set_freq(tea);
-
         return 0;
 }
 
-static int vidioc_g_audio(struct file *file, void *priv,
-                                        struct v4l2_audio *a)
+static int vidioc_s_hw_freq_seek(struct file *file, void *fh,
+                                        struct v4l2_hw_freq_seek *a)
 {
-        if (a->index > 1)
-                return -EINVAL;
-
-        strcpy(a->name, "Radio");
-        a->capability = V4L2_AUDCAP_STEREO;
-        return 0;
-}
+        struct snd_tea575x *tea = video_drvdata(file);
+        unsigned long timeout;
+        int i;
 
-static int vidioc_s_audio(struct file *file, void *priv,
-                                        struct v4l2_audio *a)
-{
-        if (a->index != 0)
+        if (tea->cannot_read_data)
+                return -ENOTTY;
+        if (a->tuner || a->wrap_around)
                 return -EINVAL;
-        return 0;
+
+        /* clear the frequency, HW will fill it in */
+        tea->val &= ~TEA575X_BIT_FREQ_MASK;
+        tea->val |= TEA575X_BIT_SEARCH;
+        if (a->seek_upward)
+                tea->val |= TEA575X_BIT_UPDOWN;
+        else
+                tea->val &= ~TEA575X_BIT_UPDOWN;
+        snd_tea575x_write(tea, tea->val);
+        timeout = jiffies + msecs_to_jiffies(10000);
+        for (;;) {
+                if (time_after(jiffies, timeout))
+                        break;
+                if (schedule_timeout_interruptible(msecs_to_jiffies(10))) {
+                        /* some signal arrived, stop search */
+                        tea->val &= ~TEA575X_BIT_SEARCH;
+                        snd_tea575x_set_freq(tea);
+                        return -ERESTARTSYS;
+                }
+                if (!(snd_tea575x_read(tea) & TEA575X_BIT_SEARCH)) {
+                        u32 freq;
+
+                        /* Found a frequency, wait until it can be read */
+                        for (i = 0; i < 100; i++) {
+                                msleep(10);
+                                freq = snd_tea575x_get_freq(tea);
+                                if (freq) /* available */
+                                        break;
+                        }
+                        if (freq == 0) /* shouldn't happen */
+                                break;
+                        /*
+                         * if we moved by less than 50 kHz, or in the wrong
+                         * direction, continue seeking
+                         */
+                        if (abs(tea->freq - freq) < 16 * 50 ||
+                                        (a->seek_upward && freq < tea->freq) ||
+                                        (!a->seek_upward && freq > tea->freq)) {
+                                snd_tea575x_write(tea, tea->val);
+                                continue;
+                        }
+                        tea->freq = freq;
+                        tea->val &= ~TEA575X_BIT_SEARCH;
+                        return 0;
+                }
+        }
+        tea->val &= ~TEA575X_BIT_SEARCH;
+        snd_tea575x_set_freq(tea);
+        return -EAGAIN;
 }
 
 static int tea575x_s_ctrl(struct v4l2_ctrl *ctrl)
@@ -273,23 +319,27 @@ static int tea575x_s_ctrl(struct v4l2_ctrl *ctrl)
 static const struct v4l2_file_operations tea575x_fops = {
         .owner          = THIS_MODULE,
         .unlocked_ioctl = video_ioctl2,
+        .open           = v4l2_fh_open,
+        .release        = v4l2_fh_release,
+        .poll           = v4l2_ctrl_poll,
 };
 
 static const struct v4l2_ioctl_ops tea575x_ioctl_ops = {
         .vidioc_querycap    = vidioc_querycap,
         .vidioc_g_tuner     = vidioc_g_tuner,
         .vidioc_s_tuner     = vidioc_s_tuner,
-        .vidioc_g_audio     = vidioc_g_audio,
-        .vidioc_s_audio     = vidioc_s_audio,
         .vidioc_g_frequency = vidioc_g_frequency,
         .vidioc_s_frequency = vidioc_s_frequency,
+        .vidioc_s_hw_freq_seek = vidioc_s_hw_freq_seek,
+        .vidioc_log_status  = v4l2_ctrl_log_status,
+        .vidioc_subscribe_event = v4l2_ctrl_subscribe_event,
+        .vidioc_unsubscribe_event = v4l2_event_unsubscribe,
 };
 
-static struct video_device tea575x_radio = {
-        .name           = "tea575x-tuner",
+static const struct video_device tea575x_radio = {
         .fops           = &tea575x_fops,
         .ioctl_ops      = &tea575x_ioctl_ops,
-        .release        = video_device_release_empty,
+        .release        = video_device_release_empty,
 };
 
 static const struct v4l2_ctrl_ops tea575x_ctrl_ops = {
@@ -303,27 +353,34 @@ int snd_tea575x_init(struct snd_tea575x *tea)
 {
         int retval;
 
-        tea->mute = 1;
+        tea->mute = true;
 
-        snd_tea575x_write(tea, 0x55AA);
-        if (snd_tea575x_read(tea) != 0x55AA)
-                return -ENODEV;
+        /* Not all devices can or know how to read the data back.
+           Such devices can set cannot_read_data to true. */
+        if (!tea->cannot_read_data) {
+                snd_tea575x_write(tea, 0x55AA);
+                if (snd_tea575x_read(tea) != 0x55AA)
+                        return -ENODEV;
+        }
 
-        tea->val = TEA575X_BIT_BAND_FM | TEA575X_BIT_SEARCH_10_40;
+        tea->val = TEA575X_BIT_BAND_FM | TEA575X_BIT_SEARCH_5_28;
         tea->freq = 90500 * 16;         /* 90.5Mhz default */
         snd_tea575x_set_freq(tea);
 
         tea->vd = tea575x_radio;
         video_set_drvdata(&tea->vd, tea);
         mutex_init(&tea->mutex);
+        strlcpy(tea->vd.name, tea->v4l2_dev->name, sizeof(tea->vd.name));
         tea->vd.lock = &tea->mutex;
+        tea->vd.v4l2_dev = tea->v4l2_dev;
+        tea->vd.ctrl_handler = &tea->ctrl_handler;
+        set_bit(V4L2_FL_USE_FH_PRIO, &tea->vd.flags);
 
         v4l2_ctrl_handler_init(&tea->ctrl_handler, 1);
-        tea->vd.ctrl_handler = &tea->ctrl_handler;
         v4l2_ctrl_new_std(&tea->ctrl_handler, &tea575x_ctrl_ops, V4L2_CID_AUDIO_MUTE, 0, 1, 1, 1);
         retval = tea->ctrl_handler.error;
         if (retval) {
-                printk(KERN_ERR "tea575x-tuner: can't initialize controls\n");
+                v4l2_err(tea->v4l2_dev, "can't initialize controls\n");
                 v4l2_ctrl_handler_free(&tea->ctrl_handler);
                 return retval;
         }
@@ -338,9 +395,9 @@ int snd_tea575x_init(struct snd_tea575x *tea)
 
         v4l2_ctrl_handler_setup(&tea->ctrl_handler);
 
-        retval = video_register_device(&tea->vd, VFL_TYPE_RADIO, radio_nr);
+        retval = video_register_device(&tea->vd, VFL_TYPE_RADIO, tea->radio_nr);
         if (retval) {
-                printk(KERN_ERR "tea575x-tuner: can't register video device!\n");
+                v4l2_err(tea->v4l2_dev, "can't register video device!\n");
                 v4l2_ctrl_handler_free(&tea->ctrl_handler);
                 return retval;
         }
diff --git a/sound/oss/os.h b/sound/oss/os.h
index a1a962d7f67d..75ad0cd0c0ab 100644
--- a/sound/oss/os.h
+++ b/sound/oss/os.h
@@ -16,7 +16,6 @@
 #include <linux/slab.h>
 #include <linux/ioport.h>
 #include <asm/page.h>
-#include <asm/system.h>
 #include <linux/vmalloc.h>
 #include <asm/uaccess.h>
 #include <linux/poll.h>
diff --git a/sound/oss/vidc.c b/sound/oss/vidc.c
index 12ba28e7b933..92ca5bee1860 100644
--- a/sound/oss/vidc.c
+++ b/sound/oss/vidc.c
@@ -28,7 +28,6 @@
 #include <asm/io.h>
 #include <asm/hardware/iomd.h>
 #include <asm/irq.h>
-#include <asm/system.h>
 
 #include "sound_config.h"
 #include "vidc.h"
diff --git a/sound/oss/waveartist.c b/sound/oss/waveartist.c
index 52468742d9f2..24c430f721d4 100644
--- a/sound/oss/waveartist.c
+++ b/sound/oss/waveartist.c
@@ -42,7 +42,6 @@
 #include <linux/spinlock.h>
 #include <linux/bitops.h>
 
-#include <asm/system.h>
 
 #include "sound_config.h"
 #include "waveartist.h"
diff --git a/sound/pci/asihpi/hpios.h b/sound/pci/asihpi/hpios.h
index c5cef113c209..d3fbd0d76c37 100644
--- a/sound/pci/asihpi/hpios.h
+++ b/sound/pci/asihpi/hpios.h
@@ -30,7 +30,6 @@ HPI Operating System Specific macros for Linux Kernel driver
 #define HPI_BUILD_KERNEL_MODE
 
 #include <linux/io.h>
-#include <asm/system.h>
 #include <linux/ioctl.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
diff --git a/sound/pci/aw2/aw2-saa7146.c b/sound/pci/aw2/aw2-saa7146.c
index 8afd8b5d1ac7..4439636971eb 100644
--- a/sound/pci/aw2/aw2-saa7146.c
+++ b/sound/pci/aw2/aw2-saa7146.c
@@ -27,7 +27,6 @@
 #include <linux/pci.h>
 #include <linux/interrupt.h>
 #include <linux/delay.h>
-#include <asm/system.h>
 #include <asm/io.h>
 #include <sound/core.h>
 #include <sound/initval.h>
diff --git a/sound/pci/es1968.c b/sound/pci/es1968.c
index cb557c603a80..a8faae1c85e4 100644
--- a/sound/pci/es1968.c
+++ b/sound/pci/es1968.c
@@ -142,6 +142,7 @@ static int enable_mpu[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 2};
 #ifdef SUPPORT_JOYSTICK
 static bool joystick[SNDRV_CARDS];
 #endif
+static int radio_nr[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = -1};
 
 module_param_array(index, int, NULL, 0444);
 MODULE_PARM_DESC(index, "Index value for " CARD_NAME " soundcard.");
@@ -165,6 +166,9 @@ MODULE_PARM_DESC(enable_mpu, "Enable MPU401.  (0 = off, 1 = on, 2 = auto)");
 module_param_array(joystick, bool, NULL, 0444);
 MODULE_PARM_DESC(joystick, "Enable joystick.");
 #endif
+module_param_array(radio_nr, int, NULL, 0444);
+MODULE_PARM_DESC(radio_nr, "Radio device numbers");
+
 
 
 #define NR_APUS                 64
@@ -558,6 +562,7 @@ struct es1968 {
         struct work_struct hwvol_work;
 
 #ifdef CONFIG_SND_ES1968_RADIO
+        struct v4l2_device v4l2_dev;
         struct snd_tea575x tea;
 #endif
 };
@@ -2613,6 +2618,7 @@ static int snd_es1968_free(struct es1968 *chip)
 
 #ifdef CONFIG_SND_ES1968_RADIO
         snd_tea575x_exit(&chip->tea);
+        v4l2_device_unregister(&chip->v4l2_dev);
 #endif
 
         if (chip->irq >= 0)
@@ -2655,6 +2661,7 @@ static int __devinit snd_es1968_create(struct snd_card *card,
                                        int capt_streams,
                                        int chip_type,
                                        int do_pm,
+                                       int radio_nr,
                                        struct es1968 **chip_ret)
 {
         static struct snd_device_ops ops = {
@@ -2751,7 +2758,14 @@ static int __devinit snd_es1968_create(struct snd_card *card,
         snd_card_set_dev(card, &pci->dev);
 
 #ifdef CONFIG_SND_ES1968_RADIO
+        err = v4l2_device_register(&pci->dev, &chip->v4l2_dev);
+        if (err < 0) {
+                snd_es1968_free(chip);
+                return err;
+        }
+        chip->tea.v4l2_dev = &chip->v4l2_dev;
         chip->tea.private_data = chip;
+        chip->tea.radio_nr = radio_nr;
         chip->tea.ops = &snd_es1968_tea_ops;
         strlcpy(chip->tea.card, "SF64-PCE2", sizeof(chip->tea.card));
         sprintf(chip->tea.bus_info, "PCI:%s", pci_name(pci));
@@ -2797,6 +2811,7 @@ static int __devinit snd_es1968_probe(struct pci_dev *pci,
                                      pcm_substreams_c[dev],
                                      pci_id->driver_data,
                                      use_pm[dev],
+                                     radio_nr[dev],
                                      &chip)) < 0) {
                 snd_card_free(card);
                 return err;
diff --git a/sound/pci/fm801.c b/sound/pci/fm801.c
index 9597ef1eccca..a416ea8af3e9 100644
--- a/sound/pci/fm801.c
+++ b/sound/pci/fm801.c
@@ -58,6 +58,7 @@ static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;	/* Enable this card
  *  High 16-bits are video (radio) device number + 1
  */
 static int tea575x_tuner[SNDRV_CARDS];
+static int radio_nr[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = -1};
 
 module_param_array(index, int, NULL, 0444);
 MODULE_PARM_DESC(index, "Index value for the FM801 soundcard.");
@@ -67,6 +68,9 @@ module_param_array(enable, bool, NULL, 0444);
 MODULE_PARM_DESC(enable, "Enable FM801 soundcard.");
 module_param_array(tea575x_tuner, int, NULL, 0444);
 MODULE_PARM_DESC(tea575x_tuner, "TEA575x tuner access method (0 = auto, 1 = SF256-PCS, 2=SF256-PCP, 3=SF64-PCR, 8=disable, +16=tuner-only).");
+module_param_array(radio_nr, int, NULL, 0444);
+MODULE_PARM_DESC(radio_nr, "Radio device numbers");
+
 
 #define TUNER_DISABLED          (1<<3)
 #define TUNER_ONLY              (1<<4)
@@ -197,6 +201,7 @@ struct fm801 {
         struct snd_info_entry *proc_entry;
 
 #ifdef CONFIG_SND_FM801_TEA575X_BOOL
+        struct v4l2_device v4l2_dev;
         struct snd_tea575x tea;
 #endif
 
@@ -1154,8 +1159,10 @@ static int snd_fm801_free(struct fm801 *chip)
 
       __end_hw:
 #ifdef CONFIG_SND_FM801_TEA575X_BOOL
-        if (!(chip->tea575x_tuner & TUNER_DISABLED))
+        if (!(chip->tea575x_tuner & TUNER_DISABLED)) {
                 snd_tea575x_exit(&chip->tea);
+                v4l2_device_unregister(&chip->v4l2_dev);
+        }
 #endif
         if (chip->irq >= 0)
                 free_irq(chip->irq, chip);
@@ -1175,6 +1182,7 @@ static int snd_fm801_dev_free(struct snd_device *device)
 static int __devinit snd_fm801_create(struct snd_card *card,
                                       struct pci_dev * pci,
                                       int tea575x_tuner,
+                                      int radio_nr,
                                       struct fm801 ** rchip)
 {
         struct fm801 *chip;
@@ -1234,6 +1242,13 @@ static int __devinit snd_fm801_create(struct snd_card *card,
         snd_card_set_dev(card, &pci->dev);
 
 #ifdef CONFIG_SND_FM801_TEA575X_BOOL
+        err = v4l2_device_register(&pci->dev, &chip->v4l2_dev);
+        if (err < 0) {
+                snd_fm801_free(chip);
+                return err;
+        }
+        chip->tea.v4l2_dev = &chip->v4l2_dev;
+        chip->tea.radio_nr = radio_nr;
         chip->tea.private_data = chip;
         chip->tea.ops = &snd_fm801_tea_ops;
         sprintf(chip->tea.bus_info, "PCI:%s", pci_name(pci));
@@ -1241,6 +1256,7 @@ static int __devinit snd_fm801_create(struct snd_card *card,
             (tea575x_tuner & TUNER_TYPE_MASK) < 4) {
                 if (snd_tea575x_init(&chip->tea)) {
                         snd_printk(KERN_ERR "TEA575x radio not found\n");
+                        snd_fm801_free(chip);
                         return -ENODEV;
                 }
         } else if ((tea575x_tuner & TUNER_TYPE_MASK) == 0) {
@@ -1287,7 +1303,7 @@ static int __devinit snd_card_fm801_probe(struct pci_dev *pci,
         err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
         if (err < 0)
                 return err;
-        if ((err = snd_fm801_create(card, pci, tea575x_tuner[dev], &chip)) < 0) {
+        if ((err = snd_fm801_create(card, pci, tea575x_tuner[dev], radio_nr[dev], &chip)) < 0) {
                 snd_card_free(card);
                 return err;
         }
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
index 3848711d89f7..a36488d94aaa 100644
--- a/sound/pci/hda/patch_conexant.c
+++ b/sound/pci/hda/patch_conexant.c
@@ -1607,7 +1607,7 @@ static void cxt5051_update_speaker(struct hda_codec *codec)
         pinctl = (!spec->hp_present && spec->cur_eapd) ? PIN_OUT : 0;
         snd_hda_codec_write(codec, 0x1a, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,
                             pinctl);
-        /* on ideapad there is an aditional speaker (subwoofer) to mute */
+        /* on ideapad there is an additional speaker (subwoofer) to mute */
         if (spec->ideapad)
                 snd_hda_codec_write(codec, 0x1b, 0,
                                     AC_VERB_SET_PIN_WIDGET_CONTROL,
diff --git a/sound/soc/codecs/ak4642.c b/sound/soc/codecs/ak4642.c
index f8e10ced244a..b3e24f289421 100644
--- a/sound/soc/codecs/ak4642.c
+++ b/sound/soc/codecs/ak4642.c
@@ -140,7 +140,7 @@
  * min : 0xFE : -115.0 dB
  * mute: 0xFF
  */
-static const DECLARE_TLV_DB_SCALE(out_tlv, -11500, 50, 1);
+static const DECLARE_TLV_DB_SCALE(out_tlv, -11550, 50, 1);
 
 static const struct snd_kcontrol_new ak4642_snd_controls[] = {
 
diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c
index d1926266fe00..8e92fb88ed09 100644
--- a/sound/soc/codecs/sgtl5000.c
+++ b/sound/soc/codecs/sgtl5000.c
@@ -143,11 +143,11 @@ static int mic_bias_event(struct snd_soc_dapm_widget *w,
 }
 
 /*
- * using codec assist to small pop, hp_powerup or lineout_powerup
- * should stay setting until vag_powerup is fully ramped down,
- * vag fully ramped down require 400ms.
+ * As manual described, ADC/DAC only works when VAG powerup,
+ * So enabled VAG before ADC/DAC up.
+ * In power down case, we need wait 400ms when vag fully ramped down.
  */
-static int small_pop_event(struct snd_soc_dapm_widget *w,
+static int power_vag_event(struct snd_soc_dapm_widget *w,
         struct snd_kcontrol *kcontrol, int event)
 {
         switch (event) {
@@ -156,7 +156,7 @@ static int small_pop_event(struct snd_soc_dapm_widget *w,
                         SGTL5000_VAG_POWERUP, SGTL5000_VAG_POWERUP);
                 break;
 
-        case SND_SOC_DAPM_PRE_PMD:
+        case SND_SOC_DAPM_POST_PMD:
                 snd_soc_update_bits(w->codec, SGTL5000_CHIP_ANA_POWER,
                         SGTL5000_VAG_POWERUP, 0);
                 msleep(400);
@@ -201,12 +201,8 @@ static const struct snd_soc_dapm_widget sgtl5000_dapm_widgets[] = {
                                 mic_bias_event,
                                 SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD),
 
-        SND_SOC_DAPM_PGA_E("HP", SGTL5000_CHIP_ANA_POWER, 4, 0, NULL, 0,
-                        small_pop_event,
-                        SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_PRE_PMD),
-        SND_SOC_DAPM_PGA_E("LO", SGTL5000_CHIP_ANA_POWER, 0, 0, NULL, 0,
-                        small_pop_event,
-                        SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_PRE_PMD),
+        SND_SOC_DAPM_PGA("HP", SGTL5000_CHIP_ANA_POWER, 4, 0, NULL, 0),
+        SND_SOC_DAPM_PGA("LO", SGTL5000_CHIP_ANA_POWER, 0, 0, NULL, 0),
 
         SND_SOC_DAPM_MUX("Capture Mux", SND_SOC_NOPM, 0, 0, &adc_mux),
         SND_SOC_DAPM_MUX("Headphone Mux", SND_SOC_NOPM, 0, 0, &dac_mux),
@@ -221,8 +217,11 @@ static const struct snd_soc_dapm_widget sgtl5000_dapm_widgets[] = {
                                 0, SGTL5000_CHIP_DIG_POWER,
                                 1, 0),
 
-        SND_SOC_DAPM_ADC("ADC", "Capture", SGTL5000_CHIP_ANA_POWER, 1, 0),
+        SND_SOC_DAPM_SUPPLY("VAG_POWER", SGTL5000_CHIP_ANA_POWER, 7, 0,
+                            power_vag_event,
+                            SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
 
+        SND_SOC_DAPM_ADC("ADC", "Capture", SGTL5000_CHIP_ANA_POWER, 1, 0),
         SND_SOC_DAPM_DAC("DAC", "Playback", SGTL5000_CHIP_ANA_POWER, 3, 0),
 };
 
@@ -231,9 +230,11 @@ static const struct snd_soc_dapm_route sgtl5000_dapm_routes[] = {
         {"Capture Mux", "LINE_IN", "LINE_IN"},  /* line_in --> adc_mux */
         {"Capture Mux", "MIC_IN", "MIC_IN"},    /* mic_in --> adc_mux */
 
+        {"ADC", NULL, "VAG_POWER"},
         {"ADC", NULL, "Capture Mux"},           /* adc_mux --> adc */
         {"AIFOUT", NULL, "ADC"},                /* adc --> i2s_out */
 
+        {"DAC", NULL, "VAG_POWER"},
         {"DAC", NULL, "AIFIN"},                 /* i2s-->dac,skip audio mux */
         {"Headphone Mux", "DAC", "DAC"},        /* dac --> hp_mux */
         {"LO", NULL, "DAC"},                    /* dac --> line_out */
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index 10d27890eed5..7c49642af052 100644
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -2181,26 +2181,9 @@ static int wm8994_set_bias_level(struct snd_soc_codec *codec,
         case SND_SOC_BIAS_STANDBY:
                 if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) {
                         switch (control->type) {
-                        case WM8994:
-                                if (wm8994->revision < 4) {
-                                        /* Tweak DC servo and DSP
-                                         * configuration for improved
-                                         * performance. */
-                                        snd_soc_write(codec, 0x102, 0x3);
-                                        snd_soc_write(codec, 0x56, 0x3);
-                                        snd_soc_write(codec, 0x817, 0);
-                                        snd_soc_write(codec, 0x102, 0);
-                                }
-                                break;
-
                         case WM8958:
                                 if (wm8994->revision == 0) {
                                         /* Optimise performance for rev A */
-                                        snd_soc_write(codec, 0x102, 0x3);
-                                        snd_soc_write(codec, 0xcb, 0x81);
-                                        snd_soc_write(codec, 0x817, 0);
-                                        snd_soc_write(codec, 0x102, 0);
-
                                         snd_soc_update_bits(codec,
                                                             WM8958_CHARGE_PUMP_2,
                                                             WM8958_CP_DISCH,
@@ -2208,13 +2191,7 @@ static int wm8994_set_bias_level(struct snd_soc_codec *codec,
                                 }
                                 break;
 
-                        case WM1811:
-                                if (wm8994->revision < 2) {
-                                        snd_soc_write(codec, 0x102, 0x3);
-                                        snd_soc_write(codec, 0x5d, 0x7e);
-                                        snd_soc_write(codec, 0x5e, 0x0);
-                                        snd_soc_write(codec, 0x102, 0x0);
-                                }
+                        default:
                                 break;
                         }
 
diff --git a/sound/soc/imx/imx-audmux.c b/sound/soc/imx/imx-audmux.c
index a839494c5ea8..0fe66c3dde12 100644
--- a/sound/soc/imx/imx-audmux.c
+++ b/sound/soc/imx/imx-audmux.c
@@ -79,14 +79,17 @@ static ssize_t audmux_read_file(struct file *file, char __user *user_buf,
         if (!buf)
                 return -ENOMEM;
 
+        if (!audmux_base)
+                return -ENOSYS;
+
         if (audmux_clk)
-                clk_enable(audmux_clk);
+                clk_prepare_enable(audmux_clk);
 
         ptcr = readl(audmux_base + IMX_AUDMUX_V2_PTCR(port));
         pdcr = readl(audmux_base + IMX_AUDMUX_V2_PDCR(port));
 
         if (audmux_clk)
-                clk_disable(audmux_clk);
+                clk_disable_unprepare(audmux_clk);
 
         ret = snprintf(buf, PAGE_SIZE, "PDCR: %08x\nPTCR: %08x\n",
                        pdcr, ptcr);
@@ -158,7 +161,7 @@ static void __init audmux_debugfs_init(void)
                 return;
         }
 
-        for (i = 1; i < 8; i++) {
+        for (i = 0; i < MX31_AUDMUX_PORT6_SSI_PINS_6 + 1; i++) {
                 snprintf(buf, sizeof(buf), "ssi%d", i);
                 if (!debugfs_create_file(buf, 0444, audmux_debugfs_root,
                                          (void *)i, &audmux_debugfs_fops))
@@ -237,13 +240,13 @@ int imx_audmux_v2_configure_port(unsigned int port, unsigned int ptcr,
                 return -ENOSYS;
 
         if (audmux_clk)
-                clk_enable(audmux_clk);
+                clk_prepare_enable(audmux_clk);
 
         writel(ptcr, audmux_base + IMX_AUDMUX_V2_PTCR(port));
         writel(pdcr, audmux_base + IMX_AUDMUX_V2_PDCR(port));
 
         if (audmux_clk)
-                clk_disable(audmux_clk);
+                clk_disable_unprepare(audmux_clk);
 
         return 0;
 }
diff --git a/sound/soc/imx/imx-pcm-dma-mx2.c b/sound/soc/imx/imx-pcm-dma-mx2.c
index e43c8fa2788b..6b818de2fc03 100644
--- a/sound/soc/imx/imx-pcm-dma-mx2.c
+++ b/sound/soc/imx/imx-pcm-dma-mx2.c
@@ -21,6 +21,7 @@
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <linux/dmaengine.h>
+#include <linux/types.h>
 
 #include <sound/core.h>
 #include <sound/initval.h>
@@ -58,6 +59,8 @@ static int snd_imx_pcm_hw_params(struct snd_pcm_substream *substream,
         if (ret)
                 return ret;
 
+        slave_config.device_fc = false;
+
         if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
                 slave_config.dst_addr = dma_params->dma_addr;
                 slave_config.dst_maxburst = dma_params->burstsize;
diff --git a/sound/soc/mxs/mxs-pcm.c b/sound/soc/mxs/mxs-pcm.c
index 6ca1f46d84a4..e373fbbc97a0 100644
--- a/sound/soc/mxs/mxs-pcm.c
+++ b/sound/soc/mxs/mxs-pcm.c
@@ -28,6 +28,7 @@
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <linux/dmaengine.h>
+#include <linux/fsl/mxs-dma.h>
 
 #include <sound/core.h>
 #include <sound/initval.h>
@@ -36,7 +37,6 @@
 #include <sound/soc.h>
 #include <sound/dmaengine_pcm.h>
 
-#include <mach/dma.h>
 #include "mxs-pcm.h"
 
 struct mxs_pcm_dma_data {
diff --git a/sound/soc/mxs/mxs-saif.c b/sound/soc/mxs/mxs-saif.c
index 12be05b16880..53f4fd8feced 100644
--- a/sound/soc/mxs/mxs-saif.c
+++ b/sound/soc/mxs/mxs-saif.c
@@ -24,12 +24,12 @@
 #include <linux/clk.h>
 #include <linux/delay.h>
 #include <linux/time.h>
+#include <linux/fsl/mxs-dma.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
 #include <sound/saif.h>
-#include <mach/dma.h>
 #include <asm/mach-types.h>
 #include <mach/hardware.h>
 #include <mach/mxs.h>
diff --git a/sound/soc/omap/ams-delta.c b/sound/soc/omap/ams-delta.c
index 49fe63ce51f7..7d4fa8ed6699 100644
--- a/sound/soc/omap/ams-delta.c
+++ b/sound/soc/omap/ams-delta.c
@@ -426,29 +426,6 @@ static struct snd_soc_ops ams_delta_ops = {
 };
 
 
-/* Board specific codec bias level control */
-static int ams_delta_set_bias_level(struct snd_soc_card *card,
-                                    struct snd_soc_dapm_context *dapm,
-                                    enum snd_soc_bias_level level)
-{
-        switch (level) {
-        case SND_SOC_BIAS_ON:
-        case SND_SOC_BIAS_PREPARE:
-        case SND_SOC_BIAS_STANDBY:
-                if (card->dapm.bias_level == SND_SOC_BIAS_OFF)
-                        ams_delta_latch2_write(AMS_DELTA_LATCH2_MODEM_NRESET,
-                                                AMS_DELTA_LATCH2_MODEM_NRESET);
-                break;
-        case SND_SOC_BIAS_OFF:
-                if (card->dapm.bias_level != SND_SOC_BIAS_OFF)
-                        ams_delta_latch2_write(AMS_DELTA_LATCH2_MODEM_NRESET,
-                                                0);
-        }
-        card->dapm.bias_level = level;
-
-        return 0;
-}
-
 /* Digital mute implemented using modem/CPU multiplexer.
  * Shares hardware with codec config pulse generation */
 static bool ams_delta_muted = 1;
@@ -512,9 +489,6 @@ static int ams_delta_cx20442_init(struct snd_soc_pcm_runtime *rtd)
                 ams_delta_ops.shutdown = ams_delta_shutdown;
         }
 
-        /* Set codec bias level */
-        ams_delta_set_bias_level(card, dapm, SND_SOC_BIAS_STANDBY);
-
         /* Add hook switch - can be used to control the codec from userspace
          * even if line discipline fails */
         ret = snd_soc_jack_new(rtd->codec, "hook_switch",
@@ -598,7 +572,6 @@ static struct snd_soc_card ams_delta_audio_card = {
         .owner = THIS_MODULE,
         .dai_link = &ams_delta_dai_link,
         .num_links = 1,
-        .set_bias_level = ams_delta_set_bias_level,
 };
 
 /* Module init/exit */
@@ -635,7 +608,7 @@ err:
         platform_device_put(ams_delta_audio_platform_device);
         return ret;
 }
-module_init(ams_delta_module_init);
+late_initcall(ams_delta_module_init);
 
 static void __exit ams_delta_module_exit(void)
 {
@@ -647,11 +620,6 @@ static void __exit ams_delta_module_exit(void)
                         ARRAY_SIZE(ams_delta_hook_switch_gpios),
                         ams_delta_hook_switch_gpios);
 
-        /* Keep modem power on */
-        ams_delta_set_bias_level(&ams_delta_audio_card,
-                                 &ams_delta_audio_card.rtd[0].codec->dapm,
-                                 SND_SOC_BIAS_STANDBY);
-
         platform_device_unregister(cx20442_platform_device);
         platform_device_unregister(ams_delta_audio_platform_device);
 }
diff --git a/sound/soc/pxa/pxa2xx-ac97.c b/sound/soc/pxa/pxa2xx-ac97.c
index 4800d5fe568d..06ea2744cc88 100644
--- a/sound/soc/pxa/pxa2xx-ac97.c
+++ b/sound/soc/pxa/pxa2xx-ac97.c
@@ -11,6 +11,7 @@
  */
 
 #include <linux/init.h>
+#include <linux/io.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 
diff --git a/sound/soc/pxa/pxa2xx-i2s.c b/sound/soc/pxa/pxa2xx-i2s.c
index 609abd51e55f..d08583790d23 100644
--- a/sound/soc/pxa/pxa2xx-i2s.c
+++ b/sound/soc/pxa/pxa2xx-i2s.c
@@ -17,6 +17,7 @@
 #include <linux/delay.h>
 #include <linux/clk.h>
 #include <linux/platform_device.h>
+#include <linux/io.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/initval.h>
diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig
index f3417f2311b8..fe3995ce9b38 100644
--- a/sound/soc/samsung/Kconfig
+++ b/sound/soc/samsung/Kconfig
@@ -1,8 +1,8 @@
 config SND_SOC_SAMSUNG
         tristate "ASoC support for Samsung"
-        depends on ARCH_S3C2410 || ARCH_S3C64XX || ARCH_S5PC100 || ARCH_S5PV210 || ARCH_S5P64X0 || ARCH_EXYNOS4
+        depends on ARCH_S3C24XX || ARCH_S3C64XX || ARCH_S5PC100 || ARCH_S5PV210 || ARCH_S5P64X0 || ARCH_EXYNOS4
         select S3C64XX_DMA if ARCH_S3C64XX
-        select S3C2410_DMA if ARCH_S3C2410
+        select S3C2410_DMA if ARCH_S3C24XX
         help
           Say Y or M if you want to add support for codecs attached to
           the Samsung SoCs' Audio interfaces. You will also need to
@@ -84,7 +84,7 @@ config SND_SOC_SAMSUNG_SMDK2443_WM9710
 
 config SND_SOC_SAMSUNG_LN2440SBC_ALC650
         tristate "SoC AC97 Audio support for LN2440SBC - ALC650"
-        depends on SND_SOC_SAMSUNG && ARCH_S3C2410
+        depends on SND_SOC_SAMSUNG && ARCH_S3C24XX
         select S3C2410_DMA
         select AC97_BUS
         select SND_SOC_AC97_CODEC
@@ -95,7 +95,7 @@ config SND_SOC_SAMSUNG_LN2440SBC_ALC650
 
 config SND_SOC_SAMSUNG_S3C24XX_UDA134X
         tristate "SoC I2S Audio support UDA134X wired to a S3C24XX"
-        depends on SND_SOC_SAMSUNG && ARCH_S3C2410
+        depends on SND_SOC_SAMSUNG && ARCH_S3C24XX
         select SND_S3C24XX_I2S
         select SND_SOC_L3
         select SND_SOC_UDA134X
@@ -107,14 +107,14 @@ config SND_SOC_SAMSUNG_SIMTEC
 
 config SND_SOC_SAMSUNG_SIMTEC_TLV320AIC23
         tristate "SoC I2S Audio support for TLV320AIC23 on Simtec boards"
-        depends on SND_SOC_SAMSUNG && ARCH_S3C2410
+        depends on SND_SOC_SAMSUNG && ARCH_S3C24XX
         select SND_S3C24XX_I2S
         select SND_SOC_TLV320AIC23
         select SND_SOC_SAMSUNG_SIMTEC
 
 config SND_SOC_SAMSUNG_SIMTEC_HERMES
         tristate "SoC I2S Audio support for Simtec Hermes board"
-        depends on SND_SOC_SAMSUNG && ARCH_S3C2410
+        depends on SND_SOC_SAMSUNG && ARCH_S3C24XX
         select SND_S3C24XX_I2S
         select SND_SOC_TLV320AIC3X
         select SND_SOC_SAMSUNG_SIMTEC
diff --git a/sound/soc/sh/siu_pcm.c b/sound/soc/sh/siu_pcm.c
index 0193e595d415..5cfcc655e95f 100644
--- a/sound/soc/sh/siu_pcm.c
+++ b/sound/soc/sh/siu_pcm.c
@@ -130,7 +130,7 @@ static int siu_pcm_wr_set(struct siu_port *port_info,
         sg_dma_len(&sg) = size;
         sg_dma_address(&sg) = buff;
 
-        desc = siu_stream->chan->device->device_prep_slave_sg(siu_stream->chan,
+        desc = dmaengine_prep_slave_sg(siu_stream->chan,
                 &sg, 1, DMA_MEM_TO_DEV, DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
         if (!desc) {
                 dev_err(dev, "Failed to allocate a dma descriptor\n");
@@ -180,7 +180,7 @@ static int siu_pcm_rd_set(struct siu_port *port_info,
         sg_dma_len(&sg) = size;
         sg_dma_address(&sg) = buff;
 
-        desc = siu_stream->chan->device->device_prep_slave_sg(siu_stream->chan,
+        desc = dmaengine_prep_slave_sg(siu_stream->chan,
                 &sg, 1, DMA_DEV_TO_MEM, DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
         if (!desc) {
                 dev_err(dev, "Failed to allocate dma descriptor\n");
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index a4deebc0801a..8d2ebf502df4 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1087,6 +1087,8 @@ static int soc_probe_platform(struct snd_soc_card *card,
                 snd_soc_dapm_new_controls(&platform->dapm,
                         driver->dapm_widgets, driver->num_dapm_widgets);
 
+        platform->dapm.idle_bias_off = 1;
+
         if (driver->probe) {
                 ret = driver->probe(platform);
                 if (ret < 0) {
diff --git a/sound/soc/tegra/tegra_i2s.c b/sound/soc/tegra/tegra_i2s.c
index 33509de52540..e53349912b2e 100644
--- a/sound/soc/tegra/tegra_i2s.c
+++ b/sound/soc/tegra/tegra_i2s.c
@@ -79,11 +79,15 @@ static int tegra_i2s_show(struct seq_file *s, void *unused)
         struct tegra_i2s *i2s = s->private;
         int i;
 
+        clk_enable(i2s->clk_i2s);
+
         for (i = 0; i < ARRAY_SIZE(regs); i++) {
                 u32 val = tegra_i2s_read(i2s, regs[i].offset);
                 seq_printf(s, "%s = %08x\n", regs[i].name, val);
         }
 
+        clk_disable(i2s->clk_i2s);
+
         return 0;
 }
 
@@ -112,7 +116,7 @@ static void tegra_i2s_debug_remove(struct tegra_i2s *i2s)
                 debugfs_remove(i2s->debug);
 }
 #else
-static inline void tegra_i2s_debug_add(struct tegra_i2s *i2s, int id)
+static inline void tegra_i2s_debug_add(struct tegra_i2s *i2s)
 {
 }
 
diff --git a/sound/soc/tegra/tegra_spdif.c b/sound/soc/tegra/tegra_spdif.c
index 475428cf270e..9ff2c601445f 100644
--- a/sound/soc/tegra/tegra_spdif.c
+++ b/sound/soc/tegra/tegra_spdif.c
@@ -79,11 +79,15 @@ static int tegra_spdif_show(struct seq_file *s, void *unused)
         struct tegra_spdif *spdif = s->private;
         int i;
 
+        clk_enable(spdif->clk_spdif_out);
+
         for (i = 0; i < ARRAY_SIZE(regs); i++) {
                 u32 val = tegra_spdif_read(spdif, regs[i].offset);
                 seq_printf(s, "%s = %08x\n", regs[i].name, val);
         }
 
+        clk_disable(spdif->clk_spdif_out);
+
         return 0;
 }
 
diff --git a/sound/soc/txx9/txx9aclc.c b/sound/soc/txx9/txx9aclc.c
index 21554611557c..b609d2c64c55 100644
--- a/sound/soc/txx9/txx9aclc.c
+++ b/sound/soc/txx9/txx9aclc.c
@@ -132,7 +132,7 @@ txx9aclc_dma_submit(struct txx9aclc_dmadata *dmadata, dma_addr_t buf_dma_addr)
         sg_set_page(&sg, pfn_to_page(PFN_DOWN(buf_dma_addr)),
                     dmadata->frag_bytes, buf_dma_addr & (PAGE_SIZE - 1));
         sg_dma_address(&sg) = buf_dma_addr;
-        desc = chan->device->device_prep_slave_sg(chan, &sg, 1,
+        desc = dmaengine_prep_slave_sg(chan, &sg, 1,
                 dmadata->substream->stream == SNDRV_PCM_STREAM_PLAYBACK ?
                 DMA_MEM_TO_DEV : DMA_DEV_TO_MEM,
                 DMA_PREP_INTERRUPT | DMA_CTRL_ACK);