Merge branch 'fix/kconfig' into for-linus

40 files changed, 514 insertions, 805 deletions

diff --git a/sound/aoa/soundbus/i2sbus/core.c b/sound/aoa/soundbus/i2sbus/core.c
index 3ff8cc5f487a..010658335881 100644
--- a/sound/aoa/soundbus/i2sbus/core.c
+++ b/sound/aoa/soundbus/i2sbus/core.c
@@ -262,8 +262,7 @@ static int i2sbus_add_dev(struct macio_dev *macio,
                  */
                 dev->allocated_resource[i] =
                         request_mem_region(dev->resources[i].start,
-                                           dev->resources[i].end -
-                                           dev->resources[i].start + 1,
+                                           resource_size(&dev->resources[i]),
                                            dev->rnames[i]);
                 if (!dev->allocated_resource[i]) {
                         printk(KERN_ERR "i2sbus: failed to claim resource %d!\n", i);
@@ -272,19 +271,19 @@ static int i2sbus_add_dev(struct macio_dev *macio,
         }
 
         r = &dev->resources[aoa_resource_i2smmio];
-        rlen = r->end - r->start + 1;
+        rlen = resource_size(r);
         if (rlen < sizeof(struct i2s_interface_regs))
                 goto err;
         dev->intfregs = ioremap(r->start, rlen);
 
         r = &dev->resources[aoa_resource_txdbdma];
-        rlen = r->end - r->start + 1;
+        rlen = resource_size(r);
         if (rlen < sizeof(struct dbdma_regs))
                 goto err;
         dev->out.dbdma = ioremap(r->start, rlen);
 
         r = &dev->resources[aoa_resource_rxdbdma];
-        rlen = r->end - r->start + 1;
+        rlen = resource_size(r);
         if (rlen < sizeof(struct dbdma_regs))
                 goto err;
         dev->in.dbdma = ioremap(r->start, rlen);
diff --git a/sound/atmel/abdac.c b/sound/atmel/abdac.c
index bfee60c4d4c0..6fd9391b3a6c 100644
--- a/sound/atmel/abdac.c
+++ b/sound/atmel/abdac.c
@@ -448,7 +448,7 @@ static int __devinit atmel_abdac_probe(struct platform_device *pdev)
                 goto out_free_card;
         }
 
-        dac->regs = ioremap(regs->start, regs->end - regs->start + 1);
+        dac->regs = ioremap(regs->start, resource_size(regs));
         if (!dac->regs) {
                 dev_dbg(&pdev->dev, "could not remap register memory\n");
                 goto out_free_card;
diff --git a/sound/atmel/ac97c.c b/sound/atmel/ac97c.c
index ac35222ad0dd..6e5addeb236b 100644
--- a/sound/atmel/ac97c.c
+++ b/sound/atmel/ac97c.c
@@ -971,7 +971,7 @@ static int __devinit atmel_ac97c_probe(struct platform_device *pdev)
         chip->card = card;
         chip->pclk = pclk;
         chip->pdev = pdev;
-        chip->regs = ioremap(regs->start, regs->end - regs->start + 1);
+        chip->regs = ioremap(regs->start, resource_size(regs));
 
         if (!chip->regs) {
                 dev_dbg(&pdev->dev, "could not remap register memory\n");
diff --git a/sound/core/info.c b/sound/core/info.c
index 7077f601da5a..601f0ebb677b 100644
--- a/sound/core/info.c
+++ b/sound/core/info.c
@@ -531,7 +531,7 @@ int __init snd_info_init(void)
 {
         struct proc_dir_entry *p;
 
-        p = create_proc_entry("asound", S_IFDIR | S_IRUGO | S_IXUGO, NULL);
+        p = proc_mkdir("asound", NULL);
         if (p == NULL)
                 return -ENOMEM;
         snd_proc_root = p;
diff --git a/sound/drivers/pcsp/pcsp.h b/sound/drivers/pcsp/pcsp.h
index 4ff6c8cc5077..fc7a2dc410a1 100644
--- a/sound/drivers/pcsp/pcsp.h
+++ b/sound/drivers/pcsp/pcsp.h
@@ -10,14 +10,8 @@
 #define __PCSP_H__
 
 #include <linux/hrtimer.h>
+#include <linux/i8253.h>
 #include <linux/timex.h>
-#if defined(CONFIG_MIPS) || defined(CONFIG_X86)
-/* Use the global PIT lock ! */
-#include <asm/i8253.h>
-#else
-#include <asm/8253pit.h>
-static DEFINE_RAW_SPINLOCK(i8253_lock);
-#endif
 
 #define PCSP_SOUND_VERSION 0x400        /* read 4.00 */
 #define PCSP_DEBUG 0
diff --git a/sound/i2c/other/tea575x-tuner.c b/sound/i2c/other/tea575x-tuner.c
index 4831800239d3..484a35b3715f 100644
--- a/sound/i2c/other/tea575x-tuner.c
+++ b/sound/i2c/other/tea575x-tuner.c
@@ -22,11 +22,11 @@
 
 #include <asm/io.h>
 #include <linux/delay.h>
-#include <linux/interrupt.h>
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/version.h>
-#include <sound/core.h>
+#include <media/v4l2-dev.h>
+#include <media/v4l2-ioctl.h>
 #include <sound/tea575x-tuner.h>
 
 MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
@@ -62,17 +62,6 @@ module_param(radio_nr, int, 0);
 #define TEA575X_BIT_DUMMY       (1<<15)         /* buffer */
 #define TEA575X_BIT_FREQ_MASK   0x7fff
 
-static struct v4l2_queryctrl radio_qctrl[] = {
-        {
-                .id            = V4L2_CID_AUDIO_MUTE,
-                .name          = "Mute",
-                .minimum       = 0,
-                .maximum       = 1,
-                .default_value = 1,
-                .type          = V4L2_CTRL_TYPE_BOOLEAN,
-        }
-};
-
 /*
  * lowlevel part
  */
@@ -266,83 +255,23 @@ static int vidioc_s_audio(struct file *file, void *priv,
         return 0;
 }
 
-static int vidioc_queryctrl(struct file *file, void *priv,
-                                        struct v4l2_queryctrl *qc)
-{
-        int i;
-
-        for (i = 0; i < ARRAY_SIZE(radio_qctrl); i++) {
-                if (qc->id && qc->id == radio_qctrl[i].id) {
-                        memcpy(qc, &(radio_qctrl[i]),
-                                                sizeof(*qc));
-                        return 0;
-                }
-        }
-        return -EINVAL;
-}
-
-static int vidioc_g_ctrl(struct file *file, void *priv,
-                                        struct v4l2_control *ctrl)
+static int tea575x_s_ctrl(struct v4l2_ctrl *ctrl)
 {
-        struct snd_tea575x *tea = video_drvdata(file);
+        struct snd_tea575x *tea = container_of(ctrl->handler, struct snd_tea575x, ctrl_handler);
 
         switch (ctrl->id) {
         case V4L2_CID_AUDIO_MUTE:
-                ctrl->value = tea->mute;
+                tea->mute = ctrl->val;
+                snd_tea575x_set_freq(tea);
                 return 0;
         }
-        return -EINVAL;
-}
 
-static int vidioc_s_ctrl(struct file *file, void *priv,
-                                        struct v4l2_control *ctrl)
-{
-        struct snd_tea575x *tea = video_drvdata(file);
-
-        switch (ctrl->id) {
-        case V4L2_CID_AUDIO_MUTE:
-                if (tea->mute != ctrl->value) {
-                        tea->mute = ctrl->value;
-                        snd_tea575x_set_freq(tea);
-                }
-                return 0;
-        }
         return -EINVAL;
 }
 
-static int vidioc_g_input(struct file *filp, void *priv, unsigned int *i)
-{
-        *i = 0;
-        return 0;
-}
-
-static int vidioc_s_input(struct file *filp, void *priv, unsigned int i)
-{
-        if (i != 0)
-                return -EINVAL;
-        return 0;
-}
-
-static int snd_tea575x_exclusive_open(struct file *file)
-{
-        struct snd_tea575x *tea = video_drvdata(file);
-
-        return test_and_set_bit(0, &tea->in_use) ? -EBUSY : 0;
-}
-
-static int snd_tea575x_exclusive_release(struct file *file)
-{
-        struct snd_tea575x *tea = video_drvdata(file);
-
-        clear_bit(0, &tea->in_use);
-        return 0;
-}
-
 static const struct v4l2_file_operations tea575x_fops = {
         .owner          = THIS_MODULE,
-        .open           = snd_tea575x_exclusive_open,
-        .release        = snd_tea575x_exclusive_release,
-        .ioctl          = video_ioctl2,
+        .unlocked_ioctl = video_ioctl2,
 };
 
 static const struct v4l2_ioctl_ops tea575x_ioctl_ops = {
@@ -351,20 +280,19 @@ static const struct v4l2_ioctl_ops tea575x_ioctl_ops = {
         .vidioc_s_tuner     = vidioc_s_tuner,
         .vidioc_g_audio     = vidioc_g_audio,
         .vidioc_s_audio     = vidioc_s_audio,
-        .vidioc_g_input     = vidioc_g_input,
-        .vidioc_s_input     = vidioc_s_input,
         .vidioc_g_frequency = vidioc_g_frequency,
         .vidioc_s_frequency = vidioc_s_frequency,
-        .vidioc_queryctrl   = vidioc_queryctrl,
-        .vidioc_g_ctrl      = vidioc_g_ctrl,
-        .vidioc_s_ctrl      = vidioc_s_ctrl,
 };
 
 static struct video_device tea575x_radio = {
         .name           = "tea575x-tuner",
         .fops           = &tea575x_fops,
         .ioctl_ops      = &tea575x_ioctl_ops,
-        .release        = video_device_release,
+        .release        = video_device_release_empty,
+};
+
+static const struct v4l2_ctrl_ops tea575x_ctrl_ops = {
+        .s_ctrl = tea575x_s_ctrl,
 };
 
 /*
@@ -373,7 +301,6 @@ static struct video_device tea575x_radio = {
 int snd_tea575x_init(struct snd_tea575x *tea)
 {
         int retval;
-        struct video_device *tea575x_radio_inst;
 
         tea->mute = 1;
 
@@ -381,43 +308,49 @@ int snd_tea575x_init(struct snd_tea575x *tea)
         if (snd_tea575x_read(tea) != 0x55AA)
                 return -ENODEV;
 
-        tea->in_use = 0;
         tea->val = TEA575X_BIT_BAND_FM | TEA575X_BIT_SEARCH_10_40;
         tea->freq = 90500 * 16;         /* 90.5Mhz default */
+        snd_tea575x_set_freq(tea);
 
-        tea575x_radio_inst = video_device_alloc();
-        if (tea575x_radio_inst == NULL) {
-                printk(KERN_ERR "tea575x-tuner: not enough memory\n");
-                return -ENOMEM;
-        }
+        tea->vd = tea575x_radio;
+        video_set_drvdata(&tea->vd, tea);
+        mutex_init(&tea->mutex);
+        tea->vd.lock = &tea->mutex;
 
-        memcpy(tea575x_radio_inst, &tea575x_radio, sizeof(tea575x_radio));
+        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_ctrl_handler_free(&tea->ctrl_handler);
+                return retval;
+        }
 
-        strcpy(tea575x_radio.name, tea->tea5759 ?
-                                   "TEA5759 radio" : "TEA5757 radio");
+        if (tea->ext_init) {
+                retval = tea->ext_init(tea);
+                if (retval) {
+                        v4l2_ctrl_handler_free(&tea->ctrl_handler);
+                        return retval;
+                }
+        }
 
-        video_set_drvdata(tea575x_radio_inst, tea);
+        v4l2_ctrl_handler_setup(&tea->ctrl_handler);
 
-        retval = video_register_device(tea575x_radio_inst,
-                                       VFL_TYPE_RADIO, radio_nr);
+        retval = video_register_device(&tea->vd, VFL_TYPE_RADIO, radio_nr);
         if (retval) {
                 printk(KERN_ERR "tea575x-tuner: can't register video device!\n");
-                kfree(tea575x_radio_inst);
+                v4l2_ctrl_handler_free(&tea->ctrl_handler);
                 return retval;
         }
 
-        snd_tea575x_set_freq(tea);
-        tea->vd = tea575x_radio_inst;
-
         return 0;
 }
 
 void snd_tea575x_exit(struct snd_tea575x *tea)
 {
-        if (tea->vd) {
-                video_unregister_device(tea->vd);
-                tea->vd = NULL;
-        }
+        video_unregister_device(&tea->vd);
+        v4l2_ctrl_handler_free(&tea->ctrl_handler);
 }
 
 static int __init alsa_tea575x_module_init(void)
diff --git a/sound/isa/msnd/msnd.h b/sound/isa/msnd/msnd.h
index 3773e242b58e..a168ba3313ac 100644
--- a/sound/isa/msnd/msnd.h
+++ b/sound/isa/msnd/msnd.h
@@ -249,7 +249,7 @@ struct snd_msnd {
 
         /* State variables */
         enum { msndClassic, msndPinnacle } type;
-        mode_t mode;
+        fmode_t mode;
         unsigned long flags;
 #define F_RESETTING                     0
 #define F_HAVEDIGITAL                   1
diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig
index e90d103e177e..88168044375f 100644
--- a/sound/pci/Kconfig
+++ b/sound/pci/Kconfig
@@ -1,5 +1,10 @@
 # ALSA PCI drivers
 
+config SND_TEA575X
+        tristate
+        depends on SND_FM801_TEA575X_BOOL || SND_ES1968_RADIO || RADIO_SF16FMR2
+        default SND_FM801 || SND_ES1968 || RADIO_SF16FMR2
+
 menuconfig SND_PCI
         bool "PCI sound devices"
         depends on PCI
@@ -563,11 +568,6 @@ config SND_FM801_TEA575X_BOOL
           FM801 chip with a TEA5757 tuner (MediaForte SF256-PCS, SF256-PCP and
           SF64-PCR) into the snd-fm801 driver.
 
-config SND_TEA575X
-        tristate
-        depends on SND_FM801_TEA575X_BOOL || SND_ES1968_RADIO
-        default SND_FM801 || SND_ES1968
-
 source "sound/pci/hda/Kconfig"
 
 config SND_HDSP
diff --git a/sound/pci/echoaudio/darla20.c b/sound/pci/echoaudio/darla20.c
index fe7ad64dccd7..43c7e12bc05d 100644
--- a/sound/pci/echoaudio/darla20.c
+++ b/sound/pci/echoaudio/darla20.c
@@ -52,7 +52,7 @@
 #include <sound/asoundef.h>
 #include <sound/initval.h>
 #include <asm/io.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #include "echoaudio.h"
 
 MODULE_FIRMWARE("ea/darla20_dsp.fw");
diff --git a/sound/pci/echoaudio/darla24.c b/sound/pci/echoaudio/darla24.c
index d1fd34b1a8e3..95b03306e026 100644
--- a/sound/pci/echoaudio/darla24.c
+++ b/sound/pci/echoaudio/darla24.c
@@ -56,7 +56,7 @@
 #include <sound/asoundef.h>
 #include <sound/initval.h>
 #include <asm/io.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #include "echoaudio.h"
 
 MODULE_FIRMWARE("ea/darla24_dsp.fw");
diff --git a/sound/pci/echoaudio/echo3g.c b/sound/pci/echoaudio/echo3g.c
index 1dffdc54416d..8723c40183e6 100644
--- a/sound/pci/echoaudio/echo3g.c
+++ b/sound/pci/echoaudio/echo3g.c
@@ -64,7 +64,7 @@
 #include <sound/initval.h>
 #include <sound/rawmidi.h>
 #include <asm/io.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #include "echoaudio.h"
 
 MODULE_FIRMWARE("ea/loader_dsp.fw");
diff --git a/sound/pci/echoaudio/gina20.c b/sound/pci/echoaudio/gina20.c
index 050e54aa693f..0058c67115df 100644
--- a/sound/pci/echoaudio/gina20.c
+++ b/sound/pci/echoaudio/gina20.c
@@ -56,7 +56,7 @@
 #include <sound/asoundef.h>
 #include <sound/initval.h>
 #include <asm/io.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #include "echoaudio.h"
 
 MODULE_FIRMWARE("ea/gina20_dsp.fw");
diff --git a/sound/pci/echoaudio/gina24.c b/sound/pci/echoaudio/gina24.c
index 5748fc6d29d6..14e4925e76cc 100644
--- a/sound/pci/echoaudio/gina24.c
+++ b/sound/pci/echoaudio/gina24.c
@@ -62,7 +62,7 @@
 #include <sound/asoundef.h>
 #include <sound/initval.h>
 #include <asm/io.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #include "echoaudio.h"
 
 MODULE_FIRMWARE("ea/loader_dsp.fw");
diff --git a/sound/pci/echoaudio/indigo.c b/sound/pci/echoaudio/indigo.c
index 4ae5e35cb5f1..f416b154f146 100644
--- a/sound/pci/echoaudio/indigo.c
+++ b/sound/pci/echoaudio/indigo.c
@@ -54,7 +54,7 @@
 #include <sound/asoundef.h>
 #include <sound/initval.h>
 #include <asm/io.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #include "echoaudio.h"
 
 MODULE_FIRMWARE("ea/loader_dsp.fw");
diff --git a/sound/pci/echoaudio/indigodj.c b/sound/pci/echoaudio/indigodj.c
index 3550715bab1c..e594a3b2766e 100644
--- a/sound/pci/echoaudio/indigodj.c
+++ b/sound/pci/echoaudio/indigodj.c
@@ -54,7 +54,7 @@
 #include <sound/asoundef.h>
 #include <sound/initval.h>
 #include <asm/io.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #include "echoaudio.h"
 
 MODULE_FIRMWARE("ea/loader_dsp.fw");
diff --git a/sound/pci/echoaudio/indigodjx.c b/sound/pci/echoaudio/indigodjx.c
index 19b191fd0120..f0d00bfceee5 100644
--- a/sound/pci/echoaudio/indigodjx.c
+++ b/sound/pci/echoaudio/indigodjx.c
@@ -54,7 +54,7 @@
 #include <sound/pcm_params.h>
 #include <sound/asoundef.h>
 #include <sound/initval.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #include "echoaudio.h"
 
 MODULE_FIRMWARE("ea/loader_dsp.fw");
diff --git a/sound/pci/echoaudio/indigoio.c b/sound/pci/echoaudio/indigoio.c
index a9fcedf317a4..1af0037304c6 100644
--- a/sound/pci/echoaudio/indigoio.c
+++ b/sound/pci/echoaudio/indigoio.c
@@ -55,7 +55,7 @@
 #include <sound/asoundef.h>
 #include <sound/initval.h>
 #include <asm/io.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #include "echoaudio.h"
 
 MODULE_FIRMWARE("ea/loader_dsp.fw");
diff --git a/sound/pci/echoaudio/indigoiox.c b/sound/pci/echoaudio/indigoiox.c
index bcdfac63212c..0b51163452b5 100644
--- a/sound/pci/echoaudio/indigoiox.c
+++ b/sound/pci/echoaudio/indigoiox.c
@@ -55,7 +55,7 @@
 #include <sound/pcm_params.h>
 #include <sound/asoundef.h>
 #include <sound/initval.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #include "echoaudio.h"
 
 MODULE_FIRMWARE("ea/loader_dsp.fw");
diff --git a/sound/pci/echoaudio/layla20.c b/sound/pci/echoaudio/layla20.c
index d3a98c5dac86..3f63ab8dfff3 100644
--- a/sound/pci/echoaudio/layla20.c
+++ b/sound/pci/echoaudio/layla20.c
@@ -62,7 +62,7 @@
 #include <sound/initval.h>
 #include <sound/rawmidi.h>
 #include <asm/io.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #include "echoaudio.h"
 
 MODULE_FIRMWARE("ea/layla20_dsp.fw");
diff --git a/sound/pci/echoaudio/layla24.c b/sound/pci/echoaudio/layla24.c
index 2a1dca6dce17..283137244472 100644
--- a/sound/pci/echoaudio/layla24.c
+++ b/sound/pci/echoaudio/layla24.c
@@ -64,7 +64,7 @@
 #include <sound/initval.h>
 #include <sound/rawmidi.h>
 #include <asm/io.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #include "echoaudio.h"
 
 MODULE_FIRMWARE("ea/loader_dsp.fw");
diff --git a/sound/pci/echoaudio/mia.c b/sound/pci/echoaudio/mia.c
index 9cdf14cfdd74..eddaeb4da50e 100644
--- a/sound/pci/echoaudio/mia.c
+++ b/sound/pci/echoaudio/mia.c
@@ -63,7 +63,7 @@
 #include <sound/initval.h>
 #include <sound/rawmidi.h>
 #include <asm/io.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #include "echoaudio.h"
 
 MODULE_FIRMWARE("ea/loader_dsp.fw");
diff --git a/sound/pci/echoaudio/mona.c b/sound/pci/echoaudio/mona.c
index 1047be405ebe..0364011c237d 100644
--- a/sound/pci/echoaudio/mona.c
+++ b/sound/pci/echoaudio/mona.c
@@ -60,7 +60,7 @@
 #include <sound/asoundef.h>
 #include <sound/initval.h>
 #include <asm/io.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #include "echoaudio.h"
 
 MODULE_FIRMWARE("ea/loader_dsp.fw");
diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c
index be06fb3e45a1..0ccc0eb75775 100644
--- a/sound/pci/ice1712/ice1712.c
+++ b/sound/pci/ice1712/ice1712.c
@@ -87,7 +87,7 @@ static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;	/* ID for this card */
 static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;/* Enable this card */
 static char *model[SNDRV_CARDS];
 static int omni[SNDRV_CARDS];                           /* Delta44 & 66 Omni I/O support */
-static int cs8427_timeout[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)] = 500}; /* CS8427 S/PDIF transciever reset timeout value in msec */
+static int cs8427_timeout[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS-1)] = 500}; /* CS8427 S/PDIF transceiver reset timeout value in msec */
 static int dxr_enable[SNDRV_CARDS];                     /* DXR enable for DMX6FIRE */
 
 module_param_array(index, int, NULL, 0444);
diff --git a/sound/pci/lx6464es/lx6464es.h b/sound/pci/lx6464es/lx6464es.h
index e2a124ae27e8..6792eda9c9a5 100644
--- a/sound/pci/lx6464es/lx6464es.h
+++ b/sound/pci/lx6464es/lx6464es.h
@@ -26,7 +26,7 @@
 #define LX6464ES_H
 
 #include <linux/spinlock.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 
 #include <sound/core.h>
 #include <sound/pcm.h>
diff --git a/sound/ppc/pmac.c b/sound/ppc/pmac.c
index 3ecbd67f88c9..ab96cde7417b 100644
--- a/sound/ppc/pmac.c
+++ b/sound/ppc/pmac.c
@@ -881,8 +881,7 @@ static int snd_pmac_free(struct snd_pmac *chip)
                 for (i = 0; i < 3; i++) {
                         if (chip->requested & (1 << i))
                                 release_mem_region(chip->rsrc[i].start,
-                                                   chip->rsrc[i].end -
-                                                   chip->rsrc[i].start + 1);
+                                                   resource_size(&chip->rsrc[i]));
                 }
         }
 
@@ -1228,8 +1227,7 @@ int __devinit snd_pmac_new(struct snd_card *card, struct snd_pmac **chip_return)
                                 goto __error;
                         }
                         if (request_mem_region(chip->rsrc[i].start,
-                                               chip->rsrc[i].end -
-                                               chip->rsrc[i].start + 1,
+                                               resource_size(&chip->rsrc[i]),
                                                rnames[i]) == NULL) {
                                 printk(KERN_ERR "snd: can't request rsrc "
                                        " %d (%s: %pR)\n",
@@ -1254,8 +1252,7 @@ int __devinit snd_pmac_new(struct snd_card *card, struct snd_pmac **chip_return)
                                 goto __error;
                         }
                         if (request_mem_region(chip->rsrc[i].start,
-                                               chip->rsrc[i].end -
-                                               chip->rsrc[i].start + 1,
+                                               resource_size(&chip->rsrc[i]),
                                                rnames[i]) == NULL) {
                                 printk(KERN_ERR "snd: can't request rsrc "
                                        " %d (%s: %pR)\n",
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 36a030f1d1f5..379b2e3afd98 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -250,10 +250,11 @@ config SND_SOC_TLV320DAC33
         tristate
 
 config SND_SOC_TWL4030
-        select TWL4030_CODEC
+        select MFD_TWL4030_AUDIO
         tristate
 
 config SND_SOC_TWL6040
+        select TWL6040_CORE
         tristate
 
 config SND_SOC_UDA134X
diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c
index bec788b12613..71674bec9604 100644
--- a/sound/soc/codecs/twl4030.c
+++ b/sound/soc/codecs/twl4030.c
@@ -36,7 +36,7 @@
 #include <sound/tlv.h>
 
 /* Register descriptions are here */
-#include <linux/mfd/twl4030-codec.h>
+#include <linux/mfd/twl4030-audio.h>
 
 /* Shadow register used by the audio driver */
 #define TWL4030_REG_SW_SHADOW           0x4A
@@ -251,9 +251,9 @@ static void twl4030_codec_enable(struct snd_soc_codec *codec, int enable)
                 return;
 
         if (enable)
-                mode = twl4030_codec_enable_resource(TWL4030_CODEC_RES_POWER);
+                mode = twl4030_audio_enable_resource(TWL4030_AUDIO_RES_POWER);
         else
-                mode = twl4030_codec_disable_resource(TWL4030_CODEC_RES_POWER);
+                mode = twl4030_audio_disable_resource(TWL4030_AUDIO_RES_POWER);
 
         if (mode >= 0) {
                 twl4030_write_reg_cache(codec, TWL4030_REG_CODEC_MODE, mode);
@@ -297,7 +297,7 @@ static inline void twl4030_reset_registers(struct snd_soc_codec *codec)
 
 static void twl4030_init_chip(struct snd_soc_codec *codec)
 {
-        struct twl4030_codec_audio_data *pdata = dev_get_platdata(codec->dev);
+        struct twl4030_codec_data *pdata = dev_get_platdata(codec->dev);
         struct twl4030_priv *twl4030 = snd_soc_codec_get_drvdata(codec);
         u8 reg, byte;
         int i = 0;
@@ -375,13 +375,13 @@ static void twl4030_apll_enable(struct snd_soc_codec *codec, int enable)
         if (enable) {
                 twl4030->apll_enabled++;
                 if (twl4030->apll_enabled == 1)
-                        status = twl4030_codec_enable_resource(
-                                                        TWL4030_CODEC_RES_APLL);
+                        status = twl4030_audio_enable_resource(
+                                                        TWL4030_AUDIO_RES_APLL);
         } else {
                 twl4030->apll_enabled--;
                 if (!twl4030->apll_enabled)
-                        status = twl4030_codec_disable_resource(
-                                                        TWL4030_CODEC_RES_APLL);
+                        status = twl4030_audio_disable_resource(
+                                                        TWL4030_AUDIO_RES_APLL);
         }
 
         if (status >= 0)
@@ -732,7 +732,7 @@ static int aif_event(struct snd_soc_dapm_widget *w,
 
 static void headset_ramp(struct snd_soc_codec *codec, int ramp)
 {
-        struct twl4030_codec_audio_data *pdata = codec->dev->platform_data;
+        struct twl4030_codec_data *pdata = codec->dev->platform_data;
         unsigned char hs_gain, hs_pop;
         struct twl4030_priv *twl4030 = snd_soc_codec_get_drvdata(codec);
         /* Base values for ramp delay calculation: 2^19 - 2^26 */
@@ -2260,7 +2260,7 @@ static int twl4030_soc_probe(struct snd_soc_codec *codec)
         }
         snd_soc_codec_set_drvdata(codec, twl4030);
         /* Set the defaults, and power up the codec */
-        twl4030->sysclk = twl4030_codec_get_mclk() / 1000;
+        twl4030->sysclk = twl4030_audio_get_mclk() / 1000;
         codec->dapm.idle_bias_off = 1;
 
         twl4030_init_chip(codec);
@@ -2297,7 +2297,7 @@ static struct snd_soc_codec_driver soc_codec_dev_twl4030 = {
 
 static int __devinit twl4030_codec_probe(struct platform_device *pdev)
 {
-        struct twl4030_codec_audio_data *pdata = pdev->dev.platform_data;
+        struct twl4030_codec_data *pdata = pdev->dev.platform_data;
 
         if (!pdata) {
                 dev_err(&pdev->dev, "platform_data is missing\n");
diff --git a/sound/soc/codecs/twl6040.c b/sound/soc/codecs/twl6040.c
index cd63bba623df..443032b3b329 100644
--- a/sound/soc/codecs/twl6040.c
+++ b/sound/soc/codecs/twl6040.c
@@ -24,11 +24,10 @@
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/pm.h>
-#include <linux/i2c.h>
-#include <linux/gpio.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <linux/i2c/twl.h>
+#include <linux/mfd/twl6040.h>
 
 #include <sound/core.h>
 #include <sound/pcm.h>
@@ -77,14 +76,19 @@ struct twl6040_jack_data {
 
 /* codec private data */
 struct twl6040_data {
-        int audpwron;
-        int naudint;
+        int plug_irq;
         int codec_powered;
         int pll;
         int non_lp;
+        int pll_power_mode;
+        int hs_power_mode;
+        int hs_power_mode_locked;
+        unsigned int clk_in;
         unsigned int sysclk;
-        struct snd_pcm_hw_constraint_list *sysclk_constraints;
-        struct completion ready;
+        u16 hs_left_step;
+        u16 hs_right_step;
+        u16 hf_left_step;
+        u16 hf_right_step;
         struct twl6040_jack_data hs_jack;
         struct snd_soc_codec *codec;
         struct workqueue_struct *workqueue;
@@ -206,6 +210,32 @@ static const int twl6040_vdd_reg[TWL6040_VDDREGNUM] = {
         TWL6040_REG_DLB,
 };
 
+/* set of rates for each pll: low-power and high-performance */
+static unsigned int lp_rates[] = {
+        8000,
+        11250,
+        16000,
+        22500,
+        32000,
+        44100,
+        48000,
+        88200,
+        96000,
+};
+
+static unsigned int hp_rates[] = {
+        8000,
+        16000,
+        32000,
+        48000,
+        96000,
+};
+
+static struct snd_pcm_hw_constraint_list sysclk_constraints[] = {
+        { .count = ARRAY_SIZE(lp_rates), .list = lp_rates, },
+        { .count = ARRAY_SIZE(hp_rates), .list = hp_rates, },
+};
+
 /*
  * read twl6040 register cache
  */
@@ -239,12 +269,13 @@ static inline void twl6040_write_reg_cache(struct snd_soc_codec *codec,
 static int twl6040_read_reg_volatile(struct snd_soc_codec *codec,
                         unsigned int reg)
 {
+        struct twl6040 *twl6040 = codec->control_data;
         u8 value;
 
         if (reg >= TWL6040_CACHEREGNUM)
                 return -EIO;
 
-        twl_i2c_read_u8(TWL_MODULE_AUDIO_VOICE, &value, reg);
+        value = twl6040_reg_read(twl6040, reg);
         twl6040_write_reg_cache(codec, reg, value);
 
         return value;
@@ -256,11 +287,13 @@ static int twl6040_read_reg_volatile(struct snd_soc_codec *codec,
 static int twl6040_write(struct snd_soc_codec *codec,
                         unsigned int reg, unsigned int value)
 {
+        struct twl6040 *twl6040 = codec->control_data;
+
         if (reg >= TWL6040_CACHEREGNUM)
                 return -EIO;
 
         twl6040_write_reg_cache(codec, reg, value);
-        return twl_i2c_write_u8(TWL_MODULE_AUDIO_VOICE, value, reg);
+        return twl6040_reg_write(twl6040, reg, value);
 }
 
 static void twl6040_init_vio_regs(struct snd_soc_codec *codec)
@@ -268,15 +301,21 @@ static void twl6040_init_vio_regs(struct snd_soc_codec *codec)
         u8 *cache = codec->reg_cache;
         int reg, i;
 
-        /* allow registers to be accessed by i2c */
-        twl6040_write(codec, TWL6040_REG_ACCCTL, cache[TWL6040_REG_ACCCTL]);
-
         for (i = 0; i < TWL6040_VIOREGNUM; i++) {
                 reg = twl6040_vio_reg[i];
-                /* skip read-only registers (ASICID, ASICREV, STATUS) */
+                /*
+                 * skip read-only registers (ASICID, ASICREV, STATUS)
+                 * and registers shared among MFD children
+                 */
                 switch (reg) {
                 case TWL6040_REG_ASICID:
                 case TWL6040_REG_ASICREV:
+                case TWL6040_REG_INTID:
+                case TWL6040_REG_INTMR:
+                case TWL6040_REG_NCPCTL:
+                case TWL6040_REG_LDOCTL:
+                case TWL6040_REG_GPOCTL:
+                case TWL6040_REG_ACCCTL:
                 case TWL6040_REG_STATUS:
                         continue;
                 default:
@@ -293,6 +332,20 @@ static void twl6040_init_vdd_regs(struct snd_soc_codec *codec)
 
         for (i = 0; i < TWL6040_VDDREGNUM; i++) {
                 reg = twl6040_vdd_reg[i];
+                /* skip vibra and PLL registers */
+                switch (reg) {
+                case TWL6040_REG_VIBCTLL:
+                case TWL6040_REG_VIBDATL:
+                case TWL6040_REG_VIBCTLR:
+                case TWL6040_REG_VIBDATR:
+                case TWL6040_REG_HPPLLCTL:
+                case TWL6040_REG_LPPLLCTL:
+                case TWL6040_REG_LPPLLDIV:
+                        continue;
+                default:
+                        break;
+                }
+
                 twl6040_write(codec, reg, cache[reg]);
         }
 }
@@ -317,7 +370,11 @@ static inline int twl6040_hs_ramp_step(struct snd_soc_codec *codec,
         if (headset->ramp == TWL6040_RAMP_UP) {
                 /* ramp step up */
                 if (val < headset->left_vol) {
-                        val += left_step;
+                        if (val + left_step > headset->left_vol)
+                                val = headset->left_vol;
+                        else
+                                val += left_step;
+
                         reg &= ~TWL6040_HSL_VOL_MASK;
                         twl6040_write(codec, TWL6040_REG_HSGAIN,
                                         (reg | (~val & TWL6040_HSL_VOL_MASK)));
@@ -327,7 +384,11 @@ static inline int twl6040_hs_ramp_step(struct snd_soc_codec *codec,
         } else if (headset->ramp == TWL6040_RAMP_DOWN) {
                 /* ramp step down */
                 if (val > 0x0) {
-                        val -= left_step;
+                        if ((int)val - (int)left_step < 0)
+                                val = 0;
+                        else
+                                val -= left_step;
+
                         reg &= ~TWL6040_HSL_VOL_MASK;
                         twl6040_write(codec, TWL6040_REG_HSGAIN, reg |
                                                 (~val & TWL6040_HSL_VOL_MASK));
@@ -344,7 +405,11 @@ static inline int twl6040_hs_ramp_step(struct snd_soc_codec *codec,
         if (headset->ramp == TWL6040_RAMP_UP) {
                 /* ramp step up */
                 if (val < headset->right_vol) {
-                        val += right_step;
+                        if (val + right_step > headset->right_vol)
+                                val = headset->right_vol;
+                        else
+                                val += right_step;
+
                         reg &= ~TWL6040_HSR_VOL_MASK;
                         twl6040_write(codec, TWL6040_REG_HSGAIN,
                                 (reg | (~val << TWL6040_HSR_VOL_SHIFT)));
@@ -354,7 +419,11 @@ static inline int twl6040_hs_ramp_step(struct snd_soc_codec *codec,
         } else if (headset->ramp == TWL6040_RAMP_DOWN) {
                 /* ramp step down */
                 if (val > 0x0) {
-                        val -= right_step;
+                        if ((int)val - (int)right_step < 0)
+                                val = 0;
+                        else
+                                val -= right_step;
+
                         reg &= ~TWL6040_HSR_VOL_MASK;
                         twl6040_write(codec, TWL6040_REG_HSGAIN,
                                          reg | (~val << TWL6040_HSR_VOL_SHIFT));
@@ -385,7 +454,11 @@ static inline int twl6040_hf_ramp_step(struct snd_soc_codec *codec,
         if (handsfree->ramp == TWL6040_RAMP_UP) {
                 /* ramp step up */
                 if (val < handsfree->left_vol) {
-                        val += left_step;
+                        if (val + left_step > handsfree->left_vol)
+                                val = handsfree->left_vol;
+                        else
+                                val += left_step;
+
                         reg &= ~TWL6040_HF_VOL_MASK;
                         twl6040_write(codec, TWL6040_REG_HFLGAIN,
                                                 reg | (0x1D - val));
@@ -395,7 +468,11 @@ static inline int twl6040_hf_ramp_step(struct snd_soc_codec *codec,
         } else if (handsfree->ramp == TWL6040_RAMP_DOWN) {
                 /* ramp step down */
                 if (val > 0) {
-                        val -= left_step;
+                        if ((int)val - (int)left_step < 0)
+                                val = 0;
+                        else
+                                val -= left_step;
+
                         reg &= ~TWL6040_HF_VOL_MASK;
                         twl6040_write(codec, TWL6040_REG_HFLGAIN,
                                                 reg | (0x1D - val));
@@ -412,7 +489,11 @@ static inline int twl6040_hf_ramp_step(struct snd_soc_codec *codec,
         if (handsfree->ramp == TWL6040_RAMP_UP) {
                 /* ramp step up */
                 if (val < handsfree->right_vol) {
-                        val += right_step;
+                        if (val + right_step > handsfree->right_vol)
+                                val = handsfree->right_vol;
+                        else
+                                val += right_step;
+
                         reg &= ~TWL6040_HF_VOL_MASK;
                         twl6040_write(codec, TWL6040_REG_HFRGAIN,
                                                 reg | (0x1D - val));
@@ -422,7 +503,11 @@ static inline int twl6040_hf_ramp_step(struct snd_soc_codec *codec,
         } else if (handsfree->ramp == TWL6040_RAMP_DOWN) {
                 /* ramp step down */
                 if (val > 0) {
-                        val -= right_step;
+                        if ((int)val - (int)right_step < 0)
+                                val = 0;
+                        else
+                                val -= right_step;
+
                         reg &= ~TWL6040_HF_VOL_MASK;
                         twl6040_write(codec, TWL6040_REG_HFRGAIN,
                                                 reg | (0x1D - val));
@@ -451,11 +536,9 @@ static void twl6040_pga_hs_work(struct work_struct *work)
 
         /* HS PGA volumes have 4 bits of resolution to ramp */
         for (i = 0; i <= 16; i++) {
-                headset_complete = 1;
-                if (headset->ramp != TWL6040_RAMP_NONE)
-                        headset_complete = twl6040_hs_ramp_step(codec,
-                                                        headset->left_step,
-                                                        headset->right_step);
+                headset_complete = twl6040_hs_ramp_step(codec,
+                                                headset->left_step,
+                                                headset->right_step);
 
                 /* ramp finished ? */
                 if (headset_complete)
@@ -496,11 +579,9 @@ static void twl6040_pga_hf_work(struct work_struct *work)
 
         /* HF PGA volumes have 5 bits of resolution to ramp */
         for (i = 0; i <= 32; i++) {
-                handsfree_complete = 1;
-                if (handsfree->ramp != TWL6040_RAMP_NONE)
-                        handsfree_complete = twl6040_hf_ramp_step(codec,
-                                                        handsfree->left_step,
-                                                        handsfree->right_step);
+                handsfree_complete = twl6040_hf_ramp_step(codec,
+                                                handsfree->left_step,
+                                                handsfree->right_step);
 
                 /* ramp finished ? */
                 if (handsfree_complete)
@@ -541,12 +622,16 @@ static int pga_event(struct snd_soc_dapm_widget *w,
                 out = &priv->headset;
                 work = &priv->hs_delayed_work;
                 queue = priv->hs_workqueue;
+                out->left_step = priv->hs_left_step;
+                out->right_step = priv->hs_right_step;
                 out->step_delay = 5;    /* 5 ms between volume ramp steps */
                 break;
         case 4:
                 out = &priv->handsfree;
                 work = &priv->hf_delayed_work;
                 queue = priv->hf_workqueue;
+                out->left_step = priv->hf_left_step;
+                out->right_step = priv->hf_right_step;
                 out->step_delay = 5;    /* 5 ms between volume ramp steps */
                 if (SND_SOC_DAPM_EVENT_ON(event))
                         priv->non_lp++;
@@ -579,8 +664,6 @@ static int pga_event(struct snd_soc_dapm_widget *w,
 
                 if (!delayed_work_pending(work)) {
                         /* use volume ramp for power-down */
-                        out->left_step = 1;
-                        out->right_step = 1;
                         out->ramp = TWL6040_RAMP_DOWN;
                         INIT_COMPLETION(out->ramp_done);
 
@@ -596,88 +679,6 @@ static int pga_event(struct snd_soc_dapm_widget *w,
         return 0;
 }
 
-/* twl6040 codec manual power-up sequence */
-static void twl6040_power_up(struct snd_soc_codec *codec)
-{
-        u8 ncpctl, ldoctl, lppllctl, accctl;
-
-        ncpctl = twl6040_read_reg_cache(codec, TWL6040_REG_NCPCTL);
-        ldoctl = twl6040_read_reg_cache(codec, TWL6040_REG_LDOCTL);
-        lppllctl = twl6040_read_reg_cache(codec, TWL6040_REG_LPPLLCTL);
-        accctl = twl6040_read_reg_cache(codec, TWL6040_REG_ACCCTL);
-
-        /* enable reference system */
-        ldoctl |= TWL6040_REFENA;
-        twl6040_write(codec, TWL6040_REG_LDOCTL, ldoctl);
-        msleep(10);
-        /* enable internal oscillator */
-        ldoctl |= TWL6040_OSCENA;
-        twl6040_write(codec, TWL6040_REG_LDOCTL, ldoctl);
-        udelay(10);
-        /* enable high-side ldo */
-        ldoctl |= TWL6040_HSLDOENA;
-        twl6040_write(codec, TWL6040_REG_LDOCTL, ldoctl);
-        udelay(244);
-        /* enable negative charge pump */
-        ncpctl |= TWL6040_NCPENA | TWL6040_NCPOPEN;
-        twl6040_write(codec, TWL6040_REG_NCPCTL, ncpctl);
-        udelay(488);
-        /* enable low-side ldo */
-        ldoctl |= TWL6040_LSLDOENA;
-        twl6040_write(codec, TWL6040_REG_LDOCTL, ldoctl);
-        udelay(244);
-        /* enable low-power pll */
-        lppllctl |= TWL6040_LPLLENA;
-        twl6040_write(codec, TWL6040_REG_LPPLLCTL, lppllctl);
-        /* reset state machine */
-        accctl |= TWL6040_RESETSPLIT;
-        twl6040_write(codec, TWL6040_REG_ACCCTL, accctl);
-        mdelay(5);
-        accctl &= ~TWL6040_RESETSPLIT;
-        twl6040_write(codec, TWL6040_REG_ACCCTL, accctl);
-        /* disable internal oscillator */
-        ldoctl &= ~TWL6040_OSCENA;
-        twl6040_write(codec, TWL6040_REG_LDOCTL, ldoctl);
-}
-
-/* twl6040 codec manual power-down sequence */
-static void twl6040_power_down(struct snd_soc_codec *codec)
-{
-        u8 ncpctl, ldoctl, lppllctl, accctl;
-
-        ncpctl = twl6040_read_reg_cache(codec, TWL6040_REG_NCPCTL);
-        ldoctl = twl6040_read_reg_cache(codec, TWL6040_REG_LDOCTL);
-        lppllctl = twl6040_read_reg_cache(codec, TWL6040_REG_LPPLLCTL);
-        accctl = twl6040_read_reg_cache(codec, TWL6040_REG_ACCCTL);
-
-        /* enable internal oscillator */
-        ldoctl |= TWL6040_OSCENA;
-        twl6040_write(codec, TWL6040_REG_LDOCTL, ldoctl);
-        udelay(10);
-        /* disable low-power pll */
-        lppllctl &= ~TWL6040_LPLLENA;
-        twl6040_write(codec, TWL6040_REG_LPPLLCTL, lppllctl);
-        /* disable low-side ldo */
-        ldoctl &= ~TWL6040_LSLDOENA;
-        twl6040_write(codec, TWL6040_REG_LDOCTL, ldoctl);
-        udelay(244);
-        /* disable negative charge pump */
-        ncpctl &= ~(TWL6040_NCPENA | TWL6040_NCPOPEN);
-        twl6040_write(codec, TWL6040_REG_NCPCTL, ncpctl);
-        udelay(488);
-        /* disable high-side ldo */
-        ldoctl &= ~TWL6040_HSLDOENA;
-        twl6040_write(codec, TWL6040_REG_LDOCTL, ldoctl);
-        udelay(244);
-        /* disable internal oscillator */
-        ldoctl &= ~TWL6040_OSCENA;
-        twl6040_write(codec, TWL6040_REG_LDOCTL, ldoctl);
-        /* disable reference system */
-        ldoctl &= ~TWL6040_REFENA;
-        twl6040_write(codec, TWL6040_REG_LDOCTL, ldoctl);
-        msleep(10);
-}
-
 /* set headset dac and driver power mode */
 static int headset_power_mode(struct snd_soc_codec *codec, int high_perf)
 {
@@ -713,15 +714,26 @@ static int twl6040_power_mode_event(struct snd_soc_dapm_widget *w,
 {
         struct snd_soc_codec *codec = w->codec;
         struct twl6040_data *priv = snd_soc_codec_get_drvdata(codec);
+        int ret = 0;
 
-        if (SND_SOC_DAPM_EVENT_ON(event))
+        if (SND_SOC_DAPM_EVENT_ON(event)) {
                 priv->non_lp++;
-        else
+                if (!strcmp(w->name, "Earphone Driver")) {
+                        /* Earphone doesn't support low power mode */
+                        priv->hs_power_mode_locked = 1;
+                        ret = headset_power_mode(codec, 1);
+                }
+        } else {
                 priv->non_lp--;
+                if (!strcmp(w->name, "Earphone Driver")) {
+                        priv->hs_power_mode_locked = 0;
+                        ret = headset_power_mode(codec, priv->hs_power_mode);
+                }
+        }
 
         msleep(1);
 
-        return 0;
+        return ret;
 }
 
 static void twl6040_hs_jack_report(struct snd_soc_codec *codec,
@@ -766,33 +778,19 @@ static void twl6040_accessory_work(struct work_struct *work)
 }
 
 /* audio interrupt handler */
-static irqreturn_t twl6040_naudint_handler(int irq, void *data)
+static irqreturn_t twl6040_audio_handler(int irq, void *data)
 {
         struct snd_soc_codec *codec = data;
+        struct twl6040 *twl6040 = codec->control_data;
         struct twl6040_data *priv = snd_soc_codec_get_drvdata(codec);
         u8 intid;
 
-        twl_i2c_read_u8(TWL_MODULE_AUDIO_VOICE, &intid, TWL6040_REG_INTID);
-
-        if (intid & TWL6040_THINT)
-                dev_alert(codec->dev, "die temp over-limit detection\n");
+        intid = twl6040_reg_read(twl6040, TWL6040_REG_INTID);
 
         if ((intid & TWL6040_PLUGINT) || (intid & TWL6040_UNPLUGINT))
                 queue_delayed_work(priv->workqueue, &priv->delayed_work,
                                                         msecs_to_jiffies(200));
 
-        if (intid & TWL6040_HOOKINT)
-                dev_info(codec->dev, "hook detection\n");
-
-        if (intid & TWL6040_HFINT)
-                dev_alert(codec->dev, "hf drivers over current detection\n");
-
-        if (intid & TWL6040_VIBINT)
-                dev_alert(codec->dev, "vib drivers over current detection\n");
-
-        if (intid & TWL6040_READYINT)
-                complete(&priv->ready);
-
         return IRQ_HANDLED;
 }
 
@@ -1040,6 +1038,73 @@ static const struct snd_kcontrol_new hfr_mux_controls =
 static const struct snd_kcontrol_new ep_driver_switch_controls =
         SOC_DAPM_SINGLE("Switch", TWL6040_REG_EARCTL, 0, 1, 0);
 
+/* Headset power mode */
+static const char *twl6040_power_mode_texts[] = {
+        "Low-Power", "High-Perfomance",
+};
+
+static const struct soc_enum twl6040_power_mode_enum =
+        SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(twl6040_power_mode_texts),
+                        twl6040_power_mode_texts);
+
+static int twl6040_headset_power_get_enum(struct snd_kcontrol *kcontrol,
+        struct snd_ctl_elem_value *ucontrol)
+{
+        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct twl6040_data *priv = snd_soc_codec_get_drvdata(codec);
+
+        ucontrol->value.enumerated.item[0] = priv->hs_power_mode;
+
+        return 0;
+}
+
+static int twl6040_headset_power_put_enum(struct snd_kcontrol *kcontrol,
+        struct snd_ctl_elem_value *ucontrol)
+{
+        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct twl6040_data *priv = snd_soc_codec_get_drvdata(codec);
+        int high_perf = ucontrol->value.enumerated.item[0];
+        int ret = 0;
+
+        if (!priv->hs_power_mode_locked)
+                ret = headset_power_mode(codec, high_perf);
+
+        if (!ret)
+                priv->hs_power_mode = high_perf;
+
+        return ret;
+}
+
+static int twl6040_pll_get_enum(struct snd_kcontrol *kcontrol,
+        struct snd_ctl_elem_value *ucontrol)
+{
+        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct twl6040_data *priv = snd_soc_codec_get_drvdata(codec);
+
+        ucontrol->value.enumerated.item[0] = priv->pll_power_mode;
+
+        return 0;
+}
+
+static int twl6040_pll_put_enum(struct snd_kcontrol *kcontrol,
+        struct snd_ctl_elem_value *ucontrol)
+{
+        struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+        struct twl6040_data *priv = snd_soc_codec_get_drvdata(codec);
+
+        priv->pll_power_mode = ucontrol->value.enumerated.item[0];
+
+        return 0;
+}
+
+int twl6040_get_clk_id(struct snd_soc_codec *codec)
+{
+        struct twl6040_data *priv = snd_soc_codec_get_drvdata(codec);
+
+        return priv->pll_power_mode;
+}
+EXPORT_SYMBOL_GPL(twl6040_get_clk_id);
+
 static const struct snd_kcontrol_new twl6040_snd_controls[] = {
         /* Capture gains */
         SOC_DOUBLE_TLV("Capture Preamplifier Volume",
@@ -1058,6 +1123,13 @@ static const struct snd_kcontrol_new twl6040_snd_controls[] = {
                 TWL6040_REG_HFLGAIN, TWL6040_REG_HFRGAIN, 0, 0x1D, 1, hf_tlv),
         SOC_SINGLE_TLV("Earphone Playback Volume",
                 TWL6040_REG_EARCTL, 1, 0xF, 1, ep_tlv),
+
+        SOC_ENUM_EXT("Headset Power Mode", twl6040_power_mode_enum,
+                twl6040_headset_power_get_enum,
+                twl6040_headset_power_put_enum),
+
+        SOC_ENUM_EXT("PLL Selection", twl6040_power_mode_enum,
+                twl6040_pll_get_enum, twl6040_pll_put_enum),
 };
 
 static const struct snd_soc_dapm_widget twl6040_dapm_widgets[] = {
@@ -1231,36 +1303,11 @@ static int twl6040_add_widgets(struct snd_soc_codec *codec)
         return 0;
 }
 
-static int twl6040_power_up_completion(struct snd_soc_codec *codec,
-                                        int naudint)
-{
-        struct twl6040_data *priv = snd_soc_codec_get_drvdata(codec);
-        int time_left;
-        u8 intid;
-
-        time_left = wait_for_completion_timeout(&priv->ready,
-                                msecs_to_jiffies(144));
-
-        if (!time_left) {
-                twl_i2c_read_u8(TWL_MODULE_AUDIO_VOICE, &intid,
-                                                        TWL6040_REG_INTID);
-                if (!(intid & TWL6040_READYINT)) {
-                        dev_err(codec->dev, "timeout waiting for READYINT\n");
-                        return -ETIMEDOUT;
-                }
-        }
-
-        priv->codec_powered = 1;
-
-        return 0;
-}
-
 static int twl6040_set_bias_level(struct snd_soc_codec *codec,
                                 enum snd_soc_bias_level level)
 {
+        struct twl6040 *twl6040 = codec->control_data;
         struct twl6040_data *priv = snd_soc_codec_get_drvdata(codec);
-        int audpwron = priv->audpwron;
-        int naudint = priv->naudint;
         int ret;
 
         switch (level) {
@@ -1272,58 +1319,23 @@ static int twl6040_set_bias_level(struct snd_soc_codec *codec,
                 if (priv->codec_powered)
                         break;
 
-                if (gpio_is_valid(audpwron)) {
-                        /* use AUDPWRON line */
-                        gpio_set_value(audpwron, 1);
+                ret = twl6040_power(twl6040, 1);
+                if (ret)
+                        return ret;
 
-                        /* wait for power-up completion */
-                        ret = twl6040_power_up_completion(codec, naudint);
-                        if (ret)
-                                return ret;
-
-                        /* sync registers updated during power-up sequence */
-                        twl6040_read_reg_volatile(codec, TWL6040_REG_NCPCTL);
-                        twl6040_read_reg_volatile(codec, TWL6040_REG_LDOCTL);
-                        twl6040_read_reg_volatile(codec, TWL6040_REG_LPPLLCTL);
-                } else {
-                        /* use manual power-up sequence */
-                        twl6040_power_up(codec);
-                        priv->codec_powered = 1;
-                }
+                priv->codec_powered = 1;
 
                 /* initialize vdd/vss registers with reg_cache */
                 twl6040_init_vdd_regs(codec);
 
                 /* Set external boost GPO */
                 twl6040_write(codec, TWL6040_REG_GPOCTL, 0x02);
-
-                /* Set initial minimal gain values */
-                twl6040_write(codec, TWL6040_REG_HSGAIN, 0xFF);
-                twl6040_write(codec, TWL6040_REG_EARCTL, 0x1E);
-                twl6040_write(codec, TWL6040_REG_HFLGAIN, 0x1D);
-                twl6040_write(codec, TWL6040_REG_HFRGAIN, 0x1D);
                 break;
         case SND_SOC_BIAS_OFF:
                 if (!priv->codec_powered)
                         break;
 
-                if (gpio_is_valid(audpwron)) {
-                        /* use AUDPWRON line */
-                        gpio_set_value(audpwron, 0);
-
-                        /* power-down sequence latency */
-                        udelay(500);
-
-                        /* sync registers updated during power-down sequence */
-                        twl6040_read_reg_volatile(codec, TWL6040_REG_NCPCTL);
-                        twl6040_read_reg_volatile(codec, TWL6040_REG_LDOCTL);
-                        twl6040_write_reg_cache(codec, TWL6040_REG_LPPLLCTL,
-                                                0x00);
-                } else {
-                        /* use manual power-down sequence */
-                        twl6040_power_down(codec);
-                }
-
+                twl6040_power(twl6040, 0);
                 priv->codec_powered = 0;
                 break;
         }
@@ -1333,27 +1345,6 @@ static int twl6040_set_bias_level(struct snd_soc_codec *codec,
         return 0;
 }
 
-/* set of rates for each pll: low-power and high-performance */
-
-static unsigned int lp_rates[] = {
-        88200,
-        96000,
-};
-
-static struct snd_pcm_hw_constraint_list lp_constraints = {
-        .count  = ARRAY_SIZE(lp_rates),
-        .list   = lp_rates,
-};
-
-static unsigned int hp_rates[] = {
-        96000,
-};
-
-static struct snd_pcm_hw_constraint_list hp_constraints = {
-        .count  = ARRAY_SIZE(hp_rates),
-        .list   = hp_rates,
-};
-
 static int twl6040_startup(struct snd_pcm_substream *substream,
                         struct snd_soc_dai *dai)
 {
@@ -1363,7 +1354,7 @@ static int twl6040_startup(struct snd_pcm_substream *substream,
 
         snd_pcm_hw_constraint_list(substream->runtime, 0,
                                 SNDRV_PCM_HW_PARAM_RATE,
-                                priv->sysclk_constraints);
+                                &sysclk_constraints[priv->pll_power_mode]);
 
         return 0;
 }
@@ -1375,22 +1366,27 @@ static int twl6040_hw_params(struct snd_pcm_substream *substream,
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
         struct snd_soc_codec *codec = rtd->codec;
         struct twl6040_data *priv = snd_soc_codec_get_drvdata(codec);
-        u8 lppllctl;
         int rate;
 
-        /* nothing to do for high-perf pll, it supports only 48 kHz */
-        if (priv->pll == TWL6040_HPPLL_ID)
-                return 0;
-
-        lppllctl = twl6040_read_reg_cache(codec, TWL6040_REG_LPPLLCTL);
-
         rate = params_rate(params);
         switch (rate) {
         case 11250:
         case 22500:
         case 44100:
         case 88200:
-                lppllctl |= TWL6040_LPLLFIN;
+                /* These rates are not supported when HPPLL is in use */
+                if (unlikely(priv->pll == TWL6040_SYSCLK_SEL_HPPLL)) {
+                        dev_err(codec->dev, "HPPLL does not support rate %d\n",
+                                rate);
+                        return -EINVAL;
+                }
+                /* Capture is not supported with 17.64MHz sysclk */
+                if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) {
+                        dev_err(codec->dev,
+                                "capture mode is not supported at %dHz\n",
+                                rate);
+                        return -EINVAL;
+                }
                 priv->sysclk = 17640000;
                 break;
         case 8000:
@@ -1398,7 +1394,6 @@ static int twl6040_hw_params(struct snd_pcm_substream *substream,
         case 32000:
         case 48000:
         case 96000:
-                lppllctl &= ~TWL6040_LPLLFIN;
                 priv->sysclk = 19200000;
                 break;
         default:
@@ -1406,8 +1401,6 @@ static int twl6040_hw_params(struct snd_pcm_substream *substream,
                 return -EINVAL;
         }
 
-        twl6040_write(codec, TWL6040_REG_LPPLLCTL, lppllctl);
-
         return 0;
 }
 
@@ -1416,7 +1409,9 @@ static int twl6040_prepare(struct snd_pcm_substream *substream,
 {
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
         struct snd_soc_codec *codec = rtd->codec;
+        struct twl6040 *twl6040 = codec->control_data;
         struct twl6040_data *priv = snd_soc_codec_get_drvdata(codec);
+        int ret;
 
         if (!priv->sysclk) {
                 dev_err(codec->dev,
@@ -1424,24 +1419,19 @@ static int twl6040_prepare(struct snd_pcm_substream *substream,
                 return -EINVAL;
         }
 
-        /*
-         * capture is not supported at 17.64 MHz,
-         * it's reserved for headset low-power playback scenario
-         */
-        if ((priv->sysclk == 17640000) &&
-                        substream->stream == SNDRV_PCM_STREAM_CAPTURE) {
-                dev_err(codec->dev,
-                        "capture mode is not supported at %dHz\n",
-                        priv->sysclk);
-                return -EINVAL;
-        }
-
         if ((priv->sysclk == 17640000) && priv->non_lp) {
                         dev_err(codec->dev,
                                 "some enabled paths aren't supported at %dHz\n",
                                 priv->sysclk);
                         return -EPERM;
         }
+
+        ret = twl6040_set_pll(twl6040, priv->pll, priv->clk_in, priv->sysclk);
+        if (ret) {
+                dev_err(codec->dev, "Can not set PLL (%d)\n", ret);
+                return -EPERM;
+        }
+
         return 0;
 }
 
@@ -1450,99 +1440,12 @@ static int twl6040_set_dai_sysclk(struct snd_soc_dai *codec_dai,
 {
         struct snd_soc_codec *codec = codec_dai->codec;
         struct twl6040_data *priv = snd_soc_codec_get_drvdata(codec);
-        u8 hppllctl, lppllctl;
-
-        hppllctl = twl6040_read_reg_cache(codec, TWL6040_REG_HPPLLCTL);
-        lppllctl = twl6040_read_reg_cache(codec, TWL6040_REG_LPPLLCTL);
 
         switch (clk_id) {
         case TWL6040_SYSCLK_SEL_LPPLL:
-                switch (freq) {
-                case 32768:
-                        /* headset dac and driver must be in low-power mode */
-                        headset_power_mode(codec, 0);
-
-                        /* clk32k input requires low-power pll */
-                        lppllctl |= TWL6040_LPLLENA;
-                        twl6040_write(codec, TWL6040_REG_LPPLLCTL, lppllctl);
-                        mdelay(5);
-                        lppllctl &= ~TWL6040_HPLLSEL;
-                        twl6040_write(codec, TWL6040_REG_LPPLLCTL, lppllctl);
-                        hppllctl &= ~TWL6040_HPLLENA;
-                        twl6040_write(codec, TWL6040_REG_HPPLLCTL, hppllctl);
-                        break;
-                default:
-                        dev_err(codec->dev, "unknown mclk freq %d\n", freq);
-                        return -EINVAL;
-                }
-
-                /* lppll divider */
-                switch (priv->sysclk) {
-                case 17640000:
-                        lppllctl |= TWL6040_LPLLFIN;
-                        break;
-                case 19200000:
-                        lppllctl &= ~TWL6040_LPLLFIN;
-                        break;
-                default:
-                        /* sysclk not yet configured */
-                        lppllctl &= ~TWL6040_LPLLFIN;
-                        priv->sysclk = 19200000;
-                        break;
-                }
-
-                twl6040_write(codec, TWL6040_REG_LPPLLCTL, lppllctl);
-
-                priv->pll = TWL6040_LPPLL_ID;
-                priv->sysclk_constraints = &lp_constraints;
-                break;
         case TWL6040_SYSCLK_SEL_HPPLL:
-                hppllctl &= ~TWL6040_MCLK_MSK;
-
-                switch (freq) {
-                case 12000000:
-                        /* mclk input, pll enabled */
-                        hppllctl |= TWL6040_MCLK_12000KHZ |
-                                    TWL6040_HPLLSQRBP |
-                                    TWL6040_HPLLENA;
-                        break;
-                case 19200000:
-                        /* mclk input, pll disabled */
-                        hppllctl |= TWL6040_MCLK_19200KHZ |
-                                    TWL6040_HPLLSQRENA |
-                                    TWL6040_HPLLBP;
-                        break;
-                case 26000000:
-                        /* mclk input, pll enabled */
-                        hppllctl |= TWL6040_MCLK_26000KHZ |
-                                    TWL6040_HPLLSQRBP |
-                                    TWL6040_HPLLENA;
-                        break;
-                case 38400000:
-                        /* clk slicer, pll disabled */
-                        hppllctl |= TWL6040_MCLK_38400KHZ |
-                                    TWL6040_HPLLSQRENA |
-                                    TWL6040_HPLLBP;
-                        break;
-                default:
-                        dev_err(codec->dev, "unknown mclk freq %d\n", freq);
-                        return -EINVAL;
-                }
-
-                /* headset dac and driver must be in high-performance mode */
-                headset_power_mode(codec, 1);
-
-                twl6040_write(codec, TWL6040_REG_HPPLLCTL, hppllctl);
-                udelay(500);
-                lppllctl |= TWL6040_HPLLSEL;
-                twl6040_write(codec, TWL6040_REG_LPPLLCTL, lppllctl);
-                lppllctl &= ~TWL6040_LPLLENA;
-                twl6040_write(codec, TWL6040_REG_LPPLLCTL, lppllctl);
-
-                /* high-performance pll can provide only 19.2 MHz */
-                priv->pll = TWL6040_HPPLL_ID;
-                priv->sysclk = 19200000;
-                priv->sysclk_constraints = &hp_constraints;
+                priv->pll = clk_id;
+                priv->clk_in = freq;
                 break;
         default:
                 dev_err(codec->dev, "unknown clk_id %d\n", clk_id);
@@ -1559,15 +1462,27 @@ static struct snd_soc_dai_ops twl6040_dai_ops = {
         .set_sysclk     = twl6040_set_dai_sysclk,
 };
 
-static struct snd_soc_dai_driver twl6040_dai = {
+static struct snd_soc_dai_driver twl6040_dai[] = {
+{
         .name = "twl6040-hifi",
         .playback = {
                 .stream_name = "Playback",
                 .channels_min = 1,
-                .channels_max = 4,
+                .channels_max = 2,
+                .rates = TWL6040_RATES,
+                .formats = TWL6040_FORMATS,
+        },
+        .capture = {
+                .stream_name = "Capture",
+                .channels_min = 1,
+                .channels_max = 2,
                 .rates = TWL6040_RATES,
                 .formats = TWL6040_FORMATS,
         },
+        .ops = &twl6040_dai_ops,
+},
+{
+        .name = "twl6040-ul",
         .capture = {
                 .stream_name = "Capture",
                 .channels_min = 1,
@@ -1576,6 +1491,40 @@ static struct snd_soc_dai_driver twl6040_dai = {
                 .formats = TWL6040_FORMATS,
         },
         .ops = &twl6040_dai_ops,
+},
+{
+        .name = "twl6040-dl1",
+        .playback = {
+                .stream_name = "Headset Playback",
+                .channels_min = 1,
+                .channels_max = 2,
+                .rates = TWL6040_RATES,
+                .formats = TWL6040_FORMATS,
+        },
+        .ops = &twl6040_dai_ops,
+},
+{
+        .name = "twl6040-dl2",
+        .playback = {
+                .stream_name = "Handsfree Playback",
+                .channels_min = 1,
+                .channels_max = 2,
+                .rates = TWL6040_RATES,
+                .formats = TWL6040_FORMATS,
+        },
+        .ops = &twl6040_dai_ops,
+},
+{
+        .name = "twl6040-vib",
+        .playback = {
+                .stream_name = "Vibra Playback",
+                .channels_min = 2,
+                .channels_max = 2,
+                .rates = SNDRV_PCM_RATE_CONTINUOUS,
+                .formats = TWL6040_FORMATS,
+        },
+        .ops = &twl6040_dai_ops,
+},
 };
 
 #ifdef CONFIG_PM
@@ -1600,11 +1549,11 @@ static int twl6040_resume(struct snd_soc_codec *codec)
 
 static int twl6040_probe(struct snd_soc_codec *codec)
 {
-        struct twl4030_codec_data *twl_codec = codec->dev->platform_data;
         struct twl6040_data *priv;
-        int audpwron, naudint;
+        struct twl4030_codec_data *pdata = dev_get_platdata(codec->dev);
+        struct platform_device *pdev = container_of(codec->dev,
+                                                   struct platform_device, dev);
         int ret = 0;
-        u8 icrev, intmr = TWL6040_ALLINT_MSK;
 
         priv = kzalloc(sizeof(struct twl6040_data), GFP_KERNEL);
         if (priv == NULL)
@@ -1612,23 +1561,32 @@ static int twl6040_probe(struct snd_soc_codec *codec)
         snd_soc_codec_set_drvdata(codec, priv);
 
         priv->codec = codec;
+        codec->control_data = dev_get_drvdata(codec->dev->parent);
 
-        twl_i2c_read_u8(TWL_MODULE_AUDIO_VOICE, &icrev, TWL6040_REG_ASICREV);
+        if (pdata && pdata->hs_left_step && pdata->hs_right_step) {
+                priv->hs_left_step = pdata->hs_left_step;
+                priv->hs_right_step = pdata->hs_right_step;
+        } else {
+                priv->hs_left_step = 1;
+                priv->hs_right_step = 1;
+        }
 
-        if (twl_codec && (icrev > 0))
-                audpwron = twl_codec->audpwron_gpio;
-        else
-                audpwron = -EINVAL;
+        if (pdata && pdata->hf_left_step && pdata->hf_right_step) {
+                priv->hf_left_step = pdata->hf_left_step;
+                priv->hf_right_step = pdata->hf_right_step;
+        } else {
+                priv->hf_left_step = 1;
+                priv->hf_right_step = 1;
+        }
 
-        if (twl_codec)
-                naudint = twl_codec->naudint_irq;
-        else
-                naudint = 0;
+        priv->plug_irq = platform_get_irq(pdev, 0);
+        if (priv->plug_irq < 0) {
+                dev_err(codec->dev, "invalid irq\n");
+                ret = -EINVAL;
+                goto work_err;
+        }
 
-        priv->audpwron = audpwron;
-        priv->naudint = naudint;
         priv->workqueue = create_singlethread_workqueue("twl6040-codec");
-
         if (!priv->workqueue) {
                 ret = -ENOMEM;
                 goto work_err;
@@ -1638,56 +1596,33 @@ static int twl6040_probe(struct snd_soc_codec *codec)
 
         mutex_init(&priv->mutex);
 
-        init_completion(&priv->ready);
         init_completion(&priv->headset.ramp_done);
         init_completion(&priv->handsfree.ramp_done);
 
-        if (gpio_is_valid(audpwron)) {
-                ret = gpio_request(audpwron, "audpwron");
-                if (ret)
-                        goto gpio1_err;
-
-                ret = gpio_direction_output(audpwron, 0);
-                if (ret)
-                        goto gpio2_err;
-
-                priv->codec_powered = 0;
-
-                /* enable only codec ready interrupt */
-                intmr &= ~(TWL6040_READYMSK | TWL6040_PLUGMSK);
-
-                /* reset interrupt status to allow correct power up sequence */
-                twl6040_read_reg_volatile(codec, TWL6040_REG_INTID);
-        }
-        twl6040_write(codec, TWL6040_REG_INTMR, intmr);
-
-        if (naudint) {
-                /* audio interrupt */
-                ret = request_threaded_irq(naudint, NULL,
-                                twl6040_naudint_handler,
-                                IRQF_TRIGGER_LOW | IRQF_ONESHOT,
-                                "twl6040_codec", codec);
-                if (ret)
-                        goto gpio2_err;
-        }
-
-        /* init vio registers */
-        twl6040_init_vio_regs(codec);
-
         priv->hf_workqueue = create_singlethread_workqueue("twl6040-hf");
         if (priv->hf_workqueue == NULL) {
                 ret = -ENOMEM;
-                goto irq_err;
+                goto hfwq_err;
         }
         priv->hs_workqueue = create_singlethread_workqueue("twl6040-hs");
         if (priv->hs_workqueue == NULL) {
                 ret = -ENOMEM;
-                goto wq_err;
+                goto hswq_err;
         }
 
         INIT_DELAYED_WORK(&priv->hs_delayed_work, twl6040_pga_hs_work);
         INIT_DELAYED_WORK(&priv->hf_delayed_work, twl6040_pga_hf_work);
 
+        ret = request_threaded_irq(priv->plug_irq, NULL, twl6040_audio_handler,
+                                   0, "twl6040_irq_plug", codec);
+        if (ret) {
+                dev_err(codec->dev, "PLUG IRQ request failed: %d\n", ret);
+                goto plugirq_err;
+        }
+
+        /* init vio registers */
+        twl6040_init_vio_regs(codec);
+
         /* power on device */
         ret = twl6040_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
         if (ret)
@@ -1700,16 +1635,12 @@ static int twl6040_probe(struct snd_soc_codec *codec)
         return 0;
 
 bias_err:
+        free_irq(priv->plug_irq, codec);
+plugirq_err:
         destroy_workqueue(priv->hs_workqueue);
-wq_err:
+hswq_err:
         destroy_workqueue(priv->hf_workqueue);
-irq_err:
-        if (naudint)
-                free_irq(naudint, codec);
-gpio2_err:
-        if (gpio_is_valid(audpwron))
-                gpio_free(audpwron);
-gpio1_err:
+hfwq_err:
         destroy_workqueue(priv->workqueue);
 work_err:
         kfree(priv);
@@ -1719,17 +1650,9 @@ work_err:
 static int twl6040_remove(struct snd_soc_codec *codec)
 {
         struct twl6040_data *priv = snd_soc_codec_get_drvdata(codec);
-        int audpwron = priv->audpwron;
-        int naudint = priv->naudint;
 
         twl6040_set_bias_level(codec, SND_SOC_BIAS_OFF);
-
-        if (gpio_is_valid(audpwron))
-                gpio_free(audpwron);
-
-        if (naudint)
-                free_irq(naudint, codec);
-
+        free_irq(priv->plug_irq, codec);
         destroy_workqueue(priv->workqueue);
         destroy_workqueue(priv->hf_workqueue);
         destroy_workqueue(priv->hs_workqueue);
@@ -1753,8 +1676,8 @@ static struct snd_soc_codec_driver soc_codec_dev_twl6040 = {
 
 static int __devinit twl6040_codec_probe(struct platform_device *pdev)
 {
-        return snd_soc_register_codec(&pdev->dev,
-                        &soc_codec_dev_twl6040, &twl6040_dai, 1);
+        return snd_soc_register_codec(&pdev->dev, &soc_codec_dev_twl6040,
+                                      twl6040_dai, ARRAY_SIZE(twl6040_dai));
 }
 
 static int __devexit twl6040_codec_remove(struct platform_device *pdev)
diff --git a/sound/soc/codecs/twl6040.h b/sound/soc/codecs/twl6040.h
index 23aeed0963e6..d8de67869dd9 100644
--- a/sound/soc/codecs/twl6040.h
+++ b/sound/soc/codecs/twl6040.h
@@ -22,125 +22,8 @@
 #ifndef __TWL6040_H__
 #define __TWL6040_H__
 
-#define TWL6040_REG_ASICID              0x01
-#define TWL6040_REG_ASICREV             0x02
-#define TWL6040_REG_INTID               0x03
-#define TWL6040_REG_INTMR               0x04
-#define TWL6040_REG_NCPCTL              0x05
-#define TWL6040_REG_LDOCTL              0x06
-#define TWL6040_REG_HPPLLCTL            0x07
-#define TWL6040_REG_LPPLLCTL            0x08
-#define TWL6040_REG_LPPLLDIV            0x09
-#define TWL6040_REG_AMICBCTL            0x0A
-#define TWL6040_REG_DMICBCTL            0x0B
-#define TWL6040_REG_MICLCTL             0x0C
-#define TWL6040_REG_MICRCTL             0x0D
-#define TWL6040_REG_MICGAIN             0x0E
-#define TWL6040_REG_LINEGAIN            0x0F
-#define TWL6040_REG_HSLCTL              0x10
-#define TWL6040_REG_HSRCTL              0x11
-#define TWL6040_REG_HSGAIN              0x12
-#define TWL6040_REG_EARCTL              0x13
-#define TWL6040_REG_HFLCTL              0x14
-#define TWL6040_REG_HFLGAIN             0x15
-#define TWL6040_REG_HFRCTL              0x16
-#define TWL6040_REG_HFRGAIN             0x17
-#define TWL6040_REG_VIBCTLL             0x18
-#define TWL6040_REG_VIBDATL             0x19
-#define TWL6040_REG_VIBCTLR             0x1A
-#define TWL6040_REG_VIBDATR             0x1B
-#define TWL6040_REG_HKCTL1              0x1C
-#define TWL6040_REG_HKCTL2              0x1D
-#define TWL6040_REG_GPOCTL              0x1E
-#define TWL6040_REG_ALB                 0x1F
-#define TWL6040_REG_DLB                 0x20
-#define TWL6040_REG_TRIM1               0x28
-#define TWL6040_REG_TRIM2               0x29
-#define TWL6040_REG_TRIM3               0x2A
-#define TWL6040_REG_HSOTRIM             0x2B
-#define TWL6040_REG_HFOTRIM             0x2C
-#define TWL6040_REG_ACCCTL              0x2D
-#define TWL6040_REG_STATUS              0x2E
-
-#define TWL6040_CACHEREGNUM             (TWL6040_REG_STATUS + 1)
-
-#define TWL6040_VIOREGNUM               18
-#define TWL6040_VDDREGNUM               21
-
-/* INTID (0x03) fields */
-
-#define TWL6040_THINT                   0x01
-#define TWL6040_PLUGINT                 0x02
-#define TWL6040_UNPLUGINT               0x04
-#define TWL6040_HOOKINT                 0x08
-#define TWL6040_HFINT                   0x10
-#define TWL6040_VIBINT                  0x20
-#define TWL6040_READYINT                0x40
-
-/* INTMR (0x04) fields */
-
-#define TWL6040_PLUGMSK                 0x02
-#define TWL6040_READYMSK                0x40
-#define TWL6040_ALLINT_MSK              0x7B
-
-/* NCPCTL (0x05) fields */
-
-#define TWL6040_NCPENA                  0x01
-#define TWL6040_NCPOPEN                 0x40
-
-/* LDOCTL (0x06) fields */
-
-#define TWL6040_LSLDOENA                0x01
-#define TWL6040_HSLDOENA                0x04
-#define TWL6040_REFENA                  0x40
-#define TWL6040_OSCENA                  0x80
-
-/* HPPLLCTL (0x07) fields */
-
-#define TWL6040_HPLLENA                 0x01
-#define TWL6040_HPLLRST                 0x02
-#define TWL6040_HPLLBP                  0x04
-#define TWL6040_HPLLSQRENA              0x08
-#define TWL6040_HPLLSQRBP               0x10
-#define TWL6040_MCLK_12000KHZ           (0 << 5)
-#define TWL6040_MCLK_19200KHZ           (1 << 5)
-#define TWL6040_MCLK_26000KHZ           (2 << 5)
-#define TWL6040_MCLK_38400KHZ           (3 << 5)
-#define TWL6040_MCLK_MSK                0x60
-
-/* LPPLLCTL (0x08) fields */
-
-#define TWL6040_LPLLENA                 0x01
-#define TWL6040_LPLLRST                 0x02
-#define TWL6040_LPLLSEL                 0x04
-#define TWL6040_LPLLFIN                 0x08
-#define TWL6040_HPLLSEL                 0x10
-
-/* HSLCTL (0x10) fields */
-
-#define TWL6040_HSDACMODEL              0x02
-#define TWL6040_HSDRVMODEL              0x08
-
-/* HSRCTL (0x11) fields */
-
-#define TWL6040_HSDACMODER              0x02
-#define TWL6040_HSDRVMODER              0x08
-
-/* ACCCTL (0x2D) fields */
-
-#define TWL6040_RESETSPLIT              0x04
-
-#define TWL6040_SYSCLK_SEL_LPPLL        1
-#define TWL6040_SYSCLK_SEL_HPPLL        2
-
-#define TWL6040_HPPLL_ID                1
-#define TWL6040_LPPLL_ID                2
-
-/* STATUS (0x2E) fields */
-
-#define TWL6040_PLUGCOMP                0x02
-
 void twl6040_hs_jack_detect(struct snd_soc_codec *codec,
                             struct snd_soc_jack *jack, int report);
+int twl6040_get_clk_id(struct snd_soc_codec *codec);
 
 #endif /* End of __TWL6040_H__ */
diff --git a/sound/soc/ep93xx/ep93xx-ac97.c b/sound/soc/ep93xx/ep93xx-ac97.c
index 104e95cda0ad..c7417c76552b 100644
--- a/sound/soc/ep93xx/ep93xx-ac97.c
+++ b/sound/soc/ep93xx/ep93xx-ac97.c
@@ -106,12 +106,12 @@ 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,
+        .dma_port       = EP93XX_DMA_AAC1,
 };
 
 static struct ep93xx_pcm_dma_params ep93xx_ac97_pcm_in = {
         .name           = "ac97-pcm-in",
-        .dma_port       = EP93XX_DMA_M2P_PORT_AAC1,
+        .dma_port       = EP93XX_DMA_AAC1,
 };
 
 static inline unsigned ep93xx_ac97_read_reg(struct ep93xx_ac97_info *info,
diff --git a/sound/soc/ep93xx/ep93xx-i2s.c b/sound/soc/ep93xx/ep93xx-i2s.c
index 042f4e93746f..56efa0c1c9a9 100644
--- a/sound/soc/ep93xx/ep93xx-i2s.c
+++ b/sound/soc/ep93xx/ep93xx-i2s.c
@@ -2,7 +2,7 @@
  * linux/sound/soc/ep93xx-i2s.c
  * EP93xx I2S driver
  *
- * Copyright (C) 2010 Ryan Mallon <ryan@bluewatersys.com>
+ * Copyright (C) 2010 Ryan Mallon
  *
  * Based on the original driver by:
  *   Copyright (C) 2007 Chase Douglas <chasedouglas@gmail>
@@ -70,11 +70,11 @@ struct ep93xx_i2s_info {
 struct ep93xx_pcm_dma_params ep93xx_i2s_dma_params[] = {
         [SNDRV_PCM_STREAM_PLAYBACK] = {
                 .name           = "i2s-pcm-out",
-                .dma_port       = EP93XX_DMA_M2P_PORT_I2S1,
+                .dma_port       = EP93XX_DMA_I2S1,
         },
         [SNDRV_PCM_STREAM_CAPTURE] = {
                 .name           = "i2s-pcm-in",
-                .dma_port       = EP93XX_DMA_M2P_PORT_I2S1,
+                .dma_port       = EP93XX_DMA_I2S1,
         },
 };
 
@@ -477,6 +477,6 @@ module_init(ep93xx_i2s_init);
 module_exit(ep93xx_i2s_exit);
 
 MODULE_ALIAS("platform:ep93xx-i2s");
-MODULE_AUTHOR("Ryan Mallon <ryan@bluewatersys.com>");
+MODULE_AUTHOR("Ryan Mallon");
 MODULE_DESCRIPTION("EP93XX I2S driver");
 MODULE_LICENSE("GPL");
diff --git a/sound/soc/ep93xx/ep93xx-pcm.c b/sound/soc/ep93xx/ep93xx-pcm.c
index e27c417da437..8dfd3ad84b19 100644
--- a/sound/soc/ep93xx/ep93xx-pcm.c
+++ b/sound/soc/ep93xx/ep93xx-pcm.c
@@ -5,7 +5,7 @@
  * Copyright (C) 2006 Applied Data Systems
  *
  * Rewritten for the SoC audio subsystem (Based on PXA2xx code):
- *   Copyright (c) 2008 Ryan Mallon <ryan@bluewatersys.com>
+ *   Copyright (c) 2008 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
@@ -16,6 +16,7 @@
 #include <linux/init.h>
 #include <linux/device.h>
 #include <linux/slab.h>
+#include <linux/dmaengine.h>
 #include <linux/dma-mapping.h>
 
 #include <sound/core.h>
@@ -53,43 +54,34 @@ static const struct snd_pcm_hardware ep93xx_pcm_hardware = {
 
 struct ep93xx_runtime_data
 {
-        struct ep93xx_dma_m2p_client    cl;
-        struct ep93xx_pcm_dma_params    *params;
         int                             pointer_bytes;
-        struct tasklet_struct           period_tasklet;
         int                             periods;
-        struct ep93xx_dma_buffer        buf[32];
+        int                             period_bytes;
+        struct dma_chan                 *dma_chan;
+        struct ep93xx_dma_data          dma_data;
 };
 
-static void ep93xx_pcm_period_elapsed(unsigned long data)
+static void ep93xx_pcm_dma_callback(void *data)
 {
-        struct snd_pcm_substream *substream = (struct snd_pcm_substream *)data;
-        snd_pcm_period_elapsed(substream);
-}
+        struct snd_pcm_substream *substream = data;
+        struct ep93xx_runtime_data *rtd = substream->runtime->private_data;
 
-static void ep93xx_pcm_buffer_started(void *cookie,
-                                      struct ep93xx_dma_buffer *buf)
-{
+        rtd->pointer_bytes += rtd->period_bytes;
+        rtd->pointer_bytes %= rtd->period_bytes * rtd->periods;
+
+        snd_pcm_period_elapsed(substream);
 }
 
-static void ep93xx_pcm_buffer_finished(void *cookie, 
-                                       struct ep93xx_dma_buffer *buf, 
-                                       int bytes, int error)
+static bool ep93xx_pcm_dma_filter(struct dma_chan *chan, void *filter_param)
 {
-        struct snd_pcm_substream *substream = cookie;
-        struct ep93xx_runtime_data *rtd = substream->runtime->private_data;
-
-        if (buf == rtd->buf + rtd->periods - 1)
-                rtd->pointer_bytes = 0;
-        else
-                rtd->pointer_bytes += buf->size;
+        struct ep93xx_dma_data *data = filter_param;
 
-        if (!error) {
-                ep93xx_dma_m2p_submit_recursive(&rtd->cl, buf);
-                tasklet_schedule(&rtd->period_tasklet);
-        } else {
-                snd_pcm_stop(substream, SNDRV_PCM_STATE_XRUN);
+        if (data->direction == ep93xx_dma_chan_direction(chan)) {
+                chan->private = data;
+                return true;
         }
+
+        return false;
 }
 
 static int ep93xx_pcm_open(struct snd_pcm_substream *substream)
@@ -98,30 +90,38 @@ static int ep93xx_pcm_open(struct snd_pcm_substream *substream)
         struct snd_soc_dai *cpu_dai = soc_rtd->cpu_dai;
         struct ep93xx_pcm_dma_params *dma_params;
         struct ep93xx_runtime_data *rtd;    
+        dma_cap_mask_t mask;
         int ret;
 
-        dma_params = snd_soc_dai_get_dma_data(cpu_dai, substream);
+        ret = snd_pcm_hw_constraint_integer(substream->runtime,
+                                            SNDRV_PCM_HW_PARAM_PERIODS);
+        if (ret < 0)
+                return ret;
+
         snd_soc_set_runtime_hwparams(substream, &ep93xx_pcm_hardware);
 
         rtd = kmalloc(sizeof(*rtd), GFP_KERNEL);
         if (!rtd) 
                 return -ENOMEM;
 
-        memset(&rtd->period_tasklet, 0, sizeof(rtd->period_tasklet));
-        rtd->period_tasklet.func = ep93xx_pcm_period_elapsed;
-        rtd->period_tasklet.data = (unsigned long)substream;
-
-        rtd->cl.name = dma_params->name;
-        rtd->cl.flags = dma_params->dma_port | EP93XX_DMA_M2P_IGNORE_ERROR |
-                ((substream->stream == SNDRV_PCM_STREAM_PLAYBACK) ?
-                 EP93XX_DMA_M2P_TX : EP93XX_DMA_M2P_RX);
-        rtd->cl.cookie = substream;
-        rtd->cl.buffer_started = ep93xx_pcm_buffer_started;
-        rtd->cl.buffer_finished = ep93xx_pcm_buffer_finished;
-        ret = ep93xx_dma_m2p_client_register(&rtd->cl);
-        if (ret < 0) {
+        dma_cap_zero(mask);
+        dma_cap_set(DMA_SLAVE, mask);
+        dma_cap_set(DMA_CYCLIC, mask);
+
+        dma_params = snd_soc_dai_get_dma_data(cpu_dai, substream);
+        rtd->dma_data.port = dma_params->dma_port;
+        rtd->dma_data.name = dma_params->name;
+
+        if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
+                rtd->dma_data.direction = DMA_TO_DEVICE;
+        else
+                rtd->dma_data.direction = DMA_FROM_DEVICE;
+
+        rtd->dma_chan = dma_request_channel(mask, ep93xx_pcm_dma_filter,
+                                            &rtd->dma_data);
+        if (!rtd->dma_chan) {
                 kfree(rtd);
-                return ret;
+                return -EINVAL;
         }
         
         substream->runtime->private_data = rtd;
@@ -132,31 +132,52 @@ static int ep93xx_pcm_close(struct snd_pcm_substream *substream)
 {
         struct ep93xx_runtime_data *rtd = substream->runtime->private_data;
 
-        ep93xx_dma_m2p_client_unregister(&rtd->cl);
+        dma_release_channel(rtd->dma_chan);
         kfree(rtd);
         return 0;
 }
 
+static int ep93xx_pcm_dma_submit(struct snd_pcm_substream *substream)
+{
+        struct snd_pcm_runtime *runtime = substream->runtime;
+        struct ep93xx_runtime_data *rtd = runtime->private_data;
+        struct dma_chan *chan = rtd->dma_chan;
+        struct dma_device *dma_dev = chan->device;
+        struct dma_async_tx_descriptor *desc;
+
+        rtd->pointer_bytes = 0;
+        desc = dma_dev->device_prep_dma_cyclic(chan, runtime->dma_addr,
+                                               rtd->period_bytes * rtd->periods,
+                                               rtd->period_bytes,
+                                               rtd->dma_data.direction);
+        if (!desc)
+                return -EINVAL;
+
+        desc->callback = ep93xx_pcm_dma_callback;
+        desc->callback_param = substream;
+
+        dmaengine_submit(desc);
+        return 0;
+}
+
+static void ep93xx_pcm_dma_flush(struct snd_pcm_substream *substream)
+{
+        struct snd_pcm_runtime *runtime = substream->runtime;
+        struct ep93xx_runtime_data *rtd = runtime->private_data;
+
+        dmaengine_terminate_all(rtd->dma_chan);
+}
+
 static int ep93xx_pcm_hw_params(struct snd_pcm_substream *substream,
                                 struct snd_pcm_hw_params *params)
 {
         struct snd_pcm_runtime *runtime = substream->runtime;
         struct ep93xx_runtime_data *rtd = runtime->private_data;
-        size_t totsize = params_buffer_bytes(params);
-        size_t period = params_period_bytes(params);
-        int i;
 
         snd_pcm_set_runtime_buffer(substream, &substream->dma_buffer);
-        runtime->dma_bytes = totsize;
-
-        rtd->periods = (totsize + period - 1) / period;
-        for (i = 0; i < rtd->periods; i++) {
-                rtd->buf[i].bus_addr = runtime->dma_addr + (i * period);
-                rtd->buf[i].size = period;
-                if ((i + 1) * period > totsize)
-                        rtd->buf[i].size = totsize - (i * period);
-        }
 
+        rtd->periods = params_periods(params);
+        rtd->period_bytes = params_period_bytes(params);
         return 0;
 }
 
@@ -168,24 +189,20 @@ static int ep93xx_pcm_hw_free(struct snd_pcm_substream *substream)
 
 static int ep93xx_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
 {
-        struct ep93xx_runtime_data *rtd = substream->runtime->private_data;
         int ret;
-        int i;
 
         ret = 0;
         switch (cmd) {
         case SNDRV_PCM_TRIGGER_START:
         case SNDRV_PCM_TRIGGER_RESUME:
         case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
-                rtd->pointer_bytes = 0;
-                for (i = 0; i < rtd->periods; i++)
-                        ep93xx_dma_m2p_submit(&rtd->cl, rtd->buf + i);
+                ret = ep93xx_pcm_dma_submit(substream);
                 break;
 
         case SNDRV_PCM_TRIGGER_STOP:
         case SNDRV_PCM_TRIGGER_SUSPEND:
         case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
-                ep93xx_dma_m2p_flush(&rtd->cl);
+                ep93xx_pcm_dma_flush(substream);
                 break;
 
         default:
@@ -335,6 +352,6 @@ static void __exit ep93xx_soc_platform_exit(void)
 module_init(ep93xx_soc_platform_init);
 module_exit(ep93xx_soc_platform_exit);
 
-MODULE_AUTHOR("Ryan Mallon <ryan@bluewatersys.com>");
+MODULE_AUTHOR("Ryan Mallon");
 MODULE_DESCRIPTION("EP93xx ALSA PCM interface");
 MODULE_LICENSE("GPL");
diff --git a/sound/soc/ep93xx/snappercl15.c b/sound/soc/ep93xx/snappercl15.c
index dfe1d7f74ea6..c8aa8a5003ca 100644
--- a/sound/soc/ep93xx/snappercl15.c
+++ b/sound/soc/ep93xx/snappercl15.c
@@ -2,7 +2,7 @@
  * snappercl15.c -- SoC audio for Bluewater Systems Snapper CL15 module
  *
  * Copyright (C) 2008 Bluewater Systems Ltd
- * Author: Ryan Mallon <ryan@bluewatersys.com>
+ * Author: Ryan Mallon
  *
  *  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
@@ -140,7 +140,7 @@ static void __exit snappercl15_exit(void)
 module_init(snappercl15_init);
 module_exit(snappercl15_exit);
 
-MODULE_AUTHOR("Ryan Mallon <ryan@bluewatersys.com>");
+MODULE_AUTHOR("Ryan Mallon");
 MODULE_DESCRIPTION("ALSA SoC Snapper CL15");
 MODULE_LICENSE("GPL");
 
diff --git a/sound/soc/fsl/mpc5200_dma.c b/sound/soc/fsl/mpc5200_dma.c
index 19ad0c1be67e..fd0dc46afc34 100644
--- a/sound/soc/fsl/mpc5200_dma.c
+++ b/sound/soc/fsl/mpc5200_dma.c
@@ -385,7 +385,7 @@ static int mpc5200_hpcd_probe(struct of_device *op)
                 dev_err(&op->dev, "Missing reg property\n");
                 return -ENODEV;
         }
-        regs = ioremap(res.start, 1 + res.end - res.start);
+        regs = ioremap(res.start, resource_size(&res));
         if (!regs) {
                 dev_err(&op->dev, "Could not map registers\n");
                 return -ENODEV;
diff --git a/sound/soc/imx/imx-pcm-dma-mx2.c b/sound/soc/imx/imx-pcm-dma-mx2.c
index 4173b3d87f97..43fdc24f7e8d 100644
--- a/sound/soc/imx/imx-pcm-dma-mx2.c
+++ b/sound/soc/imx/imx-pcm-dma-mx2.c
@@ -110,12 +110,12 @@ static int imx_ssi_dma_alloc(struct snd_pcm_substream *substream,
                 slave_config.direction = DMA_TO_DEVICE;
                 slave_config.dst_addr = dma_params->dma_addr;
                 slave_config.dst_addr_width = buswidth;
-                slave_config.dst_maxburst = dma_params->burstsize * buswidth;
+                slave_config.dst_maxburst = dma_params->burstsize;
         } else {
                 slave_config.direction = DMA_FROM_DEVICE;
                 slave_config.src_addr = dma_params->dma_addr;
                 slave_config.src_addr_width = buswidth;
-                slave_config.src_maxburst = dma_params->burstsize * buswidth;
+                slave_config.src_maxburst = dma_params->burstsize;
         }
 
         ret = dmaengine_slave_config(iprtd->dma_chan, &slave_config);
diff --git a/sound/soc/omap/ams-delta.c b/sound/soc/omap/ams-delta.c
index b40095a19883..30fe0d0efe1c 100644
--- a/sound/soc/omap/ams-delta.c
+++ b/sound/soc/omap/ams-delta.c
@@ -330,7 +330,7 @@ static int cx81801_hangup(struct tty_struct *tty)
         return 0;
 }
 
-/* Line discipline .recieve_buf() */
+/* Line discipline .receive_buf() */
 static void cx81801_receive(struct tty_struct *tty,
                                 const unsigned char *cp, char *fp, int count)
 {
diff --git a/sound/soc/omap/sdp3430.c b/sound/soc/omap/sdp3430.c
index 3f72d17d1ef0..9f6a758029d1 100644
--- a/sound/soc/omap/sdp3430.c
+++ b/sound/soc/omap/sdp3430.c
@@ -36,7 +36,7 @@
 #include <plat/mcbsp.h>
 
 /* Register descriptions for twl4030 codec part */
-#include <linux/mfd/twl4030-codec.h>
+#include <linux/mfd/twl4030-audio.h>
 
 #include "omap-mcbsp.h"
 #include "omap-pcm.h"
diff --git a/sound/soc/omap/sdp4430.c b/sound/soc/omap/sdp4430.c
index 189e03900637..b80efb02bfca 100644
--- a/sound/soc/omap/sdp4430.c
+++ b/sound/soc/omap/sdp4430.c
@@ -21,6 +21,8 @@
 
 #include <linux/clk.h>
 #include <linux/platform_device.h>
+#include <linux/mfd/twl6040.h>
+
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/soc.h>
@@ -34,8 +36,6 @@
 #include "omap-pcm.h"
 #include "../codecs/twl6040.h"
 
-static int twl6040_power_mode;
-
 static int sdp4430_hw_params(struct snd_pcm_substream *substream,
         struct snd_pcm_hw_params *params)
 {
@@ -44,13 +44,13 @@ static int sdp4430_hw_params(struct snd_pcm_substream *substream,
         int clk_id, freq;
         int ret;
 
-        if (twl6040_power_mode) {
-                clk_id = TWL6040_SYSCLK_SEL_HPPLL;
+        clk_id = twl6040_get_clk_id(rtd->codec);
+        if (clk_id == TWL6040_SYSCLK_SEL_HPPLL)
                 freq = 38400000;
-        } else {
-                clk_id = TWL6040_SYSCLK_SEL_LPPLL;
+        else if (clk_id == TWL6040_SYSCLK_SEL_LPPLL)
                 freq = 32768;
-        }
+        else
+                return -EINVAL;
 
         /* set the codec mclk */
         ret = snd_soc_dai_set_sysclk(codec_dai, clk_id, freq,
@@ -81,35 +81,6 @@ static struct snd_soc_jack_pin hs_jack_pins[] = {
         },
 };
 
-static int sdp4430_get_power_mode(struct snd_kcontrol *kcontrol,
-        struct snd_ctl_elem_value *ucontrol)
-{
-        ucontrol->value.integer.value[0] = twl6040_power_mode;
-        return 0;
-}
-
-static int sdp4430_set_power_mode(struct snd_kcontrol *kcontrol,
-        struct snd_ctl_elem_value *ucontrol)
-{
-        if (twl6040_power_mode == ucontrol->value.integer.value[0])
-                return 0;
-
-        twl6040_power_mode = ucontrol->value.integer.value[0];
-
-        return 1;
-}
-
-static const char *power_texts[] = {"Low-Power", "High-Performance"};
-
-static const struct soc_enum sdp4430_enum[] = {
-        SOC_ENUM_SINGLE_EXT(2, power_texts),
-};
-
-static const struct snd_kcontrol_new sdp4430_controls[] = {
-        SOC_ENUM_EXT("TWL6040 Power Mode", sdp4430_enum[0],
-                sdp4430_get_power_mode, sdp4430_set_power_mode),
-};
-
 /* SDP4430 machine DAPM */
 static const struct snd_soc_dapm_widget sdp4430_twl6040_dapm_widgets[] = {
         SND_SOC_DAPM_MIC("Ext Mic", NULL),
@@ -152,12 +123,6 @@ static int sdp4430_twl6040_init(struct snd_soc_pcm_runtime *rtd)
         struct snd_soc_dapm_context *dapm = &codec->dapm;
         int ret;
 
-        /* Add SDP4430 specific controls */
-        ret = snd_soc_add_controls(codec, sdp4430_controls,
-                                ARRAY_SIZE(sdp4430_controls));
-        if (ret)
-                return ret;
-
         /* Add SDP4430 specific widgets */
         ret = snd_soc_dapm_new_controls(dapm, sdp4430_twl6040_dapm_widgets,
                                 ARRAY_SIZE(sdp4430_twl6040_dapm_widgets));
@@ -237,9 +202,6 @@ static int __init sdp4430_soc_init(void)
         if (ret)
                 goto err;
 
-        /* Codec starts in HP mode */
-        twl6040_power_mode = 1;
-
         return 0;
 
 err:
diff --git a/sound/soc/omap/zoom2.c b/sound/soc/omap/zoom2.c
index 01709940a43c..9a2666ffc16c 100644
--- a/sound/soc/omap/zoom2.c
+++ b/sound/soc/omap/zoom2.c
@@ -32,7 +32,7 @@
 #include <plat/mcbsp.h>
 
 /* Register descriptions for twl4030 codec part */
-#include <linux/mfd/twl4030-codec.h>
+#include <linux/mfd/twl4030-audio.h>
 
 #include "omap-mcbsp.h"
 #include "omap-pcm.h"
diff --git a/sound/sparc/dbri.c b/sound/sparc/dbri.c
index 73f9cbacc077..1b839a0f3653 100644
--- a/sound/sparc/dbri.c
+++ b/sound/sparc/dbri.c
@@ -69,7 +69,7 @@
 
 #include <linux/of.h>
 #include <linux/of_device.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 
 MODULE_AUTHOR("Rudolf Koenig, Brent Baccala and Martin Habets");
 MODULE_DESCRIPTION("Sun DBRI");