ASoC: Decouple DAPM from CODECs
[linux-2.6.git] / sound / soc / codecs / wm8993.c
index 3e5c65a..bcc54be 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * wm8993.c -- WM8993 ALSA SoC audio driver
  *
- * Copyright 2009 Wolfson Microelectronics plc
+ * Copyright 2009, 2010 Wolfson Microelectronics plc
  *
  * Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
  *
@@ -16,7 +16,9 @@
 #include <linux/delay.h>
 #include <linux/pm.h>
 #include <linux/i2c.h>
+#include <linux/regulator/consumer.h>
 #include <linux/spi/spi.h>
+#include <linux/slab.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/wm8993.h>
 
 #include "wm8993.h"
+#include "wm_hubs.h"
+
+#define WM8993_NUM_SUPPLIES 6
+static const char *wm8993_supply_names[WM8993_NUM_SUPPLIES] = {
+       "DCVDD",
+       "DBVDD",
+       "AVDD1",
+       "AVDD2",
+       "CPVDD",
+       "SPKVDD",
+};
 
 static u16 wm8993_reg_defaults[WM8993_REGISTER_COUNT] = {
        0x8993,     /* R0   - Software Reset */
@@ -212,11 +225,15 @@ static struct {
 };
 
 struct wm8993_priv {
+       struct wm_hubs_data hubs_data;
        u16 reg_cache[WM8993_REGISTER_COUNT];
+       struct regulator_bulk_data supplies[WM8993_NUM_SUPPLIES];
        struct wm8993_platform_data pdata;
-       struct snd_soc_codec codec;
+       enum snd_soc_control_type control_type;
        int master;
        int sysclk_source;
+       int tdm_slots;
+       int tdm_width;
        unsigned int mclk_rate;
        unsigned int sysclk_rate;
        unsigned int fs;
@@ -224,36 +241,9 @@ struct wm8993_priv {
        int class_w_users;
        unsigned int fll_fref;
        unsigned int fll_fout;
+       int fll_src;
 };
 
-static unsigned int wm8993_read_hw(struct snd_soc_codec *codec, u8 reg)
-{
-       struct i2c_msg xfer[2];
-       u16 data;
-       int ret;
-       struct i2c_client *i2c = codec->control_data;
-
-       /* Write register */
-       xfer[0].addr = i2c->addr;
-       xfer[0].flags = 0;
-       xfer[0].len = 1;
-       xfer[0].buf = &reg;
-
-       /* Read data */
-       xfer[1].addr = i2c->addr;
-       xfer[1].flags = I2C_M_RD;
-       xfer[1].len = 2;
-       xfer[1].buf = (u8 *)&data;
-
-       ret = i2c_transfer(i2c->adapter, xfer, 2);
-       if (ret != 2) {
-               dev_err(codec->dev, "Failed to read 0x%x: %d\n", reg, ret);
-               return 0;
-       }
-
-       return (data >> 8) | ((data & 0xff) << 8);
-}
-
 static int wm8993_volatile(unsigned int reg)
 {
        switch (reg) {
@@ -268,48 +258,6 @@ static int wm8993_volatile(unsigned int reg)
        }
 }
 
-static unsigned int wm8993_read(struct snd_soc_codec *codec,
-                               unsigned int reg)
-{
-       u16 *reg_cache = codec->reg_cache;
-
-       BUG_ON(reg > WM8993_MAX_REGISTER);
-
-       if (wm8993_volatile(reg))
-               return wm8993_read_hw(codec, reg);
-       else
-               return reg_cache[reg];
-}
-
-static int wm8993_write(struct snd_soc_codec *codec, unsigned int reg,
-                       unsigned int value)
-{
-       u16 *reg_cache = codec->reg_cache;
-       u8 data[3];
-       int ret;
-
-       BUG_ON(reg > WM8993_MAX_REGISTER);
-
-       /* data is
-        *   D15..D9 WM8993 register offset
-        *   D8...D0 register data
-        */
-       data[0] = reg;
-       data[1] = value >> 8;
-       data[2] = value & 0x00ff;
-
-       if (!wm8993_volatile(reg))
-               reg_cache[reg] = value;
-
-       ret = codec->hw_write(codec->control_data, data, 3);
-
-       if (ret == 3)
-               return 0;
-       if (ret < 0)
-               return ret;
-       return -EIO;
-}
-
 struct _fll_div {
        u16 fll_fratio;
        u16 fll_outdiv;
@@ -345,8 +293,10 @@ static int fll_factors(struct _fll_div *fll_div, unsigned int Fref,
 
        /* Fref must be <=13.5MHz */
        div = 1;
+       fll_div->fll_clk_ref_div = 0;
        while ((Fref / div) > 13500000) {
                div *= 2;
+               fll_div->fll_clk_ref_div++;
 
                if (div > 8) {
                        pr_err("Can't scale %dMHz input down to <=13.5MHz\n",
@@ -417,11 +367,10 @@ static int fll_factors(struct _fll_div *fll_div, unsigned int Fref,
        return 0;
 }
 
-static int wm8993_set_fll(struct snd_soc_dai *dai, int fll_id,
+static int _wm8993_set_fll(struct snd_soc_codec *codec, int fll_id, int source,
                          unsigned int Fref, unsigned int Fout)
 {
-       struct snd_soc_codec *codec = dai->codec;
-       struct wm8993_priv *wm8993 = codec->private_data;
+       struct wm8993_priv *wm8993 = snd_soc_codec_get_drvdata(codec);
        u16 reg1, reg4, reg5;
        struct _fll_div fll_div;
        int ret;
@@ -436,9 +385,9 @@ static int wm8993_set_fll(struct snd_soc_dai *dai, int fll_id,
                wm8993->fll_fref = 0;
                wm8993->fll_fout = 0;
 
-               reg1 = wm8993_read(codec, WM8993_FLL_CONTROL_1);
+               reg1 = snd_soc_read(codec, WM8993_FLL_CONTROL_1);
                reg1 &= ~WM8993_FLL_ENA;
-               wm8993_write(codec, WM8993_FLL_CONTROL_1, reg1);
+               snd_soc_write(codec, WM8993_FLL_CONTROL_1, reg1);
 
                return 0;
        }
@@ -447,7 +396,7 @@ static int wm8993_set_fll(struct snd_soc_dai *dai, int fll_id,
        if (ret != 0)
                return ret;
 
-       reg5 = wm8993_read(codec, WM8993_FLL_CONTROL_5);
+       reg5 = snd_soc_read(codec, WM8993_FLL_CONTROL_5);
        reg5 &= ~WM8993_FLL_CLK_SRC_MASK;
 
        switch (fll_id) {
@@ -469,45 +418,52 @@ static int wm8993_set_fll(struct snd_soc_dai *dai, int fll_id,
 
        /* Any FLL configuration change requires that the FLL be
         * disabled first. */
-       reg1 = wm8993_read(codec, WM8993_FLL_CONTROL_1);
+       reg1 = snd_soc_read(codec, WM8993_FLL_CONTROL_1);
        reg1 &= ~WM8993_FLL_ENA;
-       wm8993_write(codec, WM8993_FLL_CONTROL_1, reg1);
+       snd_soc_write(codec, WM8993_FLL_CONTROL_1, reg1);
 
        /* Apply the configuration */
        if (fll_div.k)
                reg1 |= WM8993_FLL_FRAC_MASK;
        else
                reg1 &= ~WM8993_FLL_FRAC_MASK;
-       wm8993_write(codec, WM8993_FLL_CONTROL_1, reg1);
+       snd_soc_write(codec, WM8993_FLL_CONTROL_1, reg1);
 
-       wm8993_write(codec, WM8993_FLL_CONTROL_2,
-                    (fll_div.fll_outdiv << WM8993_FLL_OUTDIV_SHIFT) |
-                    (fll_div.fll_fratio << WM8993_FLL_FRATIO_SHIFT));
-       wm8993_write(codec, WM8993_FLL_CONTROL_3, fll_div.k);
+       snd_soc_write(codec, WM8993_FLL_CONTROL_2,
+                     (fll_div.fll_outdiv << WM8993_FLL_OUTDIV_SHIFT) |
+                     (fll_div.fll_fratio << WM8993_FLL_FRATIO_SHIFT));
+       snd_soc_write(codec, WM8993_FLL_CONTROL_3, fll_div.k);
 
-       reg4 = wm8993_read(codec, WM8993_FLL_CONTROL_4);
+       reg4 = snd_soc_read(codec, WM8993_FLL_CONTROL_4);
        reg4 &= ~WM8993_FLL_N_MASK;
        reg4 |= fll_div.n << WM8993_FLL_N_SHIFT;
-       wm8993_write(codec, WM8993_FLL_CONTROL_4, reg4);
+       snd_soc_write(codec, WM8993_FLL_CONTROL_4, reg4);
 
        reg5 &= ~WM8993_FLL_CLK_REF_DIV_MASK;
        reg5 |= fll_div.fll_clk_ref_div << WM8993_FLL_CLK_REF_DIV_SHIFT;
-       wm8993_write(codec, WM8993_FLL_CONTROL_5, reg5);
+       snd_soc_write(codec, WM8993_FLL_CONTROL_5, reg5);
 
        /* Enable the FLL */
-       wm8993_write(codec, WM8993_FLL_CONTROL_1, reg1 | WM8993_FLL_ENA);
+       snd_soc_write(codec, WM8993_FLL_CONTROL_1, reg1 | WM8993_FLL_ENA);
 
        dev_dbg(codec->dev, "FLL enabled at %dHz->%dHz\n", Fref, Fout);
 
        wm8993->fll_fref = Fref;
        wm8993->fll_fout = Fout;
+       wm8993->fll_src = source;
 
        return 0;
 }
 
+static int wm8993_set_fll(struct snd_soc_dai *dai, int fll_id, int source,
+                         unsigned int Fref, unsigned int Fout)
+{
+       return _wm8993_set_fll(dai->codec, fll_id, source, Fref, Fout);
+}
+
 static int configure_clock(struct snd_soc_codec *codec)
 {
-       struct wm8993_priv *wm8993 = codec->private_data;
+       struct wm8993_priv *wm8993 = snd_soc_codec_get_drvdata(codec);
        unsigned int reg;
 
        /* This should be done on init() for bypass paths */
@@ -515,8 +471,8 @@ static int configure_clock(struct snd_soc_codec *codec)
        case WM8993_SYSCLK_MCLK:
                dev_dbg(codec->dev, "Using %dHz MCLK\n", wm8993->mclk_rate);
 
-               reg = wm8993_read(codec, WM8993_CLOCKING_2);
-               reg &= ~WM8993_SYSCLK_SRC;
+               reg = snd_soc_read(codec, WM8993_CLOCKING_2);
+               reg &= ~(WM8993_MCLK_DIV | WM8993_SYSCLK_SRC);
                if (wm8993->mclk_rate > 13500000) {
                        reg |= WM8993_MCLK_DIV;
                        wm8993->sysclk_rate = wm8993->mclk_rate / 2;
@@ -524,16 +480,14 @@ static int configure_clock(struct snd_soc_codec *codec)
                        reg &= ~WM8993_MCLK_DIV;
                        wm8993->sysclk_rate = wm8993->mclk_rate;
                }
-               reg &= ~WM8993_MCLK_DIV;
-               reg &= ~(WM8993_MCLK_DIV | WM8993_SYSCLK_SRC);
-               wm8993_write(codec, WM8993_CLOCKING_2, reg);
+               snd_soc_write(codec, WM8993_CLOCKING_2, reg);
                break;
 
        case WM8993_SYSCLK_FLL:
                dev_dbg(codec->dev, "Using %dHz FLL clock\n",
                        wm8993->fll_fout);
 
-               reg = wm8993_read(codec, WM8993_CLOCKING_2);
+               reg = snd_soc_read(codec, WM8993_CLOCKING_2);
                reg |= WM8993_SYSCLK_SRC;
                if (wm8993->fll_fout > 13500000) {
                        reg |= WM8993_MCLK_DIV;
@@ -542,7 +496,7 @@ static int configure_clock(struct snd_soc_codec *codec)
                        reg &= ~WM8993_MCLK_DIV;
                        wm8993->sysclk_rate = wm8993->fll_fout;
                }
-               wm8993_write(codec, WM8993_CLOCKING_2, reg);
+               snd_soc_write(codec, WM8993_CLOCKING_2, reg);
                break;
 
        default:
@@ -555,28 +509,6 @@ static int configure_clock(struct snd_soc_codec *codec)
        return 0;
 }
 
-static void wait_for_dc_servo(struct snd_soc_codec *codec, int mask)
-{
-       unsigned int reg;
-       int count = 0;
-
-       dev_dbg(codec->dev, "Waiting for DC servo...\n");
-       do {
-               count++;
-               msleep(1);
-               reg = wm8993_read(codec, WM8993_DC_SERVO_READBACK_0);
-               dev_dbg(codec->dev, "DC servo status: %x\n", reg);
-       } while ((reg & WM8993_DCS_CAL_COMPLETE_MASK)
-                != WM8993_DCS_CAL_COMPLETE_MASK && count < 1000);
-
-       if ((reg & WM8993_DCS_CAL_COMPLETE_MASK)
-           != WM8993_DCS_CAL_COMPLETE_MASK)
-               dev_err(codec->dev, "Timed out waiting for DC Servo\n");
-}
-
-static const DECLARE_TLV_DB_SCALE(inpga_tlv, -1650, 150, 0);
-static const DECLARE_TLV_DB_SCALE(inmix_sw_tlv, 0, 3000, 0);
-static const DECLARE_TLV_DB_SCALE(inmix_tlv, -1500, 300, 1);
 static const DECLARE_TLV_DB_SCALE(sidetone_tlv, -3600, 300, 0);
 static const DECLARE_TLV_DB_SCALE(drc_comp_threash, -4500, 75, 0);
 static const DECLARE_TLV_DB_SCALE(drc_comp_amp, -2250, 75, 0);
@@ -591,33 +523,6 @@ static const DECLARE_TLV_DB_SCALE(drc_startup_tlv, -1800, 300, 0);
 static const DECLARE_TLV_DB_SCALE(eq_tlv, -1200, 100, 0);
 static const DECLARE_TLV_DB_SCALE(digital_tlv, -7200, 75, 1);
 static const DECLARE_TLV_DB_SCALE(dac_boost_tlv, 0, 600, 0);
-static const DECLARE_TLV_DB_SCALE(earpiece_tlv, -600, 600, 0);
-static const DECLARE_TLV_DB_SCALE(outmix_tlv, -2100, 300, 0);
-static const DECLARE_TLV_DB_SCALE(spkmix_tlv, -300, 300, 0);
-static const DECLARE_TLV_DB_SCALE(spkmixout_tlv, -1800, 600, 1);
-static const DECLARE_TLV_DB_SCALE(outpga_tlv, -5700, 100, 0);
-static const unsigned int spkboost_tlv[] = {
-       TLV_DB_RANGE_HEAD(7),
-       0, 6, TLV_DB_SCALE_ITEM(0, 150, 0),
-       7, 7, TLV_DB_SCALE_ITEM(1200, 0, 0),
-};
-static const DECLARE_TLV_DB_SCALE(line_tlv, -600, 600, 0);
-
-static const char *speaker_ref_text[] = {
-       "SPKVDD/2",
-       "VMID",
-};
-
-static const struct soc_enum speaker_ref =
-       SOC_ENUM_SINGLE(WM8993_SPEAKER_MIXER, 8, 2, speaker_ref_text);
-
-static const char *speaker_mode_text[] = {
-       "Class D",
-       "Class AB",
-};
-
-static const struct soc_enum speaker_mode =
-       SOC_ENUM_SINGLE(WM8993_SPKMIXR_ATTENUATION, 8, 2, speaker_mode_text);
 
 static const char *dac_deemph_text[] = {
        "None",
@@ -729,79 +634,13 @@ static const char *drc_smooth_text[] = {
 static const struct soc_enum drc_smooth =
        SOC_ENUM_SINGLE(WM8993_DRC_CONTROL_1, 4, 3, drc_smooth_text);
 
-
-/*
- * Update the DC servo calibration on gain changes
- */
-static int wm8993_put_dc_servo(struct snd_kcontrol *kcontrol,
-                             struct snd_ctl_elem_value *ucontrol)
-{
-       struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
-       int ret;
-
-       ret = snd_soc_put_volsw_2r(kcontrol, ucontrol);
-
-       /* Only need to do this if the outputs are active */
-       if (wm8993_read(codec, WM8993_POWER_MANAGEMENT_1)
-           & (WM8993_HPOUT1L_ENA | WM8993_HPOUT1R_ENA))
-               snd_soc_update_bits(codec,
-                                   WM8993_DC_SERVO_0,
-                                   WM8993_DCS_TRIG_SINGLE_0 |
-                                   WM8993_DCS_TRIG_SINGLE_1,
-                                   WM8993_DCS_TRIG_SINGLE_0 |
-                                   WM8993_DCS_TRIG_SINGLE_1);
-
-       return ret;
-}
-
 static const struct snd_kcontrol_new wm8993_snd_controls[] = {
-SOC_SINGLE_TLV("IN1L Volume", WM8993_LEFT_LINE_INPUT_1_2_VOLUME, 0, 31, 0,
-              inpga_tlv),
-SOC_SINGLE("IN1L Switch", WM8993_LEFT_LINE_INPUT_1_2_VOLUME, 7, 1, 1),
-SOC_SINGLE("IN1L ZC Switch", WM8993_LEFT_LINE_INPUT_1_2_VOLUME, 7, 1, 0),
-
-SOC_SINGLE_TLV("IN1R Volume", WM8993_RIGHT_LINE_INPUT_1_2_VOLUME, 0, 31, 0,
-              inpga_tlv),
-SOC_SINGLE("IN1R Switch", WM8993_RIGHT_LINE_INPUT_1_2_VOLUME, 7, 1, 1),
-SOC_SINGLE("IN1R ZC Switch", WM8993_RIGHT_LINE_INPUT_1_2_VOLUME, 7, 1, 0),
-
-
-SOC_SINGLE_TLV("IN2L Volume", WM8993_LEFT_LINE_INPUT_3_4_VOLUME, 0, 31, 0,
-              inpga_tlv),
-SOC_SINGLE("IN2L Switch", WM8993_LEFT_LINE_INPUT_3_4_VOLUME, 7, 1, 1),
-SOC_SINGLE("IN2L ZC Switch", WM8993_LEFT_LINE_INPUT_3_4_VOLUME, 7, 1, 0),
-
-SOC_SINGLE_TLV("IN2R Volume", WM8993_RIGHT_LINE_INPUT_3_4_VOLUME, 0, 31, 0,
-              inpga_tlv),
-SOC_SINGLE("IN2R Switch", WM8993_RIGHT_LINE_INPUT_3_4_VOLUME, 7, 1, 1),
-SOC_SINGLE("IN2R ZC Switch", WM8993_RIGHT_LINE_INPUT_3_4_VOLUME, 7, 1, 0),
-
-SOC_SINGLE_TLV("MIXINL IN2L Volume", WM8993_INPUT_MIXER3, 7, 1, 0,
-              inmix_sw_tlv),
-SOC_SINGLE_TLV("MIXINL IN1L Volume", WM8993_INPUT_MIXER3, 4, 1, 0,
-              inmix_sw_tlv),
-SOC_SINGLE_TLV("MIXINL Output Record Volume", WM8993_INPUT_MIXER3, 0, 7, 0,
-              inmix_tlv),
-SOC_SINGLE_TLV("MIXINL IN1LP Volume", WM8993_INPUT_MIXER5, 6, 7, 0, inmix_tlv),
-SOC_SINGLE_TLV("MIXINL Direct Voice Volume", WM8993_INPUT_MIXER5, 0, 6, 0,
-              inmix_tlv),
-
-SOC_SINGLE_TLV("MIXINR IN2R Volume", WM8993_INPUT_MIXER4, 7, 1, 0,
-              inmix_sw_tlv),
-SOC_SINGLE_TLV("MIXINR IN1R Volume", WM8993_INPUT_MIXER4, 4, 1, 0,
-              inmix_sw_tlv),
-SOC_SINGLE_TLV("MIXINR Output Record Volume", WM8993_INPUT_MIXER4, 0, 7, 0,
-              inmix_tlv),
-SOC_SINGLE_TLV("MIXINR IN1RP Volume", WM8993_INPUT_MIXER6, 6, 7, 0, inmix_tlv),
-SOC_SINGLE_TLV("MIXINR Direct Voice Volume", WM8993_INPUT_MIXER6, 0, 6, 0,
-              inmix_tlv),
-
 SOC_DOUBLE_TLV("Digital Sidetone Volume", WM8993_DIGITAL_SIDE_TONE,
               5, 9, 12, 0, sidetone_tlv),
 
 SOC_SINGLE("DRC Switch", WM8993_DRC_CONTROL_1, 15, 1, 0),
 SOC_ENUM("DRC Path", drc_path),
-SOC_SINGLE_TLV("DRC Compressor Threashold Volume", WM8993_DRC_CONTROL_2,
+SOC_SINGLE_TLV("DRC Compressor Threshold Volume", WM8993_DRC_CONTROL_2,
               2, 60, 1, drc_comp_threash),
 SOC_SINGLE_TLV("DRC Compressor Amplitude Volume", WM8993_DRC_CONTROL_3,
               11, 30, 1, drc_comp_amp),
@@ -821,7 +660,7 @@ SOC_SINGLE_TLV("DRC Quick Release Volume", WM8993_DRC_CONTROL_3, 2, 3, 0,
 SOC_ENUM("DRC Quick Release Rate", drc_qr_rate),
 SOC_SINGLE("DRC Smoothing Switch", WM8993_DRC_CONTROL_1, 11, 1, 0),
 SOC_SINGLE("DRC Smoothing Hysteresis Switch", WM8993_DRC_CONTROL_1, 8, 1, 0),
-SOC_ENUM("DRC Smoothing Hysteresis Threashold", drc_smooth),
+SOC_ENUM("DRC Smoothing Hysteresis Threshold", drc_smooth),
 SOC_SINGLE_TLV("DRC Startup Volume", WM8993_DRC_CONTROL_4, 8, 18, 0,
               drc_startup_tlv),
 
@@ -838,112 +677,11 @@ SOC_SINGLE_TLV("Playback Boost Volume", WM8993_AUDIO_INTERFACE_2, 10, 3, 0,
               dac_boost_tlv),
 SOC_ENUM("DAC Deemphasis", dac_deemph),
 
-SOC_SINGLE_TLV("Left Output Mixer IN2RN Volume", WM8993_OUTPUT_MIXER5, 6, 7, 1,
-              outmix_tlv),
-SOC_SINGLE_TLV("Left Output Mixer IN2LN Volume", WM8993_OUTPUT_MIXER3, 6, 7, 1,
-              outmix_tlv),
-SOC_SINGLE_TLV("Left Output Mixer IN2LP Volume", WM8993_OUTPUT_MIXER3, 9, 7, 1,
-              outmix_tlv),
-SOC_SINGLE_TLV("Left Output Mixer IN1L Volume", WM8993_OUTPUT_MIXER3, 0, 7, 1,
-              outmix_tlv),
-SOC_SINGLE_TLV("Left Output Mixer IN1R Volume", WM8993_OUTPUT_MIXER3, 3, 7, 1,
-              outmix_tlv),
-SOC_SINGLE_TLV("Left Output Mixer Right Input Volume",
-              WM8993_OUTPUT_MIXER5, 3, 7, 1, outmix_tlv),
-SOC_SINGLE_TLV("Left Output Mixer Left Input Volume",
-              WM8993_OUTPUT_MIXER5, 0, 7, 1, outmix_tlv),
-SOC_SINGLE_TLV("Left Output Mixer DAC Volume", WM8993_OUTPUT_MIXER5, 9, 7, 1,
-              outmix_tlv),
-
-SOC_SINGLE_TLV("Right Output Mixer IN2LN Volume",
-              WM8993_OUTPUT_MIXER6, 6, 7, 1, outmix_tlv),
-SOC_SINGLE_TLV("Right Output Mixer IN2RN Volume",
-              WM8993_OUTPUT_MIXER4, 6, 7, 1, outmix_tlv),
-SOC_SINGLE_TLV("Right Output Mixer IN1L Volume",
-              WM8993_OUTPUT_MIXER4, 3, 7, 1, outmix_tlv),
-SOC_SINGLE_TLV("Right Output Mixer IN1R Volume",
-              WM8993_OUTPUT_MIXER4, 0, 7, 1, outmix_tlv),
-SOC_SINGLE_TLV("Right Output Mixer IN2RP Volume",
-              WM8993_OUTPUT_MIXER4, 9, 7, 1, outmix_tlv),
-SOC_SINGLE_TLV("Right Output Mixer Left Input Volume",
-              WM8993_OUTPUT_MIXER6, 3, 7, 1, outmix_tlv),
-SOC_SINGLE_TLV("Right Output Mixer Right Input Volume",
-              WM8993_OUTPUT_MIXER6, 6, 7, 1, outmix_tlv),
-SOC_SINGLE_TLV("Right Output Mixer DAC Volume",
-              WM8993_OUTPUT_MIXER6, 9, 7, 1, outmix_tlv),
-
-SOC_DOUBLE_R_TLV("Output Volume", WM8993_LEFT_OPGA_VOLUME,
-                WM8993_RIGHT_OPGA_VOLUME, 0, 63, 0, outpga_tlv),
-SOC_DOUBLE_R("Output Switch", WM8993_LEFT_OPGA_VOLUME,
-            WM8993_RIGHT_OPGA_VOLUME, 6, 1, 0),
-SOC_DOUBLE_R("Output ZC Switch", WM8993_LEFT_OPGA_VOLUME,
-            WM8993_RIGHT_OPGA_VOLUME, 7, 1, 0),
-
-SOC_SINGLE("Earpiece Switch", WM8993_HPOUT2_VOLUME, 5, 1, 1),
-SOC_SINGLE_TLV("Earpiece Volume", WM8993_HPOUT2_VOLUME, 4, 1, 1, earpiece_tlv),
-
-SOC_SINGLE_TLV("SPKL Input Volume", WM8993_SPKMIXL_ATTENUATION,
-              5, 1, 1, spkmix_tlv),
-SOC_SINGLE_TLV("SPKL IN1LP Volume", WM8993_SPKMIXL_ATTENUATION,
-              4, 1, 1, spkmix_tlv),
-SOC_SINGLE_TLV("SPKL Output Volume", WM8993_SPKMIXL_ATTENUATION,
-              3, 1, 1, spkmix_tlv),
 SOC_SINGLE_TLV("SPKL DAC Volume", WM8993_SPKMIXL_ATTENUATION,
-              2, 1, 1, spkmix_tlv),
-
-SOC_SINGLE_TLV("SPKR Input Volume", WM8993_SPKMIXR_ATTENUATION,
-              5, 1, 1, spkmix_tlv),
-SOC_SINGLE_TLV("SPKR IN1RP Volume", WM8993_SPKMIXR_ATTENUATION,
-              4, 1, 1, spkmix_tlv),
-SOC_SINGLE_TLV("SPKR Output Volume", WM8993_SPKMIXR_ATTENUATION,
-              3, 1, 1, spkmix_tlv),
-SOC_SINGLE_TLV("SPKR DAC Volume", WM8993_SPKMIXR_ATTENUATION,
-              2, 1, 1, spkmix_tlv),
-
-SOC_DOUBLE_R_TLV("Speaker Mixer Volume",
-                WM8993_SPKMIXL_ATTENUATION, WM8993_SPKMIXR_ATTENUATION,
-                0, 3, 1, spkmixout_tlv),
-SOC_DOUBLE_R_TLV("Speaker Volume",
-                WM8993_SPEAKER_VOLUME_LEFT, WM8993_SPEAKER_VOLUME_RIGHT,
-                0, 63, 0, outpga_tlv),
-SOC_DOUBLE_R("Speaker Switch",
-            WM8993_SPEAKER_VOLUME_LEFT, WM8993_SPEAKER_VOLUME_RIGHT,
-            6, 1, 0),
-SOC_DOUBLE_R("Speaker ZC Switch",
-            WM8993_SPEAKER_VOLUME_LEFT, WM8993_SPEAKER_VOLUME_RIGHT,
-            7, 1, 0),
-SOC_DOUBLE_TLV("Speaker Boost Volume", WM8993_SPKOUT_BOOST, 0, 3, 7, 0,
-              spkboost_tlv),
-SOC_ENUM("Speaker Reference", speaker_ref),
-SOC_ENUM("Speaker Mode", speaker_mode),
+              2, 1, 1, wm_hubs_spkmix_tlv),
 
-{
-       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = "Headphone Volume",
-       .access = SNDRV_CTL_ELEM_ACCESS_TLV_READ |
-                SNDRV_CTL_ELEM_ACCESS_READWRITE,
-       .tlv.p = outpga_tlv,
-       .info = snd_soc_info_volsw_2r,
-       .get = snd_soc_get_volsw_2r, .put = wm8993_put_dc_servo,
-       .private_value = (unsigned long)&(struct soc_mixer_control) {
-               .reg = WM8993_LEFT_OUTPUT_VOLUME,
-               .rreg = WM8993_RIGHT_OUTPUT_VOLUME,
-               .shift = 0, .max = 63
-       },
-},
-SOC_DOUBLE_R("Headphone Switch", WM8993_LEFT_OUTPUT_VOLUME,
-            WM8993_RIGHT_OUTPUT_VOLUME, 6, 1, 0),
-SOC_DOUBLE_R("Headphone ZC Switch", WM8993_LEFT_OUTPUT_VOLUME,
-            WM8993_RIGHT_OUTPUT_VOLUME, 7, 1, 0),
-
-SOC_SINGLE("LINEOUT1N Switch", WM8993_LINE_OUTPUTS_VOLUME, 6, 1, 1),
-SOC_SINGLE("LINEOUT1P Switch", WM8993_LINE_OUTPUTS_VOLUME, 5, 1, 1),
-SOC_SINGLE_TLV("LINEOUT1 Volume", WM8993_LINE_OUTPUTS_VOLUME, 4, 1, 1,
-              line_tlv),
-
-SOC_SINGLE("LINEOUT2N Switch", WM8993_LINE_OUTPUTS_VOLUME, 2, 1, 1),
-SOC_SINGLE("LINEOUT2P Switch", WM8993_LINE_OUTPUTS_VOLUME, 1, 1, 1),
-SOC_SINGLE_TLV("LINEOUT2 Volume", WM8993_LINE_OUTPUTS_VOLUME, 0, 1, 1,
-              line_tlv),
+SOC_SINGLE_TLV("SPKR DAC Volume", WM8993_SPKMIXR_ATTENUATION,
+              2, 1, 1, wm_hubs_spkmix_tlv),
 };
 
 static const struct snd_kcontrol_new wm8993_eq_controls[] = {
@@ -954,31 +692,6 @@ SOC_SINGLE_TLV("EQ4 Volume", WM8993_EQ5, 0, 24, 0, eq_tlv),
 SOC_SINGLE_TLV("EQ5 Volume", WM8993_EQ6, 0, 24, 0, eq_tlv),
 };
 
-static int wm8993_earpiece_event(struct snd_soc_dapm_widget *w,
-                                struct snd_kcontrol *control, int event)
-{
-       struct snd_soc_codec *codec = w->codec;
-       u16 reg = wm8993_read(codec, WM8993_ANTIPOP1) & ~WM8993_HPOUT2_IN_ENA;
-
-       switch (event) {
-       case SND_SOC_DAPM_PRE_PMU:
-               reg |= WM8993_HPOUT2_IN_ENA;
-               wm8993_write(codec, WM8993_ANTIPOP1, reg);
-               udelay(50);
-               break;
-
-       case SND_SOC_DAPM_POST_PMD:
-               wm8993_write(codec, WM8993_ANTIPOP1, reg);
-               break;
-
-       default:
-               BUG();
-               break;
-       }
-
-       return 0;
-}
-
 static int clk_sys_event(struct snd_soc_dapm_widget *w,
                         struct snd_kcontrol *kcontrol, int event)
 {
@@ -1004,12 +717,12 @@ static int clk_sys_event(struct snd_soc_dapm_widget *w,
  * Currently the only supported paths are the direct DAC->headphone
  * paths (which provide minimum power consumption anyway).
  */
-static int wm8993_class_w_put(struct snd_kcontrol *kcontrol,
-                             struct snd_ctl_elem_value *ucontrol)
+static int class_w_put(struct snd_kcontrol *kcontrol,
+                      struct snd_ctl_elem_value *ucontrol)
 {
        struct snd_soc_dapm_widget *widget = snd_kcontrol_chip(kcontrol);
        struct snd_soc_codec *codec = widget->codec;
-       struct wm8993_priv *wm8993 = codec->private_data;
+       struct wm8993_priv *wm8993 = snd_soc_codec_get_drvdata(codec);
        int ret;
 
        /* Turn it off if we're using the main output mixer */
@@ -1022,6 +735,7 @@ static int wm8993_class_w_put(struct snd_kcontrol *kcontrol,
                                            0);
                }
                wm8993->class_w_users++;
+               wm8993->hubs_data.class_w = true;
        }
 
        /* Implement the change */
@@ -1038,6 +752,7 @@ static int wm8993_class_w_put(struct snd_kcontrol *kcontrol,
                                            WM8993_CP_DYN_V);
                }
                wm8993->class_w_users--;
+               wm8993->hubs_data.class_w = false;
        }
 
        dev_dbg(codec->dev, "Indirect DAC use count now %d\n",
@@ -1050,133 +765,25 @@ static int wm8993_class_w_put(struct snd_kcontrol *kcontrol,
 {      .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
        .info = snd_soc_info_enum_double, \
        .get = snd_soc_dapm_get_enum_double, \
-       .put = wm8993_class_w_put, \
+       .put = class_w_put, \
        .private_value = (unsigned long)&xenum }
 
-static int hp_event(struct snd_soc_dapm_widget *w,
-                   struct snd_kcontrol *kcontrol, int event)
-{
-       struct snd_soc_codec *codec = w->codec;
-       unsigned int reg = wm8993_read(codec, WM8993_ANALOGUE_HP_0);
-
-       switch (event) {
-       case SND_SOC_DAPM_POST_PMU:
-               snd_soc_update_bits(codec, WM8993_CHARGE_PUMP_1,
-                                   WM8993_CP_ENA, WM8993_CP_ENA);
-
-               msleep(5);
-
-               snd_soc_update_bits(codec, WM8993_POWER_MANAGEMENT_1,
-                                   WM8993_HPOUT1L_ENA | WM8993_HPOUT1R_ENA,
-                                   WM8993_HPOUT1L_ENA | WM8993_HPOUT1R_ENA);
-
-               reg |= WM8993_HPOUT1L_DLY | WM8993_HPOUT1R_DLY;
-               wm8993_write(codec, WM8993_ANALOGUE_HP_0, reg);
-
-               /* Start the DC servo */
-               snd_soc_update_bits(codec, WM8993_DC_SERVO_0,
-                                   WM8993_DCS_ENA_CHAN_0 |
-                                   WM8993_DCS_ENA_CHAN_1 |
-                                   WM8993_DCS_TRIG_STARTUP_1 |
-                                   WM8993_DCS_TRIG_STARTUP_0,
-                                   WM8993_DCS_ENA_CHAN_0 |
-                                   WM8993_DCS_ENA_CHAN_1 |
-                                   WM8993_DCS_TRIG_STARTUP_1 |
-                                   WM8993_DCS_TRIG_STARTUP_0);
-               wait_for_dc_servo(codec, WM8993_DCS_TRIG_STARTUP_0 |
-                                 WM8993_DCS_TRIG_STARTUP_1);
-               snd_soc_update_bits(codec, WM8993_DC_SERVO_1,
-                                   WM8993_DCS_TIMER_PERIOD_01_MASK, 0xa);
-
-               reg |= WM8993_HPOUT1R_OUTP | WM8993_HPOUT1R_RMV_SHORT |
-                       WM8993_HPOUT1L_OUTP | WM8993_HPOUT1L_RMV_SHORT;
-               wm8993_write(codec, WM8993_ANALOGUE_HP_0, reg);
-               break;
-
-       case SND_SOC_DAPM_PRE_PMD:
-               reg &= ~(WM8993_HPOUT1L_RMV_SHORT |
-                        WM8993_HPOUT1L_DLY |
-                        WM8993_HPOUT1L_OUTP |
-                        WM8993_HPOUT1R_RMV_SHORT |
-                        WM8993_HPOUT1R_DLY |
-                        WM8993_HPOUT1R_OUTP);
-
-               snd_soc_update_bits(codec, WM8993_DC_SERVO_1,
-                                   WM8993_DCS_TIMER_PERIOD_01_MASK, 0);
-               snd_soc_update_bits(codec, WM8993_DC_SERVO_0,
-                                   WM8993_DCS_ENA_CHAN_0 |
-                                   WM8993_DCS_ENA_CHAN_1, 0);
-
-               wm8993_write(codec, WM8993_ANALOGUE_HP_0, reg);
-               snd_soc_update_bits(codec, WM8993_POWER_MANAGEMENT_1,
-                                   WM8993_HPOUT1L_ENA | WM8993_HPOUT1R_ENA,
-                                   0);
-
-               snd_soc_update_bits(codec, WM8993_CHARGE_PUMP_1,
-                                   WM8993_CP_ENA, 0);
-               break;
-       }
-
-       return 0;
-}
-
-static const struct snd_kcontrol_new in1l_pga[] = {
-SOC_DAPM_SINGLE("IN1LP Switch", WM8993_INPUT_MIXER2, 5, 1, 0),
-SOC_DAPM_SINGLE("IN1LN Switch", WM8993_INPUT_MIXER2, 4, 1, 0),
-};
-
-static const struct snd_kcontrol_new in1r_pga[] = {
-SOC_DAPM_SINGLE("IN1RP Switch", WM8993_INPUT_MIXER2, 1, 1, 0),
-SOC_DAPM_SINGLE("IN1RN Switch", WM8993_INPUT_MIXER2, 0, 1, 0),
-};
-
-static const struct snd_kcontrol_new in2l_pga[] = {
-SOC_DAPM_SINGLE("IN2LP Switch", WM8993_INPUT_MIXER2, 7, 1, 0),
-SOC_DAPM_SINGLE("IN2LN Switch", WM8993_INPUT_MIXER2, 6, 1, 0),
-};
-
-static const struct snd_kcontrol_new in2r_pga[] = {
-SOC_DAPM_SINGLE("IN2RP Switch", WM8993_INPUT_MIXER2, 3, 1, 0),
-SOC_DAPM_SINGLE("IN2RN Switch", WM8993_INPUT_MIXER2, 2, 1, 0),
-};
-
-static const struct snd_kcontrol_new mixinl[] = {
-SOC_DAPM_SINGLE("IN2L Switch", WM8993_INPUT_MIXER3, 8, 1, 0),
-SOC_DAPM_SINGLE("IN1L Switch", WM8993_INPUT_MIXER3, 5, 1, 0),
+static const char *hp_mux_text[] = {
+       "Mixer",
+       "DAC",
 };
 
-static const struct snd_kcontrol_new mixinr[] = {
-SOC_DAPM_SINGLE("IN2R Switch", WM8993_INPUT_MIXER4, 8, 1, 0),
-SOC_DAPM_SINGLE("IN1R Switch", WM8993_INPUT_MIXER4, 5, 1, 0),
-};
+static const struct soc_enum hpl_enum =
+       SOC_ENUM_SINGLE(WM8993_OUTPUT_MIXER1, 8, 2, hp_mux_text);
 
-static const struct snd_kcontrol_new left_output_mixer[] = {
-SOC_DAPM_SINGLE("Right Input Switch", WM8993_OUTPUT_MIXER1, 7, 1, 0),
-SOC_DAPM_SINGLE("Left Input Switch", WM8993_OUTPUT_MIXER1, 6, 1, 0),
-SOC_DAPM_SINGLE("IN2RN Switch", WM8993_OUTPUT_MIXER1, 5, 1, 0),
-SOC_DAPM_SINGLE("IN2LN Switch", WM8993_OUTPUT_MIXER1, 4, 1, 0),
-SOC_DAPM_SINGLE("IN2LP Switch", WM8993_OUTPUT_MIXER1, 1, 1, 0),
-SOC_DAPM_SINGLE("IN1R Switch", WM8993_OUTPUT_MIXER1, 3, 1, 0),
-SOC_DAPM_SINGLE("IN1L Switch", WM8993_OUTPUT_MIXER1, 2, 1, 0),
-SOC_DAPM_SINGLE("DAC Switch", WM8993_OUTPUT_MIXER1, 0, 1, 0),
-};
+static const struct snd_kcontrol_new hpl_mux =
+       SOC_DAPM_ENUM_W("Left Headphone Mux", hpl_enum);
 
-static const struct snd_kcontrol_new right_output_mixer[] = {
-SOC_DAPM_SINGLE("Left Input Switch", WM8993_OUTPUT_MIXER2, 7, 1, 0),
-SOC_DAPM_SINGLE("Right Input Switch", WM8993_OUTPUT_MIXER2, 6, 1, 0),
-SOC_DAPM_SINGLE("IN2LN Switch", WM8993_OUTPUT_MIXER2, 5, 1, 0),
-SOC_DAPM_SINGLE("IN2RN Switch", WM8993_OUTPUT_MIXER2, 4, 1, 0),
-SOC_DAPM_SINGLE("IN1L Switch", WM8993_OUTPUT_MIXER2, 3, 1, 0),
-SOC_DAPM_SINGLE("IN1R Switch", WM8993_OUTPUT_MIXER2, 2, 1, 0),
-SOC_DAPM_SINGLE("IN2RP Switch", WM8993_OUTPUT_MIXER2, 1, 1, 0),
-SOC_DAPM_SINGLE("DAC Switch", WM8993_OUTPUT_MIXER2, 0, 1, 0),
-};
+static const struct soc_enum hpr_enum =
+       SOC_ENUM_SINGLE(WM8993_OUTPUT_MIXER2, 8, 2, hp_mux_text);
 
-static const struct snd_kcontrol_new earpiece_mixer[] = {
-SOC_DAPM_SINGLE("Direct Voice Switch", WM8993_HPOUT2_MIXER, 5, 1, 0),
-SOC_DAPM_SINGLE("Left Output Switch", WM8993_HPOUT2_MIXER, 4, 1, 0),
-SOC_DAPM_SINGLE("Right Output Switch", WM8993_HPOUT2_MIXER, 3, 1, 0),
-};
+static const struct snd_kcontrol_new hpr_mux =
+       SOC_DAPM_ENUM_W("Right Headphone Mux", hpr_enum);
 
 static const struct snd_kcontrol_new left_speaker_mixer[] = {
 SOC_DAPM_SINGLE("Input Switch", WM8993_SPEAKER_MIXER, 7, 1, 0),
@@ -1192,347 +799,165 @@ SOC_DAPM_SINGLE("Output Switch", WM8993_SPEAKER_MIXER, 2, 1, 0),
 SOC_DAPM_SINGLE("DAC Switch", WM8993_SPEAKER_MIXER, 0, 1, 0),
 };
 
-static const struct snd_kcontrol_new left_speaker_boost[] = {
-SOC_DAPM_SINGLE("Direct Voice Switch", WM8993_SPKOUT_MIXERS, 5, 1, 0),
-SOC_DAPM_SINGLE("SPKL Switch", WM8993_SPKOUT_MIXERS, 4, 1, 0),
-SOC_DAPM_SINGLE("SPKR Switch", WM8993_SPKOUT_MIXERS, 3, 1, 0),
+static const char *aif_text[] = {
+       "Left", "Right"
 };
 
-static const struct snd_kcontrol_new right_speaker_boost[] = {
-SOC_DAPM_SINGLE("Direct Voice Switch", WM8993_SPKOUT_MIXERS, 2, 1, 0),
-SOC_DAPM_SINGLE("SPKL Switch", WM8993_SPKOUT_MIXERS, 1, 1, 0),
-SOC_DAPM_SINGLE("SPKR Switch", WM8993_SPKOUT_MIXERS, 0, 1, 0),
-};
+static const struct soc_enum aifoutl_enum =
+       SOC_ENUM_SINGLE(WM8993_AUDIO_INTERFACE_1, 15, 2, aif_text);
 
-static const char *hp_mux_text[] = {
-       "Mixer",
-       "DAC",
-};
+static const struct snd_kcontrol_new aifoutl_mux =
+       SOC_DAPM_ENUM("AIFOUTL Mux", aifoutl_enum);
 
-static const struct soc_enum hpl_enum =
-       SOC_ENUM_SINGLE(WM8993_OUTPUT_MIXER1, 8, 2, hp_mux_text);
+static const struct soc_enum aifoutr_enum =
+       SOC_ENUM_SINGLE(WM8993_AUDIO_INTERFACE_1, 14, 2, aif_text);
 
-static const struct snd_kcontrol_new hpl_mux =
-       SOC_DAPM_ENUM_W("Left Headphone Mux", hpl_enum);
+static const struct snd_kcontrol_new aifoutr_mux =
+       SOC_DAPM_ENUM("AIFOUTR Mux", aifoutr_enum);
 
-static const struct soc_enum hpr_enum =
-       SOC_ENUM_SINGLE(WM8993_OUTPUT_MIXER2, 8, 2, hp_mux_text);
+static const struct soc_enum aifinl_enum =
+       SOC_ENUM_SINGLE(WM8993_AUDIO_INTERFACE_2, 15, 2, aif_text);
 
-static const struct snd_kcontrol_new hpr_mux =
-       SOC_DAPM_ENUM_W("Right Headphone Mux", hpr_enum);
+static const struct snd_kcontrol_new aifinl_mux =
+       SOC_DAPM_ENUM("AIFINL Mux", aifinl_enum);
 
-static const struct snd_kcontrol_new line1_mix[] = {
-SOC_DAPM_SINGLE("IN1R Switch", WM8993_LINE_MIXER1, 2, 1, 0),
-SOC_DAPM_SINGLE("IN1L Switch", WM8993_LINE_MIXER1, 1, 1, 0),
-SOC_DAPM_SINGLE("Output Switch", WM8993_LINE_MIXER1, 0, 1, 0),
-};
+static const struct soc_enum aifinr_enum =
+       SOC_ENUM_SINGLE(WM8993_AUDIO_INTERFACE_2, 14, 2, aif_text);
 
-static const struct snd_kcontrol_new line1n_mix[] = {
-SOC_DAPM_SINGLE("Left Output Switch", WM8993_LINE_MIXER1, 6, 1, 0),
-SOC_DAPM_SINGLE("Right Output Switch", WM8993_LINE_MIXER1, 5, 1, 0),
-};
+static const struct snd_kcontrol_new aifinr_mux =
+       SOC_DAPM_ENUM("AIFINR Mux", aifinr_enum);
 
-static const struct snd_kcontrol_new line1p_mix[] = {
-SOC_DAPM_SINGLE("Left Output Switch", WM8993_LINE_MIXER1, 0, 1, 0),
+static const char *sidetone_text[] = {
+       "None", "Left", "Right"
 };
 
-static const struct snd_kcontrol_new line2_mix[] = {
-SOC_DAPM_SINGLE("IN2R Switch", WM8993_LINE_MIXER2, 2, 1, 0),
-SOC_DAPM_SINGLE("IN2L Switch", WM8993_LINE_MIXER2, 1, 1, 0),
-SOC_DAPM_SINGLE("Output Switch", WM8993_LINE_MIXER2, 0, 1, 0),
-};
+static const struct soc_enum sidetonel_enum =
+       SOC_ENUM_SINGLE(WM8993_DIGITAL_SIDE_TONE, 2, 3, sidetone_text);
 
-static const struct snd_kcontrol_new line2n_mix[] = {
-SOC_DAPM_SINGLE("Left Output Switch", WM8993_LINE_MIXER2, 6, 1, 0),
-SOC_DAPM_SINGLE("Right Output Switch", WM8993_LINE_MIXER2, 5, 1, 0),
-};
+static const struct snd_kcontrol_new sidetonel_mux =
+       SOC_DAPM_ENUM("Left Sidetone", sidetonel_enum);
 
-static const struct snd_kcontrol_new line2p_mix[] = {
-SOC_DAPM_SINGLE("Right Output Switch", WM8993_LINE_MIXER2, 0, 1, 0),
-};
+static const struct soc_enum sidetoner_enum =
+       SOC_ENUM_SINGLE(WM8993_DIGITAL_SIDE_TONE, 0, 3, sidetone_text);
 
-static const struct snd_soc_dapm_widget wm8993_dapm_widgets[] = {
-SND_SOC_DAPM_INPUT("IN1LN"),
-SND_SOC_DAPM_INPUT("IN1LP"),
-SND_SOC_DAPM_INPUT("IN2LN"),
-SND_SOC_DAPM_INPUT("IN2LP/VXRN"),
-SND_SOC_DAPM_INPUT("IN1RN"),
-SND_SOC_DAPM_INPUT("IN1RP"),
-SND_SOC_DAPM_INPUT("IN2RN"),
-SND_SOC_DAPM_INPUT("IN2RP/VXRP"),
+static const struct snd_kcontrol_new sidetoner_mux =
+       SOC_DAPM_ENUM("Right Sidetone", sidetoner_enum);
 
+static const struct snd_soc_dapm_widget wm8993_dapm_widgets[] = {
 SND_SOC_DAPM_SUPPLY("CLK_SYS", WM8993_BUS_CONTROL_1, 1, 0, clk_sys_event,
                    SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
 SND_SOC_DAPM_SUPPLY("TOCLK", WM8993_CLOCKING_1, 14, 0, NULL, 0),
 SND_SOC_DAPM_SUPPLY("CLK_DSP", WM8993_CLOCKING_3, 0, 0, NULL, 0),
 
-SND_SOC_DAPM_MICBIAS("MICBIAS2", WM8993_POWER_MANAGEMENT_1, 5, 0),
-SND_SOC_DAPM_MICBIAS("MICBIAS1", WM8993_POWER_MANAGEMENT_1, 4, 0),
-
-SND_SOC_DAPM_MIXER("IN1L PGA", WM8993_POWER_MANAGEMENT_2, 6, 0,
-                  in1l_pga, ARRAY_SIZE(in1l_pga)),
-SND_SOC_DAPM_MIXER("IN1R PGA", WM8993_POWER_MANAGEMENT_2, 4, 0,
-                  in1r_pga, ARRAY_SIZE(in1r_pga)),
+SND_SOC_DAPM_ADC("ADCL", NULL, WM8993_POWER_MANAGEMENT_2, 1, 0),
+SND_SOC_DAPM_ADC("ADCR", NULL, WM8993_POWER_MANAGEMENT_2, 0, 0),
 
-SND_SOC_DAPM_MIXER("IN2L PGA", WM8993_POWER_MANAGEMENT_2, 7, 0,
-                  in2l_pga, ARRAY_SIZE(in2l_pga)),
-SND_SOC_DAPM_MIXER("IN2R PGA", WM8993_POWER_MANAGEMENT_2, 5, 0,
-                  in2r_pga, ARRAY_SIZE(in2r_pga)),
+SND_SOC_DAPM_MUX("AIFOUTL Mux", SND_SOC_NOPM, 0, 0, &aifoutl_mux),
+SND_SOC_DAPM_MUX("AIFOUTR Mux", SND_SOC_NOPM, 0, 0, &aifoutr_mux),
 
-/* Dummy widgets to represent differential paths */
-SND_SOC_DAPM_PGA("Direct Voice", SND_SOC_NOPM, 0, 0, NULL, 0),
+SND_SOC_DAPM_AIF_OUT("AIFOUTL", "Capture", 0, SND_SOC_NOPM, 0, 0),
+SND_SOC_DAPM_AIF_OUT("AIFOUTR", "Capture", 1, SND_SOC_NOPM, 0, 0),
 
-SND_SOC_DAPM_MIXER("MIXINL", WM8993_POWER_MANAGEMENT_2, 9, 0,
-                  mixinl, ARRAY_SIZE(mixinl)),
-SND_SOC_DAPM_MIXER("MIXINR", WM8993_POWER_MANAGEMENT_2, 8, 0,
-                  mixinr, ARRAY_SIZE(mixinr)),
+SND_SOC_DAPM_AIF_IN("AIFINL", "Playback", 0, SND_SOC_NOPM, 0, 0),
+SND_SOC_DAPM_AIF_IN("AIFINR", "Playback", 1, SND_SOC_NOPM, 0, 0),
 
-SND_SOC_DAPM_ADC("ADCL", "Capture", WM8993_POWER_MANAGEMENT_2, 1, 0),
-SND_SOC_DAPM_ADC("ADCR", "Capture", WM8993_POWER_MANAGEMENT_2, 0, 0),
+SND_SOC_DAPM_MUX("DACL Mux", SND_SOC_NOPM, 0, 0, &aifinl_mux),
+SND_SOC_DAPM_MUX("DACR Mux", SND_SOC_NOPM, 0, 0, &aifinr_mux),
 
-SND_SOC_DAPM_DAC("DACL", "Playback", WM8993_POWER_MANAGEMENT_3, 1, 0),
-SND_SOC_DAPM_DAC("DACR", "Playback", WM8993_POWER_MANAGEMENT_3, 0, 0),
+SND_SOC_DAPM_MUX("DACL Sidetone", SND_SOC_NOPM, 0, 0, &sidetonel_mux),
+SND_SOC_DAPM_MUX("DACR Sidetone", SND_SOC_NOPM, 0, 0, &sidetoner_mux),
 
-SND_SOC_DAPM_MIXER("Left Output Mixer", WM8993_POWER_MANAGEMENT_3, 5, 0,
-                  left_output_mixer, ARRAY_SIZE(left_output_mixer)),
-SND_SOC_DAPM_MIXER("Right Output Mixer", WM8993_POWER_MANAGEMENT_3, 4, 0,
-                  right_output_mixer, ARRAY_SIZE(right_output_mixer)),
+SND_SOC_DAPM_DAC("DACL", NULL, WM8993_POWER_MANAGEMENT_3, 1, 0),
+SND_SOC_DAPM_DAC("DACR", NULL, WM8993_POWER_MANAGEMENT_3, 0, 0),
 
-SND_SOC_DAPM_PGA("Left Output PGA", WM8993_POWER_MANAGEMENT_3, 7, 0, NULL, 0),
-SND_SOC_DAPM_PGA("Right Output PGA", WM8993_POWER_MANAGEMENT_3, 6, 0, NULL, 0),
-
-SND_SOC_DAPM_MIXER("Earpiece Mixer", SND_SOC_NOPM, 0, 0,
-                  earpiece_mixer, ARRAY_SIZE(earpiece_mixer)),
-SND_SOC_DAPM_PGA_E("Earpiece Driver", WM8993_POWER_MANAGEMENT_1, 11, 0,
-                  NULL, 0, wm8993_earpiece_event,
-                  SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
+SND_SOC_DAPM_MUX("Left Headphone Mux", SND_SOC_NOPM, 0, 0, &hpl_mux),
+SND_SOC_DAPM_MUX("Right Headphone Mux", SND_SOC_NOPM, 0, 0, &hpr_mux),
 
 SND_SOC_DAPM_MIXER("SPKL", WM8993_POWER_MANAGEMENT_3, 8, 0,
                   left_speaker_mixer, ARRAY_SIZE(left_speaker_mixer)),
 SND_SOC_DAPM_MIXER("SPKR", WM8993_POWER_MANAGEMENT_3, 9, 0,
                   right_speaker_mixer, ARRAY_SIZE(right_speaker_mixer)),
 
-SND_SOC_DAPM_MIXER("SPKL Boost", SND_SOC_NOPM, 0, 0,
-                  left_speaker_boost, ARRAY_SIZE(left_speaker_boost)),
-SND_SOC_DAPM_MIXER("SPKR Boost", SND_SOC_NOPM, 0, 0,
-                  right_speaker_boost, ARRAY_SIZE(right_speaker_boost)),
-
-SND_SOC_DAPM_PGA("SPKL Driver", WM8993_POWER_MANAGEMENT_1, 12, 0,
-                NULL, 0),
-SND_SOC_DAPM_PGA("SPKR Driver", WM8993_POWER_MANAGEMENT_1, 13, 0,
-                NULL, 0),
-
-SND_SOC_DAPM_MUX("Left Headphone Mux", SND_SOC_NOPM, 0, 0, &hpl_mux),
-SND_SOC_DAPM_MUX("Right Headphone Mux", SND_SOC_NOPM, 0, 0, &hpr_mux),
-SND_SOC_DAPM_PGA_E("Headphone PGA", SND_SOC_NOPM, 0, 0,
-                  NULL, 0,
-                  hp_event, SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD),
-
-SND_SOC_DAPM_MIXER("LINEOUT1 Mixer", SND_SOC_NOPM, 0, 0,
-                  line1_mix, ARRAY_SIZE(line1_mix)),
-SND_SOC_DAPM_MIXER("LINEOUT2 Mixer", SND_SOC_NOPM, 0, 0,
-                  line2_mix, ARRAY_SIZE(line2_mix)),
-
-SND_SOC_DAPM_MIXER("LINEOUT1N Mixer", SND_SOC_NOPM, 0, 0,
-                  line1n_mix, ARRAY_SIZE(line1n_mix)),
-SND_SOC_DAPM_MIXER("LINEOUT1P Mixer", SND_SOC_NOPM, 0, 0,
-                  line1p_mix, ARRAY_SIZE(line1p_mix)),
-SND_SOC_DAPM_MIXER("LINEOUT2N Mixer", SND_SOC_NOPM, 0, 0,
-                  line2n_mix, ARRAY_SIZE(line2n_mix)),
-SND_SOC_DAPM_MIXER("LINEOUT2P Mixer", SND_SOC_NOPM, 0, 0,
-                  line2p_mix, ARRAY_SIZE(line2p_mix)),
-
-SND_SOC_DAPM_PGA("LINEOUT1N Driver", WM8993_POWER_MANAGEMENT_3, 13, 0,
-                NULL, 0),
-SND_SOC_DAPM_PGA("LINEOUT1P Driver", WM8993_POWER_MANAGEMENT_3, 12, 0,
-                NULL, 0),
-SND_SOC_DAPM_PGA("LINEOUT2N Driver", WM8993_POWER_MANAGEMENT_3, 11, 0,
-                NULL, 0),
-SND_SOC_DAPM_PGA("LINEOUT2P Driver", WM8993_POWER_MANAGEMENT_3, 10, 0,
-                NULL, 0),
-
-SND_SOC_DAPM_OUTPUT("SPKOUTLP"),
-SND_SOC_DAPM_OUTPUT("SPKOUTLN"),
-SND_SOC_DAPM_OUTPUT("SPKOUTRP"),
-SND_SOC_DAPM_OUTPUT("SPKOUTRN"),
-SND_SOC_DAPM_OUTPUT("HPOUT1L"),
-SND_SOC_DAPM_OUTPUT("HPOUT1R"),
-SND_SOC_DAPM_OUTPUT("HPOUT2P"),
-SND_SOC_DAPM_OUTPUT("HPOUT2N"),
-SND_SOC_DAPM_OUTPUT("LINEOUT1P"),
-SND_SOC_DAPM_OUTPUT("LINEOUT1N"),
-SND_SOC_DAPM_OUTPUT("LINEOUT2P"),
-SND_SOC_DAPM_OUTPUT("LINEOUT2N"),
 };
 
 static const struct snd_soc_dapm_route routes[] = {
-       { "IN1L PGA", "IN1LP Switch", "IN1LP" },
-       { "IN1L PGA", "IN1LN Switch", "IN1LN" },
-
-       { "IN1R PGA", "IN1RP Switch", "IN1RP" },
-       { "IN1R PGA", "IN1RN Switch", "IN1RN" },
-
-       { "IN2L PGA", "IN2LP Switch", "IN2LP/VXRN" },
-       { "IN2L PGA", "IN2LN Switch", "IN2LN" },
-
-       { "IN2R PGA", "IN2RP Switch", "IN2RP/VXRP" },
-       { "IN2R PGA", "IN2RN Switch", "IN2RN" },
-
-       { "Direct Voice", NULL, "IN2LP/VXRN" },
-       { "Direct Voice", NULL, "IN2RP/VXRP" },
-
-       { "MIXINL", "IN1L Switch", "IN1L PGA" },
-       { "MIXINL", "IN2L Switch", "IN2L PGA" },
-       { "MIXINL", NULL, "Direct Voice" },
-       { "MIXINL", NULL, "IN1LP" },
-       { "MIXINL", NULL, "Left Output Mixer" },
-
-       { "MIXINR", "IN1R Switch", "IN1R PGA" },
-       { "MIXINR", "IN2R Switch", "IN2R PGA" },
-       { "MIXINR", NULL, "Direct Voice" },
-       { "MIXINR", NULL, "IN1RP" },
-       { "MIXINR", NULL, "Right Output Mixer" },
-
-       { "ADCL", NULL, "MIXINL" },
        { "ADCL", NULL, "CLK_SYS" },
        { "ADCL", NULL, "CLK_DSP" },
-       { "ADCR", NULL, "MIXINR" },
        { "ADCR", NULL, "CLK_SYS" },
        { "ADCR", NULL, "CLK_DSP" },
 
+       { "AIFOUTL Mux", "Left", "ADCL" },
+       { "AIFOUTL Mux", "Right", "ADCR" },
+       { "AIFOUTR Mux", "Left", "ADCL" },
+       { "AIFOUTR Mux", "Right", "ADCR" },
+
+       { "AIFOUTL", NULL, "AIFOUTL Mux" },
+       { "AIFOUTR", NULL, "AIFOUTR Mux" },
+
+       { "DACL Mux", "Left", "AIFINL" },
+       { "DACL Mux", "Right", "AIFINR" },
+       { "DACR Mux", "Left", "AIFINL" },
+       { "DACR Mux", "Right", "AIFINR" },
+
+       { "DACL Sidetone", "Left", "ADCL" },
+       { "DACL Sidetone", "Right", "ADCR" },
+       { "DACR Sidetone", "Left", "ADCL" },
+       { "DACR Sidetone", "Right", "ADCR" },
+
        { "DACL", NULL, "CLK_SYS" },
        { "DACL", NULL, "CLK_DSP" },
+       { "DACL", NULL, "DACL Mux" },
+       { "DACL", NULL, "DACL Sidetone" },
        { "DACR", NULL, "CLK_SYS" },
        { "DACR", NULL, "CLK_DSP" },
+       { "DACR", NULL, "DACR Mux" },
+       { "DACR", NULL, "DACR Sidetone" },
 
-       { "Left Output Mixer", "Left Input Switch", "MIXINL" },
-       { "Left Output Mixer", "Right Input Switch", "MIXINR" },
-       { "Left Output Mixer", "IN2RN Switch", "IN2RN" },
-       { "Left Output Mixer", "IN2LN Switch", "IN2LN" },
-       { "Left Output Mixer", "IN2LP Switch", "IN2LP/VXRN" },
-       { "Left Output Mixer", "IN1L Switch", "IN1L PGA" },
-       { "Left Output Mixer", "IN1R Switch", "IN1R PGA" },
        { "Left Output Mixer", "DAC Switch", "DACL" },
 
-       { "Right Output Mixer", "Left Input Switch", "MIXINL" },
-       { "Right Output Mixer", "Right Input Switch", "MIXINR" },
-       { "Right Output Mixer", "IN2LN Switch", "IN2LN" },
-       { "Right Output Mixer", "IN2RN Switch", "IN2RN" },
-       { "Right Output Mixer", "IN2RP Switch", "IN2RP/VXRP" },
-       { "Right Output Mixer", "IN1L Switch", "IN1L PGA" },
-       { "Right Output Mixer", "IN1R Switch", "IN1R PGA" },
        { "Right Output Mixer", "DAC Switch", "DACR" },
 
-       { "Left Output PGA", NULL, "Left Output Mixer" },
        { "Left Output PGA", NULL, "CLK_SYS" },
-       { "Left Output PGA", NULL, "TOCLK" },
 
-       { "Right Output PGA", NULL, "Right Output Mixer" },
        { "Right Output PGA", NULL, "CLK_SYS" },
-       { "Right Output PGA", NULL, "TOCLK" },
-
-       { "Earpiece Mixer", "Direct Voice Switch", "Direct Voice" },
-       { "Earpiece Mixer", "Left Output Switch", "Left Output PGA" },
-       { "Earpiece Mixer", "Right Output Switch", "Right Output PGA" },
-
-       { "Earpiece Driver", NULL, "Earpiece Mixer" },
-       { "HPOUT2N", NULL, "Earpiece Driver" },
-       { "HPOUT2P", NULL, "Earpiece Driver" },
 
-       { "SPKL", "Input Switch", "MIXINL" },
-       { "SPKL", "IN1LP Switch", "IN1LP" },
-       { "SPKL", "Output Switch", "Left Output Mixer" },
        { "SPKL", "DAC Switch", "DACL" },
        { "SPKL", NULL, "CLK_SYS" },
-       { "SPKL", NULL, "TOCLK" },
 
-       { "SPKR", "Input Switch", "MIXINR" },
-       { "SPKR", "IN1RP Switch", "IN1RP" },
-       { "SPKR", "Output Switch", "Right Output Mixer" },
        { "SPKR", "DAC Switch", "DACR" },
        { "SPKR", NULL, "CLK_SYS" },
-       { "SPKR", NULL, "TOCLK" },
-
-       { "SPKL Boost", "Direct Voice Switch", "Direct Voice" },
-       { "SPKL Boost", "SPKL Switch", "SPKL" },
-       { "SPKL Boost", "SPKR Switch", "SPKR" },
-
-       { "SPKR Boost", "Direct Voice Switch", "Direct Voice" },
-       { "SPKR Boost", "SPKR Switch", "SPKR" },
-       { "SPKR Boost", "SPKL Switch", "SPKL" },
-
-       { "SPKL Driver", NULL, "SPKL Boost" },
-       { "SPKL Driver", NULL, "CLK_SYS" },
-
-       { "SPKR Driver", NULL, "SPKR Boost" },
-       { "SPKR Driver", NULL, "CLK_SYS" },
-
-       { "SPKOUTLP", NULL, "SPKL Driver" },
-       { "SPKOUTLN", NULL, "SPKL Driver" },
-       { "SPKOUTRP", NULL, "SPKR Driver" },
-       { "SPKOUTRN", NULL, "SPKR Driver" },
 
        { "Left Headphone Mux", "DAC", "DACL" },
-       { "Left Headphone Mux", "Mixer", "Left Output Mixer" },
        { "Right Headphone Mux", "DAC", "DACR" },
-       { "Right Headphone Mux", "Mixer", "Right Output Mixer" },
-
-       { "Headphone PGA", NULL, "Left Headphone Mux" },
-       { "Headphone PGA", NULL, "Right Headphone Mux" },
-       { "Headphone PGA", NULL, "CLK_SYS" },
-       { "Headphone PGA", NULL, "TOCLK" },
-
-       { "HPOUT1L", NULL, "Headphone PGA" },
-       { "HPOUT1R", NULL, "Headphone PGA" },
-
-       { "LINEOUT1N", NULL, "LINEOUT1N Driver" },
-       { "LINEOUT1P", NULL, "LINEOUT1P Driver" },
-       { "LINEOUT2N", NULL, "LINEOUT2N Driver" },
-       { "LINEOUT2P", NULL, "LINEOUT2P Driver" },
 };
 
-static const struct snd_soc_dapm_route lineout1_diff_routes[] = {
-       { "LINEOUT1 Mixer", "IN1L Switch", "IN1L PGA" },
-       { "LINEOUT1 Mixer", "IN1R Switch", "IN1R PGA" },
-       { "LINEOUT1 Mixer", "Output Switch", "Left Output Mixer" },
-
-       { "LINEOUT1N Driver", NULL, "LINEOUT1 Mixer" },
-       { "LINEOUT1P Driver", NULL, "LINEOUT1 Mixer" },
-};
-
-static const struct snd_soc_dapm_route lineout1_se_routes[] = {
-       { "LINEOUT1N Mixer", "Left Output Switch", "Left Output Mixer" },
-       { "LINEOUT1N Mixer", "Right Output Switch", "Left Output Mixer" },
-
-       { "LINEOUT1P Mixer", "Left Output Switch", "Left Output Mixer" },
-
-       { "LINEOUT1N Driver", NULL, "LINEOUT1N Mixer" },
-       { "LINEOUT1P Driver", NULL, "LINEOUT1P Mixer" },
-};
-
-static const struct snd_soc_dapm_route lineout2_diff_routes[] = {
-       { "LINEOUT2 Mixer", "IN2L Switch", "IN2L PGA" },
-       { "LINEOUT2 Mixer", "IN2R Switch", "IN2R PGA" },
-       { "LINEOUT2 Mixer", "Output Switch", "Right Output Mixer" },
+static void wm8993_cache_restore(struct snd_soc_codec *codec)
+{
+       u16 *cache = codec->reg_cache;
+       int i;
 
-       { "LINEOUT2N Driver", NULL, "LINEOUT2 Mixer" },
-       { "LINEOUT2P Driver", NULL, "LINEOUT2 Mixer" },
-};
+       if (!codec->cache_sync)
+               return;
 
-static const struct snd_soc_dapm_route lineout2_se_routes[] = {
-       { "LINEOUT2N Mixer", "Left Output Switch", "Left Output Mixer" },
-       { "LINEOUT2N Mixer", "Right Output Switch", "Left Output Mixer" },
+       /* Reenable hardware writes */
+       codec->cache_only = 0;
 
-       { "LINEOUT2P Mixer", "Right Output Switch", "Right Output Mixer" },
+       /* Restore the register settings */
+       for (i = 1; i < WM8993_MAX_REGISTER; i++) {
+               if (cache[i] == wm8993_reg_defaults[i])
+                       continue;
+               snd_soc_write(codec, i, cache[i]);
+       }
 
-       { "LINEOUT2N Driver", NULL, "LINEOUT2N Mixer" },
-       { "LINEOUT2P Driver", NULL, "LINEOUT2P Mixer" },
-};
+       /* We're in sync again */
+       codec->cache_sync = 0;
+}
 
 static int wm8993_set_bias_level(struct snd_soc_codec *codec,
                                 enum snd_soc_bias_level level)
 {
-       struct wm8993_priv *wm8993 = codec->private_data;
+       struct wm8993_priv *wm8993 = snd_soc_codec_get_drvdata(codec);
+       int ret;
 
        switch (level) {
        case SND_SOC_BIAS_ON:
@@ -1545,7 +970,19 @@ static int wm8993_set_bias_level(struct snd_soc_codec *codec,
                break;
 
        case SND_SOC_BIAS_STANDBY:
-               if (codec->bias_level == SND_SOC_BIAS_OFF) {
+               if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) {
+                       ret = regulator_bulk_enable(ARRAY_SIZE(wm8993->supplies),
+                                                   wm8993->supplies);
+                       if (ret != 0)
+                               return ret;
+
+                       wm8993_cache_restore(codec);
+
+                       /* Tune DC servo configuration */
+                       snd_soc_write(codec, 0x44, 3);
+                       snd_soc_write(codec, 0x56, 3);
+                       snd_soc_write(codec, 0x44, 0);
+
                        /* Bring up VMID with fast soft start */
                        snd_soc_update_bits(codec, WM8993_ANTIPOP2,
                                            WM8993_STARTUP_BIAS_ENA |
@@ -1593,10 +1030,22 @@ static int wm8993_set_bias_level(struct snd_soc_codec *codec,
                snd_soc_update_bits(codec, WM8993_POWER_MANAGEMENT_1,
                                    WM8993_VMID_SEL_MASK | WM8993_BIAS_ENA,
                                    0);
+
+#ifdef CONFIG_REGULATOR
+               /* Post 2.6.34 we will be able to get a callback when
+                * the regulators are disabled which we can use but
+               * for now just assume that the power will be cut if
+               * the regulator API is in use.
+               */
+               codec->cache_sync = 1;
+#endif
+
+               regulator_bulk_disable(ARRAY_SIZE(wm8993->supplies),
+                                      wm8993->supplies);
                break;
        }
 
-       codec->bias_level = level;
+       codec->dapm.bias_level = level;
 
        return 0;
 }
@@ -1605,7 +1054,7 @@ static int wm8993_set_sysclk(struct snd_soc_dai *codec_dai,
                             int clk_id, unsigned int freq, int dir)
 {
        struct snd_soc_codec *codec = codec_dai->codec;
-       struct wm8993_priv *wm8993 = codec->private_data;
+       struct wm8993_priv *wm8993 = snd_soc_codec_get_drvdata(codec);
 
        switch (clk_id) {
        case WM8993_SYSCLK_MCLK:
@@ -1625,9 +1074,9 @@ static int wm8993_set_dai_fmt(struct snd_soc_dai *dai,
                              unsigned int fmt)
 {
        struct snd_soc_codec *codec = dai->codec;
-       struct wm8993_priv *wm8993 = codec->private_data;
-       unsigned int aif1 = wm8993_read(codec, WM8993_AUDIO_INTERFACE_1);
-       unsigned int aif4 = wm8993_read(codec, WM8993_AUDIO_INTERFACE_4);
+       struct wm8993_priv *wm8993 = snd_soc_codec_get_drvdata(codec);
+       unsigned int aif1 = snd_soc_read(codec, WM8993_AUDIO_INTERFACE_1);
+       unsigned int aif4 = snd_soc_read(codec, WM8993_AUDIO_INTERFACE_4);
 
        aif1 &= ~(WM8993_BCLK_DIR | WM8993_AIF_BCLK_INV |
                  WM8993_AIF_LRCLK_INV | WM8993_AIF_FMT_MASK);
@@ -1710,8 +1159,8 @@ static int wm8993_set_dai_fmt(struct snd_soc_dai *dai,
                return -EINVAL;
        }
 
-       wm8993_write(codec, WM8993_AUDIO_INTERFACE_1, aif1);
-       wm8993_write(codec, WM8993_AUDIO_INTERFACE_4, aif4);
+       snd_soc_write(codec, WM8993_AUDIO_INTERFACE_1, aif1);
+       snd_soc_write(codec, WM8993_AUDIO_INTERFACE_4, aif4);
 
        return 0;
 }
@@ -1721,43 +1170,49 @@ static int wm8993_hw_params(struct snd_pcm_substream *substream,
                            struct snd_soc_dai *dai)
 {
        struct snd_soc_codec *codec = dai->codec;
-       struct wm8993_priv *wm8993 = codec->private_data;
+       struct wm8993_priv *wm8993 = snd_soc_codec_get_drvdata(codec);
        int ret, i, best, best_val, cur_val;
        unsigned int clocking1, clocking3, aif1, aif4;
 
-       clocking1 = wm8993_read(codec, WM8993_CLOCKING_1);
+       clocking1 = snd_soc_read(codec, WM8993_CLOCKING_1);
        clocking1 &= ~WM8993_BCLK_DIV_MASK;
 
-       clocking3 = wm8993_read(codec, WM8993_CLOCKING_3);
+       clocking3 = snd_soc_read(codec, WM8993_CLOCKING_3);
        clocking3 &= ~(WM8993_CLK_SYS_RATE_MASK | WM8993_SAMPLE_RATE_MASK);
 
-       aif1 = wm8993_read(codec, WM8993_AUDIO_INTERFACE_1);
+       aif1 = snd_soc_read(codec, WM8993_AUDIO_INTERFACE_1);
        aif1 &= ~WM8993_AIF_WL_MASK;
 
-       aif4 = wm8993_read(codec, WM8993_AUDIO_INTERFACE_4);
+       aif4 = snd_soc_read(codec, WM8993_AUDIO_INTERFACE_4);
        aif4 &= ~WM8993_LRCLK_RATE_MASK;
 
        /* What BCLK do we need? */
        wm8993->fs = params_rate(params);
        wm8993->bclk = 2 * wm8993->fs;
-       switch (params_format(params)) {
-       case SNDRV_PCM_FORMAT_S16_LE:
-               wm8993->bclk *= 16;
-               break;
-       case SNDRV_PCM_FORMAT_S20_3LE:
-               wm8993->bclk *= 20;
-               aif1 |= 0x8;
-               break;
-       case SNDRV_PCM_FORMAT_S24_LE:
-               wm8993->bclk *= 24;
-               aif1 |= 0x10;
-               break;
-       case SNDRV_PCM_FORMAT_S32_LE:
-               wm8993->bclk *= 32;
-               aif1 |= 0x18;
-               break;
-       default:
-               return -EINVAL;
+       if (wm8993->tdm_slots) {
+               dev_dbg(codec->dev, "Configuring for %d %d bit TDM slots\n",
+                       wm8993->tdm_slots, wm8993->tdm_width);
+               wm8993->bclk *= wm8993->tdm_width * wm8993->tdm_slots;
+       } else {
+               switch (params_format(params)) {
+               case SNDRV_PCM_FORMAT_S16_LE:
+                       wm8993->bclk *= 16;
+                       break;
+               case SNDRV_PCM_FORMAT_S20_3LE:
+                       wm8993->bclk *= 20;
+                       aif1 |= 0x8;
+                       break;
+               case SNDRV_PCM_FORMAT_S24_LE:
+                       wm8993->bclk *= 24;
+                       aif1 |= 0x10;
+                       break;
+               case SNDRV_PCM_FORMAT_S32_LE:
+                       wm8993->bclk *= 32;
+                       aif1 |= 0x18;
+                       break;
+               default:
+                       return -EINVAL;
+               }
        }
 
        dev_dbg(codec->dev, "Target BCLK is %dHz\n", wm8993->bclk);
@@ -1796,7 +1251,8 @@ static int wm8993_hw_params(struct snd_pcm_substream *substream,
        }
        dev_dbg(codec->dev, "Selected SAMPLE_RATE of %dHz\n",
                sample_rates[best].rate);
-       clocking3 |= (sample_rates[i].sample_rate << WM8993_SAMPLE_RATE_SHIFT);
+       clocking3 |= (sample_rates[best].sample_rate
+                     << WM8993_SAMPLE_RATE_SHIFT);
 
        /* BCLK_DIV */
        best = 0;
@@ -1820,14 +1276,14 @@ static int wm8993_hw_params(struct snd_pcm_substream *substream,
        dev_dbg(codec->dev, "LRCLK_RATE is %d\n", wm8993->bclk / wm8993->fs);
        aif4 |= wm8993->bclk / wm8993->fs;
 
-       wm8993_write(codec, WM8993_CLOCKING_1, clocking1);
-       wm8993_write(codec, WM8993_CLOCKING_3, clocking3);
-       wm8993_write(codec, WM8993_AUDIO_INTERFACE_1, aif1);
-       wm8993_write(codec, WM8993_AUDIO_INTERFACE_4, aif4);
+       snd_soc_write(codec, WM8993_CLOCKING_1, clocking1);
+       snd_soc_write(codec, WM8993_CLOCKING_3, clocking3);
+       snd_soc_write(codec, WM8993_AUDIO_INTERFACE_1, aif1);
+       snd_soc_write(codec, WM8993_AUDIO_INTERFACE_4, aif4);
 
        /* ReTune Mobile? */
        if (wm8993->pdata.num_retune_configs) {
-               u16 eq1 = wm8993_read(codec, WM8993_EQ1);
+               u16 eq1 = snd_soc_read(codec, WM8993_EQ1);
                struct wm8993_retune_mobile_setting *s;
 
                best = 0;
@@ -1850,7 +1306,7 @@ static int wm8993_hw_params(struct snd_pcm_substream *substream,
                snd_soc_update_bits(codec, WM8993_EQ1, WM8993_EQ_ENA, 0);
 
                for (i = 1; i < ARRAY_SIZE(s->config); i++)
-                       wm8993_write(codec, WM8993_EQ1 + i, s->config[i]);
+                       snd_soc_write(codec, WM8993_EQ1 + i, s->config[i]);
 
                snd_soc_update_bits(codec, WM8993_EQ1, WM8993_EQ_ENA, eq1);
        }
@@ -1863,14 +1319,68 @@ static int wm8993_digital_mute(struct snd_soc_dai *codec_dai, int mute)
        struct snd_soc_codec *codec = codec_dai->codec;
        unsigned int reg;
 
-       reg = wm8993_read(codec, WM8993_DAC_CTRL);
+       reg = snd_soc_read(codec, WM8993_DAC_CTRL);
 
        if (mute)
                reg |= WM8993_DAC_MUTE;
        else
                reg &= ~WM8993_DAC_MUTE;
 
-       wm8993_write(codec, WM8993_DAC_CTRL, reg);
+       snd_soc_write(codec, WM8993_DAC_CTRL, reg);
+
+       return 0;
+}
+
+static int wm8993_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask,
+                              unsigned int rx_mask, int slots, int slot_width)
+{
+       struct snd_soc_codec *codec = dai->codec;
+       struct wm8993_priv *wm8993 = snd_soc_codec_get_drvdata(codec);
+       int aif1 = 0;
+       int aif2 = 0;
+
+       /* Don't need to validate anything if we're turning off TDM */
+       if (slots == 0) {
+               wm8993->tdm_slots = 0;
+               goto out;
+       }
+
+       /* Note that we allow configurations we can't handle ourselves - 
+        * for example, we can generate clocks for slots 2 and up even if
+        * we can't use those slots ourselves.
+        */
+       aif1 |= WM8993_AIFADC_TDM;
+       aif2 |= WM8993_AIFDAC_TDM;
+
+       switch (rx_mask) {
+       case 3:
+               break;
+       case 0xc:
+               aif1 |= WM8993_AIFADC_TDM_CHAN;
+               break;
+       default:
+               return -EINVAL;
+       }
+
+
+       switch (tx_mask) {
+       case 3:
+               break;
+       case 0xc:
+               aif2 |= WM8993_AIFDAC_TDM_CHAN;
+               break;
+       default:
+               return -EINVAL;
+       }
+
+out:
+       wm8993->tdm_width = slot_width;
+       wm8993->tdm_slots = slots / 2;
+
+       snd_soc_update_bits(codec, WM8993_AUDIO_INTERFACE_1,
+                           WM8993_AIFADC_TDM | WM8993_AIFADC_TDM_CHAN, aif1);
+       snd_soc_update_bits(codec, WM8993_AUDIO_INTERFACE_2,
+                           WM8993_AIFDAC_TDM | WM8993_AIFDAC_TDM_CHAN, aif2);
 
        return 0;
 }
@@ -1881,6 +1391,7 @@ static struct snd_soc_dai_ops wm8993_ops = {
        .hw_params = wm8993_hw_params,
        .digital_mute = wm8993_digital_mute,
        .set_pll = wm8993_set_fll,
+       .set_tdm_slot = wm8993_set_tdm_slot,
 };
 
 #define WM8993_RATES SNDRV_PCM_RATE_8000_48000
@@ -1890,8 +1401,8 @@ static struct snd_soc_dai_ops wm8993_ops = {
                        SNDRV_PCM_FMTBIT_S24_LE |\
                        SNDRV_PCM_FMTBIT_S32_LE)
 
-struct snd_soc_dai wm8993_dai = {
-       .name = "WM8993",
+static struct snd_soc_dai_driver wm8993_dai = {
+       .name = "wm8993-hifi",
        .playback = {
                .stream_name = "Playback",
                .channels_min = 1,
@@ -1909,32 +1420,82 @@ struct snd_soc_dai wm8993_dai = {
        .ops = &wm8993_ops,
        .symmetric_rates = 1,
 };
-EXPORT_SYMBOL_GPL(wm8993_dai);
-
-static struct snd_soc_codec *wm8993_codec;
 
-static int wm8993_probe(struct platform_device *pdev)
+static int wm8993_probe(struct snd_soc_codec *codec)
 {
-       struct snd_soc_device *socdev = platform_get_drvdata(pdev);
-       struct snd_soc_codec *codec;
-       struct wm8993_priv *wm8993;
-       int ret = 0;
+       struct wm8993_priv *wm8993 = snd_soc_codec_get_drvdata(codec);
+       struct snd_soc_dapm_context *dapm = &codec->dapm;
+       int ret, i, val;
+
+       wm8993->hubs_data.hp_startup_mode = 1;
+       wm8993->hubs_data.dcs_codes = -2;
 
-       if (!wm8993_codec) {
-               dev_err(&pdev->dev, "I2C device not yet probed\n");
-               goto err;
+       ret = snd_soc_codec_set_cache_io(codec, 8, 16, SND_SOC_I2C);
+       if (ret != 0) {
+               dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);
+               return ret;
        }
 
-       socdev->card->codec = wm8993_codec;
-       codec = wm8993_codec;
-       wm8993 = codec->private_data;
+       for (i = 0; i < ARRAY_SIZE(wm8993->supplies); i++)
+               wm8993->supplies[i].supply = wm8993_supply_names[i];
 
-       ret = snd_soc_new_pcms(socdev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1);
-       if (ret < 0) {
-               dev_err(codec->dev, "failed to create pcms\n");
-               goto err;
+       ret = regulator_bulk_get(codec->dev, ARRAY_SIZE(wm8993->supplies),
+                                wm8993->supplies);
+       if (ret != 0) {
+               dev_err(codec->dev, "Failed to request supplies: %d\n", ret);
+               return ret;
+       }
+
+       ret = regulator_bulk_enable(ARRAY_SIZE(wm8993->supplies),
+                                   wm8993->supplies);
+       if (ret != 0) {
+               dev_err(codec->dev, "Failed to enable supplies: %d\n", ret);
+               goto err_get;
        }
 
+       val = snd_soc_read(codec, WM8993_SOFTWARE_RESET);
+       if (val != wm8993_reg_defaults[WM8993_SOFTWARE_RESET]) {
+               dev_err(codec->dev, "Invalid ID register value %x\n", val);
+               ret = -EINVAL;
+               goto err_enable;
+       }
+
+       ret = snd_soc_write(codec, WM8993_SOFTWARE_RESET, 0xffff);
+       if (ret != 0)
+               goto err_enable;
+
+       codec->cache_only = 1;
+
+       /* By default we're using the output mixers */
+       wm8993->class_w_users = 2;
+
+       /* Latch volume update bits and default ZC on */
+       snd_soc_update_bits(codec, WM8993_RIGHT_DAC_DIGITAL_VOLUME,
+                           WM8993_DAC_VU, WM8993_DAC_VU);
+       snd_soc_update_bits(codec, WM8993_RIGHT_ADC_DIGITAL_VOLUME,
+                           WM8993_ADC_VU, WM8993_ADC_VU);
+
+       /* Manualy manage the HPOUT sequencing for independent stereo
+        * control. */
+       snd_soc_update_bits(codec, WM8993_ANALOGUE_HP_0,
+                           WM8993_HPOUT1_AUTO_PU, 0);
+
+       /* Use automatic clock configuration */
+       snd_soc_update_bits(codec, WM8993_CLOCKING_4, WM8993_SR_MODE, 0);
+
+       wm_hubs_handle_analogue_pdata(codec, wm8993->pdata.lineout1_diff,
+                                     wm8993->pdata.lineout2_diff,
+                                     wm8993->pdata.lineout1fb,
+                                     wm8993->pdata.lineout2fb,
+                                     wm8993->pdata.jd_scthr,
+                                     wm8993->pdata.jd_thr,
+                                     wm8993->pdata.micbias1_lvl,
+                                     wm8993->pdata.micbias2_lvl);
+
+       ret = wm8993_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
+       if (ret != 0)
+               goto err_enable;
+
        snd_soc_add_controls(codec, wm8993_snd_controls,
                             ARRAY_SIZE(wm8993_snd_controls));
        if (wm8993->pdata.num_retune_configs != 0) {
@@ -1945,220 +1506,119 @@ static int wm8993_probe(struct platform_device *pdev)
                                     ARRAY_SIZE(wm8993_eq_controls));
        }
 
-       snd_soc_dapm_new_controls(codec, wm8993_dapm_widgets,
+       snd_soc_dapm_new_controls(dapm, wm8993_dapm_widgets,
                                  ARRAY_SIZE(wm8993_dapm_widgets));
+       wm_hubs_add_analogue_controls(codec);
 
-       snd_soc_dapm_add_routes(codec, routes, ARRAY_SIZE(routes));
-
-       if (wm8993->pdata.lineout1_diff)
-               snd_soc_dapm_add_routes(codec,
-                                       lineout1_diff_routes,
-                                       ARRAY_SIZE(lineout1_diff_routes));
-       else
-               snd_soc_dapm_add_routes(codec,
-                                       lineout1_se_routes,
-                                       ARRAY_SIZE(lineout1_se_routes));
-
-       if (wm8993->pdata.lineout2_diff)
-               snd_soc_dapm_add_routes(codec,
-                                       lineout2_diff_routes,
-                                       ARRAY_SIZE(lineout2_diff_routes));
-       else
-               snd_soc_dapm_add_routes(codec,
-                                       lineout2_se_routes,
-                                       ARRAY_SIZE(lineout2_se_routes));
-
-       snd_soc_dapm_new_widgets(codec);
-
-       ret = snd_soc_init_card(socdev);
-       if (ret < 0) {
-               dev_err(codec->dev, "failed to register card\n");
-               goto card_err;
-       }
+       snd_soc_dapm_add_routes(dapm, routes, ARRAY_SIZE(routes));
+       wm_hubs_add_analogue_routes(codec, wm8993->pdata.lineout1_diff,
+                                   wm8993->pdata.lineout2_diff);
 
-       return ret;
+       return 0;
 
-card_err:
-       snd_soc_free_pcms(socdev);
-       snd_soc_dapm_free(socdev);
-err:
+err_enable:
+       regulator_bulk_disable(ARRAY_SIZE(wm8993->supplies), wm8993->supplies);
+err_get:
+       regulator_bulk_free(ARRAY_SIZE(wm8993->supplies), wm8993->supplies);
        return ret;
 }
 
-static int wm8993_remove(struct platform_device *pdev)
+static int wm8993_remove(struct snd_soc_codec *codec)
 {
-       struct snd_soc_device *socdev = platform_get_drvdata(pdev);
-
-       snd_soc_free_pcms(socdev);
-       snd_soc_dapm_free(socdev);
+       struct wm8993_priv *wm8993 = snd_soc_codec_get_drvdata(codec);
 
+       wm8993_set_bias_level(codec, SND_SOC_BIAS_OFF);
+       regulator_bulk_free(ARRAY_SIZE(wm8993->supplies), wm8993->supplies);
        return 0;
 }
 
-struct snd_soc_codec_device soc_codec_dev_wm8993 = {
-       .probe =        wm8993_probe,
-       .remove =       wm8993_remove,
-};
-EXPORT_SYMBOL_GPL(soc_codec_dev_wm8993);
-
-static int wm8993_i2c_probe(struct i2c_client *i2c,
-                           const struct i2c_device_id *id)
+#ifdef CONFIG_PM
+static int wm8993_suspend(struct snd_soc_codec *codec, pm_message_t state)
 {
-       struct wm8993_priv *wm8993;
-       struct snd_soc_codec *codec;
-       unsigned int val;
+       struct wm8993_priv *wm8993 = snd_soc_codec_get_drvdata(codec);
+       int fll_fout = wm8993->fll_fout;
+       int fll_fref  = wm8993->fll_fref;
        int ret;
 
-       if (wm8993_codec) {
-               dev_err(&i2c->dev, "A WM8993 is already registered\n");
-               return -EINVAL;
+       /* Stop the FLL in an orderly fashion */
+       ret = _wm8993_set_fll(codec, 0, 0, 0, 0);
+       if (ret != 0) {
+               dev_err(codec->dev, "Failed to stop FLL\n");
+               return ret;
        }
 
-       wm8993 = kzalloc(sizeof(struct wm8993_priv), GFP_KERNEL);
-       if (wm8993 == NULL)
-               return -ENOMEM;
-
-       codec = &wm8993->codec;
-       if (i2c->dev.platform_data)
-               memcpy(&wm8993->pdata, i2c->dev.platform_data,
-                      sizeof(wm8993->pdata));
-
-       mutex_init(&codec->mutex);
-       INIT_LIST_HEAD(&codec->dapm_widgets);
-       INIT_LIST_HEAD(&codec->dapm_paths);
-
-       codec->name = "WM8993";
-       codec->read = wm8993_read;
-       codec->write = wm8993_write;
-       codec->hw_write = (hw_write_t)i2c_master_send;
-       codec->reg_cache = wm8993->reg_cache;
-       codec->reg_cache_size = ARRAY_SIZE(wm8993->reg_cache);
-       codec->bias_level = SND_SOC_BIAS_OFF;
-       codec->set_bias_level = wm8993_set_bias_level;
-       codec->dai = &wm8993_dai;
-       codec->num_dai = 1;
-       codec->private_data = wm8993;
-
-       memcpy(wm8993->reg_cache, wm8993_reg_defaults,
-              sizeof(wm8993->reg_cache));
+       wm8993->fll_fout = fll_fout;
+       wm8993->fll_fref = fll_fref;
 
-       i2c_set_clientdata(i2c, wm8993);
-       codec->control_data = i2c;
-       wm8993_codec = codec;
-
-       codec->dev = &i2c->dev;
-
-       val = wm8993_read_hw(codec, WM8993_SOFTWARE_RESET);
-       if (val != wm8993_reg_defaults[WM8993_SOFTWARE_RESET]) {
-               dev_err(codec->dev, "Invalid ID register value %x\n", val);
-               ret = -EINVAL;
-               goto err;
-       }
-
-       ret = wm8993_write(codec, WM8993_SOFTWARE_RESET, 0xffff);
-       if (ret != 0)
-               goto err;
+       wm8993_set_bias_level(codec, SND_SOC_BIAS_OFF);
 
-       /* By default we're using the output mixers */
-       wm8993->class_w_users = 2;
+       return 0;
+}
 
-       /* Latch volume update bits and default ZC on */
-       snd_soc_update_bits(codec, WM8993_LEFT_LINE_INPUT_1_2_VOLUME,
-                           WM8993_IN1_VU, WM8993_IN1_VU);
-       snd_soc_update_bits(codec, WM8993_RIGHT_LINE_INPUT_1_2_VOLUME,
-                           WM8993_IN1_VU, WM8993_IN1_VU);
-       snd_soc_update_bits(codec, WM8993_LEFT_LINE_INPUT_3_4_VOLUME,
-                           WM8993_IN2_VU, WM8993_IN2_VU);
-       snd_soc_update_bits(codec, WM8993_RIGHT_LINE_INPUT_3_4_VOLUME,
-                           WM8993_IN2_VU, WM8993_IN2_VU);
-
-       snd_soc_update_bits(codec, WM8993_SPEAKER_VOLUME_RIGHT,
-                           WM8993_SPKOUT_VU, WM8993_SPKOUT_VU);
-
-       snd_soc_update_bits(codec, WM8993_LEFT_OUTPUT_VOLUME,
-                           WM8993_HPOUT1L_ZC, WM8993_HPOUT1L_ZC);
-       snd_soc_update_bits(codec, WM8993_RIGHT_OUTPUT_VOLUME,
-                           WM8993_HPOUT1_VU | WM8993_HPOUT1R_ZC,
-                           WM8993_HPOUT1_VU | WM8993_HPOUT1R_ZC);
-
-       snd_soc_update_bits(codec, WM8993_LEFT_OPGA_VOLUME,
-                           WM8993_MIXOUTL_ZC, WM8993_MIXOUTL_ZC);
-       snd_soc_update_bits(codec, WM8993_RIGHT_OPGA_VOLUME,
-                           WM8993_MIXOUTR_ZC | WM8993_MIXOUT_VU,
-                           WM8993_MIXOUTR_ZC | WM8993_MIXOUT_VU);
+static int wm8993_resume(struct snd_soc_codec *codec)
+{
+       struct wm8993_priv *wm8993 = snd_soc_codec_get_drvdata(codec);
+       int ret;
 
-       snd_soc_update_bits(codec, WM8993_RIGHT_DAC_DIGITAL_VOLUME,
-                           WM8993_DAC_VU, WM8993_DAC_VU);
-       snd_soc_update_bits(codec, WM8993_RIGHT_ADC_DIGITAL_VOLUME,
-                           WM8993_ADC_VU, WM8993_ADC_VU);
+       wm8993_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
 
-       /* Manualy manage the HPOUT sequencing for independent stereo
-        * control. */
-       snd_soc_update_bits(codec, WM8993_ANALOGUE_HP_0,
-                           WM8993_HPOUT1_AUTO_PU, 0);
+       /* Restart the FLL? */
+       if (wm8993->fll_fout) {
+               int fll_fout = wm8993->fll_fout;
+               int fll_fref  = wm8993->fll_fref;
 
-       /* Use automatic clock configuration */
-       snd_soc_update_bits(codec, WM8993_CLOCKING_4, WM8993_SR_MODE, 0);
+               wm8993->fll_fref = 0;
+               wm8993->fll_fout = 0;
 
-       if (!wm8993->pdata.lineout1_diff)
-               snd_soc_update_bits(codec, WM8993_LINE_MIXER1,
-                                   WM8993_LINEOUT1_MODE,
-                                   WM8993_LINEOUT1_MODE);
-       if (!wm8993->pdata.lineout2_diff)
-               snd_soc_update_bits(codec, WM8993_LINE_MIXER2,
-                                   WM8993_LINEOUT2_MODE,
-                                   WM8993_LINEOUT2_MODE);
-
-       if (wm8993->pdata.lineout1fb)
-               snd_soc_update_bits(codec, WM8993_ADDITIONAL_CONTROL,
-                                   WM8993_LINEOUT1_FB, WM8993_LINEOUT1_FB);
-
-       if (wm8993->pdata.lineout2fb)
-               snd_soc_update_bits(codec, WM8993_ADDITIONAL_CONTROL,
-                                   WM8993_LINEOUT2_FB, WM8993_LINEOUT2_FB);
-
-       /* Apply the microphone bias/detection configuration - the
-        * platform data is directly applicable to the register. */
-       snd_soc_update_bits(codec, WM8993_MICBIAS,
-                           WM8993_JD_SCTHR_MASK | WM8993_JD_THR_MASK |
-                           WM8993_MICB1_LVL | WM8993_MICB2_LVL,
-                           wm8993->pdata.jd_scthr << WM8993_JD_SCTHR_SHIFT |
-                           wm8993->pdata.jd_thr << WM8993_JD_THR_SHIFT |
-                           wm8993->pdata.micbias1_lvl |
-                           wm8993->pdata.micbias1_lvl << 1);
+               ret = _wm8993_set_fll(codec, 0, wm8993->fll_src,
+                                    fll_fref, fll_fout);
+               if (ret != 0)
+                       dev_err(codec->dev, "Failed to restart FLL\n");
+       }
 
-       ret = wm8993_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
-       if (ret != 0)
-               goto err;
+       return 0;
+}
+#else
+#define wm8993_suspend NULL
+#define wm8993_resume NULL
+#endif
 
-       wm8993_dai.dev = codec->dev;
+static struct snd_soc_codec_driver soc_codec_dev_wm8993 = {
+       .probe =        wm8993_probe,
+       .remove =       wm8993_remove,
+       .suspend =      wm8993_suspend,
+       .resume =       wm8993_resume,
+       .set_bias_level = wm8993_set_bias_level,
+       .reg_cache_size = ARRAY_SIZE(wm8993_reg_defaults),
+       .reg_word_size = sizeof(u16),
+       .reg_cache_default = wm8993_reg_defaults,
+       .volatile_register = wm8993_volatile,
+};
 
-       ret = snd_soc_register_dai(&wm8993_dai);
-       if (ret != 0)
-               goto err_bias;
+#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
+static __devinit int wm8993_i2c_probe(struct i2c_client *i2c,
+                                     const struct i2c_device_id *id)
+{
+       struct wm8993_priv *wm8993;
+       int ret;
 
-       ret = snd_soc_register_codec(codec);
+       wm8993 = kzalloc(sizeof(struct wm8993_priv), GFP_KERNEL);
+       if (wm8993 == NULL)
+               return -ENOMEM;
 
-       return 0;
+       i2c_set_clientdata(i2c, wm8993);
 
-err_bias:
-       wm8993_set_bias_level(codec, SND_SOC_BIAS_OFF);
-err:
-       wm8993_codec = NULL;
-       kfree(wm8993);
+       ret = snd_soc_register_codec(&i2c->dev,
+                       &soc_codec_dev_wm8993, &wm8993_dai, 1);
+       if (ret < 0)
+               kfree(wm8993);
        return ret;
 }
 
-static int wm8993_i2c_remove(struct i2c_client *client)
+static __devexit int wm8993_i2c_remove(struct i2c_client *client)
 {
-       struct wm8993_priv *wm8993 = i2c_get_clientdata(client);
-
-       snd_soc_unregister_codec(&wm8993->codec);
-       snd_soc_unregister_dai(&wm8993_dai);
-
-       wm8993_set_bias_level(&wm8993->codec, SND_SOC_BIAS_OFF);
-       kfree(wm8993);
-
+       snd_soc_unregister_codec(&client->dev);
+       kfree(i2c_get_clientdata(client));
        return 0;
 }
 
@@ -2170,30 +1630,34 @@ MODULE_DEVICE_TABLE(i2c, wm8993_i2c_id);
 
 static struct i2c_driver wm8993_i2c_driver = {
        .driver = {
-               .name = "WM8993",
+               .name = "wm8993-codec",
                .owner = THIS_MODULE,
        },
-       .probe = wm8993_i2c_probe,
-       .remove = wm8993_i2c_remove,
+       .probe =    wm8993_i2c_probe,
+       .remove =   __devexit_p(wm8993_i2c_remove),
        .id_table = wm8993_i2c_id,
 };
-
+#endif
 
 static int __init wm8993_modinit(void)
 {
-       int ret;
-
+       int ret = 0;
+#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
        ret = i2c_add_driver(&wm8993_i2c_driver);
-       if (ret != 0)
-               pr_err("WM8993: Unable to register I2C driver: %d\n", ret);
-
+       if (ret != 0) {
+               pr_err("WM8993: Unable to register I2C driver: %d\n",
+                      ret);
+       }
+#endif
        return ret;
 }
 module_init(wm8993_modinit);
 
 static void __exit wm8993_exit(void)
 {
+#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
        i2c_del_driver(&wm8993_i2c_driver);
+#endif
 }
 module_exit(wm8993_exit);