diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 16c47ed..398cbb0 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -35,6 +35,7 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_TPA6130A2 if I2C
        select SND_SOC_TLV320DAC33 if I2C
        select SND_SOC_TWL4030 if TWL4030_CORE
+       select SND_SOC_TWL6040 if TWL4030_CORE
        select SND_SOC_UDA134X
        select SND_SOC_UDA1380 if I2C
        select SND_SOC_WM2000 if I2C
@@ -168,6 +169,9 @@ config SND_SOC_TWL4030
        select TWL4030_CODEC
        tristate

+config SND_SOC_TWL6040
+       tristate
+
 config SND_SOC_UDA134X
        tristate

diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile
index 6981777..98bd10c 100644
--- a/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@ -22,6 +22,7 @@ snd-soc-tlv320aic26-objs := tlv320aic26.o
 snd-soc-tlv320aic3x-objs := tlv320aic3x.o
 snd-soc-tlv320dac33-objs := tlv320dac33.o
 snd-soc-twl4030-objs := twl4030.o
+snd-soc-twl6040-objs := twl6040.o
 snd-soc-uda134x-objs := uda134x.o
 snd-soc-uda1380-objs := uda1380.o
 snd-soc-wm8350-objs := wm8350.o
@@ -85,6 +86,7 @@ obj-$(CONFIG_SND_SOC_TLV320AIC26)     += snd-soc-tlv320aic26.o
 obj-$(CONFIG_SND_SOC_TLV320AIC3X)      += snd-soc-tlv320aic3x.o
 obj-$(CONFIG_SND_SOC_TLV320DAC33)      += snd-soc-tlv320dac33.o
 obj-$(CONFIG_SND_SOC_TWL4030)  += snd-soc-twl4030.o
+obj-$(CONFIG_SND_SOC_TWL6040)  += snd-soc-twl6040.o
 obj-$(CONFIG_SND_SOC_UDA134X)  += snd-soc-uda134x.o
 obj-$(CONFIG_SND_SOC_UDA1380)  += snd-soc-uda1380.o
 obj-$(CONFIG_SND_SOC_WM8350)   += snd-soc-wm8350.o
diff --git a/sound/soc/codecs/twl6040.c b/sound/soc/codecs/twl6040.c
new file mode 100644
index 0000000..b90bc60
--- /dev/null
+++ b/sound/soc/codecs/twl6040.c
@@ -0,0 +1,1227 @@
+/*
+ * ALSA SoC TWL6040 codec driver
+ *
+ * Author:      Misael Lopez Cruz <x0052729@ti.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#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/i2c/twl.h>
+
+#include <sound/core.h>
+#include <sound/pcm.h>
+#include <sound/pcm_params.h>
+#include <sound/soc.h>
+#include <sound/soc-dapm.h>
+#include <sound/initval.h>
+#include <sound/tlv.h>
+
+#include "twl6040.h"
+
+#define TWL6040_RATES   (SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000)
+#define TWL6040_FORMATS         (SNDRV_PCM_FMTBIT_S32_LE)
+
+/* codec private data */
+struct twl6040_data {
+       struct snd_soc_codec codec;
+       int audpwron;
+       int naudint;
+       int codec_powered;
+       int pll;
+       int non_lp;
+       unsigned int sysclk;
+       struct snd_pcm_hw_constraint_list *sysclk_constraints;
+       struct completion ready;
+};
+
+/*
+ * twl6040 register cache & default register settings
+ */
+static const u8 twl6040_reg[TWL6040_CACHEREGNUM] = {
+       0x00, /* not used               0x00    */
+       0x4B, /* TWL6040_ASICID (ro)    0x01    */
+       0x00, /* TWL6040_ASICREV (ro)   0x02    */
+       0x00, /* TWL6040_INTID          0x03    */
+       0x00, /* TWL6040_INTMR          0x04    */
+       0x00, /* TWL6040_NCPCTRL        0x05    */
+       0x00, /* TWL6040_LDOCTL         0x06    */
+       0x60, /* TWL6040_HPPLLCTL       0x07    */
+       0x00, /* TWL6040_LPPLLCTL       0x08    */
+       0x4A, /* TWL6040_LPPLLDIV       0x09    */
+       0x00, /* TWL6040_AMICBCTL       0x0A    */
+       0x00, /* TWL6040_DMICBCTL       0x0B    */
+       0x18, /* TWL6040_MICLCTL        0x0C    - No input selected on Left Mic */
+       0x18, /* TWL6040_MICRCTL        0x0D    - No input selected on Right Mic */
+       0x00, /* TWL6040_MICGAIN        0x0E    */
+       0x1B, /* TWL6040_LINEGAIN       0x0F    */
+       0x00, /* TWL6040_HSLCTL         0x10    */
+       0x00, /* TWL6040_HSRCTL         0x11    */
+       0x00, /* TWL6040_HSGAIN         0x12    */
+       0x00, /* TWL6040_EARCTL         0x13    */
+       0x00, /* TWL6040_HFLCTL         0x14    */
+       0x00, /* TWL6040_HFLGAIN        0x15    */
+       0x00, /* TWL6040_HFRCTL         0x16    */
+       0x00, /* TWL6040_HFRGAIN        0x17    */
+       0x00, /* TWL6040_VIBCTLL        0x18    */
+       0x00, /* TWL6040_VIBDATL        0x19    */
+       0x00, /* TWL6040_VIBCTLR        0x1A    */
+       0x00, /* TWL6040_VIBDATR        0x1B    */
+       0x00, /* TWL6040_HKCTL1         0x1C    */
+       0x00, /* TWL6040_HKCTL2         0x1D    */
+       0x00, /* TWL6040_GPOCTL         0x1E    */
+       0x00, /* TWL6040_ALB            0x1F    */
+       0x00, /* TWL6040_DLB            0x20    */
+       0x00, /* not used               0x21    */
+       0x00, /* not used               0x22    */
+       0x00, /* not used               0x23    */
+       0x00, /* not used               0x24    */
+       0x00, /* not used               0x25    */
+       0x00, /* not used               0x26    */
+       0x00, /* not used               0x27    */
+       0x00, /* TWL6040_TRIM1          0x28    */
+       0x00, /* TWL6040_TRIM2          0x29    */
+       0x00, /* TWL6040_TRIM3          0x2A    */
+       0x00, /* TWL6040_HSOTRIM        0x2B    */
+       0x00, /* TWL6040_HFOTRIM        0x2C    */
+       0x09, /* TWL6040_ACCCTL         0x2D    */
+       0x00, /* TWL6040_STATUS (ro)    0x2E    */
+};
+
+/*
+ * twl6040 vio/gnd registers:
+ * registers under vio/gnd supply can be accessed
+ * before the power-up sequence, after NRESPWRON goes high
+ */
+static const int twl6040_vio_reg[TWL6040_VIOREGNUM] = {
+       TWL6040_REG_ASICID,
+       TWL6040_REG_ASICREV,
+       TWL6040_REG_INTID,
+       TWL6040_REG_INTMR,
+       TWL6040_REG_NCPCTL,
+       TWL6040_REG_LDOCTL,
+       TWL6040_REG_AMICBCTL,
+       TWL6040_REG_DMICBCTL,
+       TWL6040_REG_HKCTL1,
+       TWL6040_REG_HKCTL2,
+       TWL6040_REG_GPOCTL,
+       TWL6040_REG_TRIM1,
+       TWL6040_REG_TRIM2,
+       TWL6040_REG_TRIM3,
+       TWL6040_REG_HSOTRIM,
+       TWL6040_REG_HFOTRIM,
+       TWL6040_REG_ACCCTL,
+       TWL6040_REG_STATUS,
+};
+
+/*
+ * twl6040 vdd/vss registers:
+ * registers under vdd/vss supplies can only be accessed
+ * after the power-up sequence
+ */
+static const int twl6040_vdd_reg[TWL6040_VDDREGNUM] = {
+       TWL6040_REG_HPPLLCTL,
+       TWL6040_REG_LPPLLCTL,
+       TWL6040_REG_LPPLLDIV,
+       TWL6040_REG_MICLCTL,
+       TWL6040_REG_MICRCTL,
+       TWL6040_REG_MICGAIN,
+       TWL6040_REG_LINEGAIN,
+       TWL6040_REG_HSLCTL,
+       TWL6040_REG_HSRCTL,
+       TWL6040_REG_HSGAIN,
+       TWL6040_REG_EARCTL,
+       TWL6040_REG_HFLCTL,
+       TWL6040_REG_HFLGAIN,
+       TWL6040_REG_HFRCTL,
+       TWL6040_REG_HFRGAIN,
+       TWL6040_REG_VIBCTLL,
+       TWL6040_REG_VIBDATL,
+       TWL6040_REG_VIBCTLR,
+       TWL6040_REG_VIBDATR,
+       TWL6040_REG_ALB,
+       TWL6040_REG_DLB,
+};
+
+/*
+ * read twl6040 register cache
+ */
+static inline unsigned int twl6040_read_reg_cache(struct snd_soc_codec *codec,
+                                               unsigned int reg)
+{
+       u8 *cache = codec->reg_cache;
+
+       if (reg >= TWL6040_CACHEREGNUM)
+               return -EIO;
+
+       return cache[reg];
+}
+
+/*
+ * write twl6040 register cache
+ */
+static inline void twl6040_write_reg_cache(struct snd_soc_codec *codec,
+                                               u8 reg, u8 value)
+{
+       u8 *cache = codec->reg_cache;
+
+       if (reg >= TWL6040_CACHEREGNUM)
+               return;
+       cache[reg] = value;
+}
+
+/*
+ * read from twl6040 hardware register
+ */
+static int twl6040_read_reg_volatile(struct snd_soc_codec *codec,
+                       unsigned int reg)
+{
+       u8 value;
+
+       if (reg >= TWL6040_CACHEREGNUM)
+               return -EIO;
+
+       twl_i2c_read_u8(TWL4030_MODULE_AUDIO_VOICE, &value, reg);
+       twl6040_write_reg_cache(codec, reg, value);
+
+       return value;
+}
+
+/*
+ * write to the twl6040 register space
+ */
+static int twl6040_write(struct snd_soc_codec *codec,
+                       unsigned int reg, unsigned int value)
+{
+       if (reg >= TWL6040_CACHEREGNUM)
+               return -EIO;
+
+       twl6040_write_reg_cache(codec, reg, value);
+       return twl_i2c_write_u8(TWL4030_MODULE_AUDIO_VOICE, value, reg);
+}
+
+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) */
+               switch (reg) {
+               case TWL6040_REG_ASICID:
+               case TWL6040_REG_ASICREV:
+               case TWL6040_REG_STATUS:
+                       continue;
+               default:
+                       break;
+               }
+               twl6040_write(codec, reg, cache[reg]);
+       }
+}
+
+static void twl6040_init_vdd_regs(struct snd_soc_codec *codec)
+{
+       u8 *cache = codec->reg_cache;
+       int reg, i;
+
+       for (i = 0; i < TWL6040_VDDREGNUM; i++) {
+               reg = twl6040_vdd_reg[i];
+               twl6040_write(codec, reg, cache[reg]);
+       }
+}
+
+/* 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)
+{
+       int hslctl, hsrctl;
+       int mask = TWL6040_HSDRVMODEL | TWL6040_HSDACMODEL;
+
+       hslctl = twl6040_read_reg_cache(codec, TWL6040_REG_HSLCTL);
+       hsrctl = twl6040_read_reg_cache(codec, TWL6040_REG_HSRCTL);
+
+       if (high_perf) {
+               hslctl &= ~mask;
+               hsrctl &= ~mask;
+       } else {
+               hslctl |= mask;
+               hsrctl |= mask;
+       }
+
+       twl6040_write(codec, TWL6040_REG_HSLCTL, hslctl);
+       twl6040_write(codec, TWL6040_REG_HSRCTL, hsrctl);
+
+       return 0;
+}
+
+static int twl6040_power_mode_event(struct snd_soc_dapm_widget *w,
+                       struct snd_kcontrol *kcontrol, int event)
+{
+       struct snd_soc_codec *codec = w->codec;
+       struct twl6040_data *priv = codec->private_data;
+
+       if (SND_SOC_DAPM_EVENT_ON(event))
+               priv->non_lp++;
+       else
+               priv->non_lp--;
+
+       return 0;
+}
+
+/* audio interrupt handler */
+static irqreturn_t twl6040_naudint_handler(int irq, void *data)
+{
+       struct snd_soc_codec *codec = data;
+       struct twl6040_data *priv = codec->private_data;
+       u8 intid;
+
+       twl_i2c_read_u8(TWL4030_MODULE_AUDIO_VOICE, &intid, TWL6040_REG_INTID);
+
+       switch (intid) {
+       case TWL6040_THINT:
+               dev_alert(codec->dev, "die temp over-limit detection\n");
+               break;
+       case TWL6040_PLUGINT:
+       case TWL6040_UNPLUGINT:
+       case TWL6040_HOOKINT:
+               break;
+       case TWL6040_HFINT:
+               dev_alert(codec->dev, "hf drivers over current detection\n");
+               break;
+       case TWL6040_VIBINT:
+               dev_alert(codec->dev, "vib drivers over current detection\n");
+               break;
+       case TWL6040_READYINT:
+               complete(&priv->ready);
+               break;
+       default:
+               dev_err(codec->dev, "unknown audio interrupt %d\n", intid);
+               break;
+       }
+
+       return IRQ_HANDLED;
+}
+
+/*
+ * MICATT volume control:
+ * from -6 to 0 dB in 6 dB steps
+ */
+static DECLARE_TLV_DB_SCALE(mic_preamp_tlv, -600, 600, 0);
+
+/*
+ * MICGAIN volume control:
+ * from 6 to 30 dB in 6 dB steps
+ */
+static DECLARE_TLV_DB_SCALE(mic_amp_tlv, 600, 600, 0);
+
+/*
+ * HSGAIN volume control:
+ * from -30 to 0 dB in 2 dB steps
+ */
+static DECLARE_TLV_DB_SCALE(hs_tlv, -3000, 200, 0);
+
+/*
+ * HFGAIN volume control:
+ * from -52 to 6 dB in 2 dB steps
+ */
+static DECLARE_TLV_DB_SCALE(hf_tlv, -5200, 200, 0);
+
+/* Left analog microphone selection */
+static const char *twl6040_amicl_texts[] =
+       {"Headset Mic", "Main Mic", "Aux/FM Left", "Off"};
+
+/* Right analog microphone selection */
+static const char *twl6040_amicr_texts[] =
+       {"Headset Mic", "Sub Mic", "Aux/FM Right", "Off"};
+
+static const struct soc_enum twl6040_enum[] = {
+       SOC_ENUM_SINGLE(TWL6040_REG_MICLCTL, 3, 3, twl6040_amicl_texts),
+       SOC_ENUM_SINGLE(TWL6040_REG_MICRCTL, 3, 3, twl6040_amicr_texts),
+};
+
+static const struct snd_kcontrol_new amicl_control =
+       SOC_DAPM_ENUM("Route", twl6040_enum[0]);
+
+static const struct snd_kcontrol_new amicr_control =
+       SOC_DAPM_ENUM("Route", twl6040_enum[1]);
+
+/* Headset DAC playback switches */
+static const struct snd_kcontrol_new hsdacl_switch_controls =
+       SOC_DAPM_SINGLE("Switch", TWL6040_REG_HSLCTL, 5, 1, 0);
+
+static const struct snd_kcontrol_new hsdacr_switch_controls =
+       SOC_DAPM_SINGLE("Switch", TWL6040_REG_HSRCTL, 5, 1, 0);
+
+/* Handsfree DAC playback switches */
+static const struct snd_kcontrol_new hfdacl_switch_controls =
+       SOC_DAPM_SINGLE("Switch", TWL6040_REG_HFLCTL, 2, 1, 0);
+
+static const struct snd_kcontrol_new hfdacr_switch_controls =
+       SOC_DAPM_SINGLE("Switch", TWL6040_REG_HFRCTL, 2, 1, 0);
+
+/* Headset driver switches */
+static const struct snd_kcontrol_new hsl_driver_switch_controls =
+       SOC_DAPM_SINGLE("Switch", TWL6040_REG_HSLCTL, 2, 1, 0);
+
+static const struct snd_kcontrol_new hsr_driver_switch_controls =
+       SOC_DAPM_SINGLE("Switch", TWL6040_REG_HSRCTL, 2, 1, 0);
+
+/* Handsfree driver switches */
+static const struct snd_kcontrol_new hfl_driver_switch_controls =
+       SOC_DAPM_SINGLE("Switch", TWL6040_REG_HFLCTL, 4, 1, 0);
+
+static const struct snd_kcontrol_new hfr_driver_switch_controls =
+       SOC_DAPM_SINGLE("Switch", TWL6040_REG_HFRCTL, 4, 1, 0);
+
+static const struct snd_kcontrol_new twl6040_snd_controls[] = {
+       /* Capture gains */
+       SOC_DOUBLE_TLV("Capture Preamplifier Volume",
+               TWL6040_REG_MICGAIN, 6, 7, 1, 1, mic_preamp_tlv),
+       SOC_DOUBLE_TLV("Capture Volume",
+               TWL6040_REG_MICGAIN, 0, 3, 4, 0, mic_amp_tlv),
+
+       /* Playback gains */
+       SOC_DOUBLE_TLV("Headset Playback Volume",
+               TWL6040_REG_HSGAIN, 0, 4, 0xF, 1, hs_tlv),
+       SOC_DOUBLE_R_TLV("Handsfree Playback Volume",
+               TWL6040_REG_HFLGAIN, TWL6040_REG_HFRGAIN, 0, 0x1D, 1, hf_tlv),
+
+};
+
+static const struct snd_soc_dapm_widget twl6040_dapm_widgets[] = {
+       /* Inputs */
+       SND_SOC_DAPM_INPUT("MAINMIC"),
+       SND_SOC_DAPM_INPUT("HSMIC"),
+       SND_SOC_DAPM_INPUT("SUBMIC"),
+       SND_SOC_DAPM_INPUT("AFML"),
+       SND_SOC_DAPM_INPUT("AFMR"),
+
+       /* Outputs */
+       SND_SOC_DAPM_OUTPUT("HSOL"),
+       SND_SOC_DAPM_OUTPUT("HSOR"),
+       SND_SOC_DAPM_OUTPUT("HFL"),
+       SND_SOC_DAPM_OUTPUT("HFR"),
+
+       /* Analog input muxes for the capture amplifiers */
+       SND_SOC_DAPM_MUX("Analog Left Capture Route",
+                       SND_SOC_NOPM, 0, 0, &amicl_control),
+       SND_SOC_DAPM_MUX("Analog Right Capture Route",
+                       SND_SOC_NOPM, 0, 0, &amicr_control),
+
+       /* Analog capture PGAs */
+       SND_SOC_DAPM_PGA("MicAmpL",
+                       TWL6040_REG_MICLCTL, 0, 0, NULL, 0),
+       SND_SOC_DAPM_PGA("MicAmpR",
+                       TWL6040_REG_MICRCTL, 0, 0, NULL, 0),
+
+       /* ADCs */
+       SND_SOC_DAPM_ADC("ADC Left", "Left Front Capture",
+                       TWL6040_REG_MICLCTL, 2, 0),
+       SND_SOC_DAPM_ADC("ADC Right", "Right Front Capture",
+                       TWL6040_REG_MICRCTL, 2, 0),
+
+       /* Microphone bias */
+       SND_SOC_DAPM_MICBIAS("Headset Mic Bias",
+                       TWL6040_REG_AMICBCTL, 0, 0),
+       SND_SOC_DAPM_MICBIAS("Main Mic Bias",
+                       TWL6040_REG_AMICBCTL, 4, 0),
+       SND_SOC_DAPM_MICBIAS("Digital Mic1 Bias",
+                       TWL6040_REG_DMICBCTL, 0, 0),
+       SND_SOC_DAPM_MICBIAS("Digital Mic2 Bias",
+                       TWL6040_REG_DMICBCTL, 4, 0),
+
+       /* DACs */
+       SND_SOC_DAPM_DAC("HSDAC Left", "Headset Playback",
+                       TWL6040_REG_HSLCTL, 0, 0),
+       SND_SOC_DAPM_DAC("HSDAC Right", "Headset Playback",
+                       TWL6040_REG_HSRCTL, 0, 0),
+       SND_SOC_DAPM_DAC_E("HFDAC Left", "Handsfree Playback",
+                       TWL6040_REG_HFLCTL, 0, 0,
+                       twl6040_power_mode_event,
+                       SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),
+       SND_SOC_DAPM_DAC_E("HFDAC Right", "Handsfree Playback",
+                       TWL6040_REG_HFRCTL, 0, 0,
+                       twl6040_power_mode_event,
+                       SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),
+
+       /* Analog playback switches */
+       SND_SOC_DAPM_SWITCH("HSDAC Left Playback",
+                       SND_SOC_NOPM, 0, 0, &hsdacl_switch_controls),
+       SND_SOC_DAPM_SWITCH("HSDAC Right Playback",
+                       SND_SOC_NOPM, 0, 0, &hsdacr_switch_controls),
+       SND_SOC_DAPM_SWITCH("HFDAC Left Playback",
+                       SND_SOC_NOPM, 0, 0, &hfdacl_switch_controls),
+       SND_SOC_DAPM_SWITCH("HFDAC Right Playback",
+                       SND_SOC_NOPM, 0, 0, &hfdacr_switch_controls),
+
+       SND_SOC_DAPM_SWITCH("Headset Left Driver",
+                       SND_SOC_NOPM, 0, 0, &hsl_driver_switch_controls),
+       SND_SOC_DAPM_SWITCH("Headset Right Driver",
+                       SND_SOC_NOPM, 0, 0, &hsr_driver_switch_controls),
+       SND_SOC_DAPM_SWITCH_E("Handsfree Left Driver",
+                       SND_SOC_NOPM, 0, 0, &hfl_driver_switch_controls,
+                       twl6040_power_mode_event,
+                       SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),
+       SND_SOC_DAPM_SWITCH_E("Handsfree Right Driver",
+                       SND_SOC_NOPM, 0, 0, &hfr_driver_switch_controls,
+                       twl6040_power_mode_event,
+                       SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),
+
+       /* Analog playback PGAs */
+       SND_SOC_DAPM_PGA("HFDAC Left PGA",
+                       TWL6040_REG_HFLCTL, 1, 0, NULL, 0),
+       SND_SOC_DAPM_PGA("HFDAC Right PGA",
+                       TWL6040_REG_HFRCTL, 1, 0, NULL, 0),
+
+};
+
+static const struct snd_soc_dapm_route intercon[] = {
+       /* Capture path */
+       {"Analog Left Capture Route", "Headset Mic", "HSMIC"},
+       {"Analog Left Capture Route", "Main Mic", "MAINMIC"},
+       {"Analog Left Capture Route", "Aux/FM Left", "AFML"},
+
+       {"Analog Right Capture Route", "Headset Mic", "HSMIC"},
+       {"Analog Right Capture Route", "Sub Mic", "SUBMIC"},
+       {"Analog Right Capture Route", "Aux/FM Right", "AFMR"},
+
+       {"MicAmpL", NULL, "Analog Left Capture Route"},
+       {"MicAmpR", NULL, "Analog Right Capture Route"},
+
+       {"ADC Left", NULL, "MicAmpL"},
+       {"ADC Right", NULL, "MicAmpR"},
+
+       /* Headset playback path */
+       {"HSDAC Left Playback", "Switch", "HSDAC Left"},
+       {"HSDAC Right Playback", "Switch", "HSDAC Right"},
+
+       {"Headset Left Driver", "Switch", "HSDAC Left Playback"},
+       {"Headset Right Driver", "Switch", "HSDAC Right Playback"},
+
+       {"HSOL", NULL, "Headset Left Driver"},
+       {"HSOR", NULL, "Headset Right Driver"},
+
+       /* Handsfree playback path */
+       {"HFDAC Left Playback", "Switch", "HFDAC Left"},
+       {"HFDAC Right Playback", "Switch", "HFDAC Right"},
+
+       {"HFDAC Left PGA", NULL, "HFDAC Left Playback"},
+       {"HFDAC Right PGA", NULL, "HFDAC Right Playback"},
+
+       {"Handsfree Left Driver", "Switch", "HFDAC Left PGA"},
+       {"Handsfree Right Driver", "Switch", "HFDAC Right PGA"},
+
+       {"HFL", NULL, "Handsfree Left Driver"},
+       {"HFR", NULL, "Handsfree Right Driver"},
+};
+
+static int twl6040_add_widgets(struct snd_soc_codec *codec)
+{
+       snd_soc_dapm_new_controls(codec, twl6040_dapm_widgets,
+                                ARRAY_SIZE(twl6040_dapm_widgets));
+
+       snd_soc_dapm_add_routes(codec, intercon, ARRAY_SIZE(intercon));
+
+       snd_soc_dapm_new_widgets(codec);
+
+       return 0;
+}
+
+static int twl6040_power_up_completion(struct snd_soc_codec *codec,
+                                       int naudint)
+{
+       struct twl6040_data *priv = codec->private_data;
+       int time_left;
+       u8 intid;
+
+       time_left = wait_for_completion_timeout(&priv->ready,
+                               msecs_to_jiffies(48));
+
+       if (!time_left) {
+               twl_i2c_read_u8(TWL4030_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_data *priv = codec->private_data;
+       int audpwron = priv->audpwron;
+       int naudint = priv->naudint;
+       int ret;
+
+       switch (level) {
+       case SND_SOC_BIAS_ON:
+               break;
+       case SND_SOC_BIAS_PREPARE:
+               break;
+       case SND_SOC_BIAS_STANDBY:
+               if (priv->codec_powered)
+                       break;
+
+               if (gpio_is_valid(audpwron)) {
+                       /* use AUDPWRON line */
+                       gpio_set_value(audpwron, 1);
+
+                       /* 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;
+               }
+
+               /* initialize vdd/vss registers with reg_cache */
+               twl6040_init_vdd_regs(codec);
+               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);
+               }
+
+               priv->codec_powered = 0;
+               break;
+       }
+
+       codec->bias_level = level;
+
+       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)
+{
+       struct snd_soc_pcm_runtime *rtd = substream->private_data;
+       struct snd_soc_device *socdev = rtd->socdev;
+       struct snd_soc_codec *codec = socdev->card->codec;
+       struct twl6040_data *priv = codec->private_data;
+
+       if (!priv->sysclk) {
+               dev_err(codec->dev,
+                       "no mclk configured, call set_sysclk() on init\n");
+               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) {
+               dev_err(codec->dev,
+                       "capture mode is not supported at %dHz\n",
+                       priv->sysclk);
+               return -EINVAL;
+       }
+
+       snd_pcm_hw_constraint_list(substream->runtime, 0,
+                               SNDRV_PCM_HW_PARAM_RATE,
+                               priv->sysclk_constraints);
+
+       return 0;
+}
+
+static int twl6040_hw_params(struct snd_pcm_substream *substream,
+                       struct snd_pcm_hw_params *params,
+                       struct snd_soc_dai *dai)
+{
+       struct snd_soc_pcm_runtime *rtd = substream->private_data;
+       struct snd_soc_device *socdev = rtd->socdev;
+       struct snd_soc_codec *codec = socdev->card->codec;
+       struct twl6040_data *priv = codec->private_data;
+       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 88200:
+               lppllctl |= TWL6040_LPLLFIN;
+               priv->sysclk = 17640000;
+               break;
+       case 96000:
+               lppllctl &= ~TWL6040_LPLLFIN;
+               priv->sysclk = 19200000;
+               break;
+       default:
+               dev_err(codec->dev, "unsupported rate %d\n", rate);
+               return -EINVAL;
+       }
+
+       twl6040_write(codec, TWL6040_REG_LPPLLCTL, lppllctl);
+
+       return 0;
+}
+
+static int twl6040_trigger(struct snd_pcm_substream *substream,
+                       int cmd, struct snd_soc_dai *dai)
+{
+       struct snd_soc_pcm_runtime *rtd = substream->private_data;
+       struct snd_soc_device *socdev = rtd->socdev;
+       struct snd_soc_codec *codec = socdev->card->codec;
+       struct twl6040_data *priv = codec->private_data;
+
+       switch (cmd) {
+       case SNDRV_PCM_TRIGGER_START:
+       case SNDRV_PCM_TRIGGER_RESUME:
+               /*
+                * low-power playback mode is restricted
+                * for headset path only
+                */
+               if ((priv->sysclk == 17640000) && priv->non_lp) {
+                       dev_err(codec->dev,
+                               "some enabled paths aren't supported at %dHz\n",
+                               priv->sysclk);
+                       return -EPERM;
+               }
+               break;
+       default:
+               break;
+       }
+
+       return 0;
+}
+
+static int twl6040_set_dai_sysclk(struct snd_soc_dai *codec_dai,
+               int clk_id, unsigned int freq, int dir)
+{
+       struct snd_soc_codec *codec = codec_dai->codec;
+       struct twl6040_data *priv = codec->private_data;
+       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_HPLLSQRBP |
+                                   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;
+               break;
+       default:
+               dev_err(codec->dev, "unknown clk_id %d\n", clk_id);
+               return -EINVAL;
+       }
+
+       return 0;
+}
+
+static struct snd_soc_dai_ops twl6040_dai_ops = {
+       .startup        = twl6040_startup,
+       .hw_params      = twl6040_hw_params,
+       .trigger        = twl6040_trigger,
+       .set_sysclk     = twl6040_set_dai_sysclk,
+};
+
+struct snd_soc_dai twl6040_dai = {
+       .name = "twl6040",
+       .playback = {
+               .stream_name = "Playback",
+               .channels_min = 1,
+               .channels_max = 4,
+               .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,
+};
+EXPORT_SYMBOL_GPL(twl6040_dai);
+
+#ifdef CONFIG_PM
+static int twl6040_suspend(struct platform_device *pdev, pm_message_t state)
+{
+       struct snd_soc_device *socdev = platform_get_drvdata(pdev);
+       struct snd_soc_codec *codec = socdev->card->codec;
+
+       twl6040_set_bias_level(codec, SND_SOC_BIAS_OFF);
+
+       return 0;
+}
+
+static int twl6040_resume(struct platform_device *pdev)
+{
+       struct snd_soc_device *socdev = platform_get_drvdata(pdev);
+       struct snd_soc_codec *codec = socdev->card->codec;
+
+       twl6040_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
+       twl6040_set_bias_level(codec, codec->suspend_bias_level);
+
+       return 0;
+}
+#else
+#define twl6040_suspend NULL
+#define twl6040_resume NULL
+#endif
+
+static struct snd_soc_codec *twl6040_codec;
+
+static int twl6040_probe(struct platform_device *pdev)
+{
+       struct snd_soc_device *socdev = platform_get_drvdata(pdev);
+       struct snd_soc_codec *codec;
+       int ret = 0;
+
+       BUG_ON(!twl6040_codec);
+
+       codec = twl6040_codec;
+       socdev->card->codec = codec;
+
+       /* register pcms */
+       ret = snd_soc_new_pcms(socdev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1);
+       if (ret < 0) {
+               dev_err(&pdev->dev, "failed to create pcms\n");
+               return ret;
+       }
+
+       snd_soc_add_controls(codec, twl6040_snd_controls,
+                               ARRAY_SIZE(twl6040_snd_controls));
+       twl6040_add_widgets(codec);
+
+       if (ret < 0) {
+               dev_err(&pdev->dev, "failed to register card\n");
+               goto card_err;
+       }
+
+       return ret;
+
+card_err:
+       snd_soc_free_pcms(socdev);
+       snd_soc_dapm_free(socdev);
+       return ret;
+}
+
+static int twl6040_remove(struct platform_device *pdev)
+{
+       struct snd_soc_device *socdev = platform_get_drvdata(pdev);
+       struct snd_soc_codec *codec = socdev->card->codec;
+
+       twl6040_set_bias_level(codec, SND_SOC_BIAS_OFF);
+       snd_soc_free_pcms(socdev);
+       snd_soc_dapm_free(socdev);
+       kfree(codec);
+
+       return 0;
+}
+
+struct snd_soc_codec_device soc_codec_dev_twl6040 = {
+       .probe = twl6040_probe,
+       .remove = twl6040_remove,
+       .suspend = twl6040_suspend,
+       .resume = twl6040_resume,
+};
+EXPORT_SYMBOL_GPL(soc_codec_dev_twl6040);
+
+static int __devinit twl6040_codec_probe(struct platform_device *pdev)
+{
+       struct twl4030_codec_data *twl_codec = pdev->dev.platform_data;
+       struct snd_soc_codec *codec;
+       struct twl6040_data *priv;
+       int audpwron, naudint;
+       int ret = 0;
+
+       priv = kzalloc(sizeof(struct twl6040_data), GFP_KERNEL);
+       if (priv == NULL)
+               return -ENOMEM;
+
+       if (twl_codec) {
+               audpwron = twl_codec->audpwron_gpio;
+               naudint = twl_codec->naudint_irq;
+       } else {
+               audpwron = -EINVAL;
+               naudint = 0;
+       }
+
+       priv->audpwron = audpwron;
+       priv->naudint = naudint;
+
+       codec = &priv->codec;
+       codec->dev = &pdev->dev;
+       twl6040_dai.dev = &pdev->dev;
+
+       codec->name = "twl6040";
+       codec->owner = THIS_MODULE;
+       codec->read = twl6040_read_reg_cache;
+       codec->write = twl6040_write;
+       codec->set_bias_level = twl6040_set_bias_level;
+       codec->private_data = priv;
+       codec->dai = &twl6040_dai;
+       codec->num_dai = 1;
+       codec->reg_cache_size = ARRAY_SIZE(twl6040_reg);
+       codec->reg_cache = kmemdup(twl6040_reg, sizeof(twl6040_reg),
+                                       GFP_KERNEL);
+       if (codec->reg_cache == NULL) {
+               ret = -ENOMEM;
+               goto cache_err;
+       }
+
+       mutex_init(&codec->mutex);
+       INIT_LIST_HEAD(&codec->dapm_widgets);
+       INIT_LIST_HEAD(&codec->dapm_paths);
+       init_completion(&priv->ready);
+
+       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;
+       }
+
+       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;
+       } else {
+               if (gpio_is_valid(audpwron)) {
+                       /* enable only codec ready interrupt */
+                       twl6040_write_reg_cache(codec, TWL6040_REG_INTMR,
+                                       ~TWL6040_READYMSK & TWL6040_ALLINT_MSK);
+               } else {
+                       /* no interrupts at all */
+                       twl6040_write_reg_cache(codec, TWL6040_REG_INTMR,
+                                               TWL6040_ALLINT_MSK);
+               }
+       }
+
+       /* init vio registers */
+       twl6040_init_vio_regs(codec);
+
+       /* power on device */
+       ret = twl6040_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
+       if (ret)
+               goto irq_err;
+
+       ret = snd_soc_register_codec(codec);
+       if (ret)
+               goto reg_err;
+
+       twl6040_codec = codec;
+
+       ret = snd_soc_register_dai(&twl6040_dai);
+       if (ret)
+               goto dai_err;
+
+       return 0;
+
+dai_err:
+       snd_soc_unregister_codec(codec);
+       twl6040_codec = NULL;
+reg_err:
+       twl6040_set_bias_level(codec, SND_SOC_BIAS_OFF);
+irq_err:
+       if (naudint)
+               free_irq(naudint, codec);
+gpio2_err:
+       if (gpio_is_valid(audpwron))
+               gpio_free(audpwron);
+gpio1_err:
+       kfree(codec->reg_cache);
+cache_err:
+       kfree(priv);
+       return ret;
+}
+
+static int __devexit twl6040_codec_remove(struct platform_device *pdev)
+{
+       struct twl6040_data *priv = twl6040_codec->private_data;
+       int audpwron = priv->audpwron;
+       int naudint = priv->naudint;
+
+       if (gpio_is_valid(audpwron))
+               gpio_free(audpwron);
+
+       if (naudint)
+               free_irq(naudint, twl6040_codec);
+
+       snd_soc_unregister_dai(&twl6040_dai);
+       snd_soc_unregister_codec(twl6040_codec);
+
+       kfree(twl6040_codec);
+       twl6040_codec = NULL;
+
+       return 0;
+}
+
+static struct platform_driver twl6040_codec_driver = {
+       .driver = {
+               .name = "twl6040_codec",
+               .owner = THIS_MODULE,
+       },
+       .probe = twl6040_codec_probe,
+       .remove = __devexit_p(twl6040_codec_remove),
+};
+
+static int __init twl6040_codec_init(void)
+{
+       return platform_driver_register(&twl6040_codec_driver);
+}
+module_init(twl6040_codec_init);
+
+static void __exit twl6040_codec_exit(void)
+{
+       platform_driver_unregister(&twl6040_codec_driver);
+}
+module_exit(twl6040_codec_exit);
+
+MODULE_DESCRIPTION("ASoC TWL6040 codec driver");
+MODULE_AUTHOR("Misael Lopez Cruz");
+MODULE_LICENSE("GPL");
diff --git a/sound/soc/codecs/twl6040.h b/sound/soc/codecs/twl6040.h
new file mode 100644
index 0000000..c472070
--- /dev/null
+++ b/sound/soc/codecs/twl6040.h
@@ -0,0 +1,141 @@
+/*
+ * ALSA SoC TWL6040 codec driver
+ *
+ * Author:     Misael Lopez Cruz <x0052729@ti.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#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_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
+
+extern struct snd_soc_dai twl6040_dai;
+extern struct snd_soc_codec_device soc_codec_dev_twl6040;
+
+#endif /* End of __TWL6040_H__ */
