1 files changed, 37 insertions, 47 deletions

diff --git a/sound/soc/codecs/wm9081.c b/sound/soc/codecs/wm9081.c
index cce704c275c6..55cdf2982020 100644
--- a/sound/soc/codecs/wm9081.c
+++ b/sound/soc/codecs/wm9081.c
@@ -167,10 +167,10 @@ struct wm9081_priv {
         int fll_fref;
         int fll_fout;
         int tdm_width;
-        struct wm9081_retune_mobile_config *retune;
+        struct wm9081_pdata pdata;
 };
 
-static int wm9081_volatile_register(unsigned int reg)
+static int wm9081_volatile_register(struct snd_soc_codec *codec, unsigned int reg)
 {
         switch (reg) {
         case WM9081_SOFTWARE_RESET:
@@ -389,27 +389,6 @@ SOC_DAPM_SINGLE("IN2 Switch", WM9081_ANALOGUE_MIXER, 2, 1, 0),
 SOC_DAPM_SINGLE("Playback Switch", WM9081_ANALOGUE_MIXER, 4, 1, 0),
 };
 
-static int speaker_event(struct snd_soc_dapm_widget *w,
-                         struct snd_kcontrol *kcontrol, int event)
-{
-        struct snd_soc_codec *codec = w->codec;
-        unsigned int reg = snd_soc_read(codec, WM9081_POWER_MANAGEMENT);
-
-        switch (event) {
-        case SND_SOC_DAPM_POST_PMU:
-                reg |= WM9081_SPK_ENA;
-                break;
-
-        case SND_SOC_DAPM_PRE_PMD:
-                reg &= ~WM9081_SPK_ENA;
-                break;
-        }
-
-        snd_soc_write(codec, WM9081_POWER_MANAGEMENT, reg);
-
-        return 0;
-}
-
 struct _fll_div {
         u16 fll_fratio;
         u16 fll_outdiv;
@@ -747,9 +726,8 @@ SND_SOC_DAPM_MIXER_NAMED_CTL("Mixer", SND_SOC_NOPM, 0, 0,
 
 SND_SOC_DAPM_PGA("LINEOUT PGA", WM9081_POWER_MANAGEMENT, 4, 0, NULL, 0),
 
-SND_SOC_DAPM_PGA_E("Speaker PGA", WM9081_POWER_MANAGEMENT, 2, 0, NULL, 0,
-                   speaker_event,
-                   SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD),
+SND_SOC_DAPM_PGA("Speaker PGA", WM9081_POWER_MANAGEMENT, 2, 0, NULL, 0),
+SND_SOC_DAPM_PGA("Speaker", WM9081_POWER_MANAGEMENT, 1, 0, NULL, 0),
 
 SND_SOC_DAPM_OUTPUT("LINEOUT"),
 SND_SOC_DAPM_OUTPUT("SPKN"),
@@ -762,7 +740,7 @@ SND_SOC_DAPM_SUPPLY("TOCLK", WM9081_CLOCK_CONTROL_3, 2, 0, NULL, 0),
 };
 
 
-static const struct snd_soc_dapm_route audio_paths[] = {
+static const struct snd_soc_dapm_route wm9081_audio_paths[] = {
         { "DAC", NULL, "CLK_SYS" },
         { "DAC", NULL, "CLK_DSP" },
 
@@ -780,8 +758,10 @@ static const struct snd_soc_dapm_route audio_paths[] = {
         { "Speaker PGA", NULL, "TOCLK" },
         { "Speaker PGA", NULL, "CLK_SYS" },
 
-        { "SPKN", NULL, "Speaker PGA" },
-        { "SPKP", NULL, "Speaker PGA" },
+        { "Speaker", NULL, "Speaker PGA" },
+
+        { "SPKN", NULL, "Speaker" },
+        { "SPKP", NULL, "Speaker" },
 };
 
 static int wm9081_set_bias_level(struct snd_soc_codec *codec,
@@ -1082,21 +1062,22 @@ static int wm9081_hw_params(struct snd_pcm_substream *substream,
         aif4 |= wm9081->bclk / wm9081->fs;
 
         /* Apply a ReTune Mobile configuration if it's in use */
-        if (wm9081->retune) {
-                struct wm9081_retune_mobile_config *retune = wm9081->retune;
+        if (wm9081->pdata.num_retune_configs) {
+                struct wm9081_pdata *pdata = &wm9081->pdata;
                 struct wm9081_retune_mobile_setting *s;
                 int eq1;
 
                 best = 0;
-                best_val = abs(retune->configs[0].rate - wm9081->fs);
-                for (i = 0; i < retune->num_configs; i++) {
-                        cur_val = abs(retune->configs[i].rate - wm9081->fs);
+                best_val = abs(pdata->retune_configs[0].rate - wm9081->fs);
+                for (i = 0; i < pdata->num_retune_configs; i++) {
+                        cur_val = abs(pdata->retune_configs[i].rate -
+                                      wm9081->fs);
                         if (cur_val < best_val) {
                                 best_val = cur_val;
                                 best = i;
                         }
                 }
-                s = &retune->configs[best];
+                s = &pdata->retune_configs[best];
 
                 dev_dbg(codec->dev, "ReTune Mobile %s tuned for %dHz\n",
                         s->name, s->rate);
@@ -1139,10 +1120,9 @@ static int wm9081_digital_mute(struct snd_soc_dai *codec_dai, int mute)
         return 0;
 }
 
-static int wm9081_set_sysclk(struct snd_soc_dai *codec_dai,
+static int wm9081_set_sysclk(struct snd_soc_codec *codec,
                              int clk_id, unsigned int freq, int dir)
 {
-        struct snd_soc_codec *codec = codec_dai->codec;
         struct wm9081_priv *wm9081 = snd_soc_codec_get_drvdata(codec);
 
         switch (clk_id) {
@@ -1207,7 +1187,6 @@ static int wm9081_set_tdm_slot(struct snd_soc_dai *dai,
 
 static struct snd_soc_dai_ops wm9081_dai_ops = {
         .hw_params = wm9081_hw_params,
-        .set_sysclk = wm9081_set_sysclk,
         .set_fmt = wm9081_set_dai_fmt,
         .digital_mute = wm9081_digital_mute,
         .set_tdm_slot = wm9081_set_tdm_slot,
@@ -1231,7 +1210,6 @@ static struct snd_soc_dai_driver wm9081_dai = {
 static int wm9081_probe(struct snd_soc_codec *codec)
 {
         struct wm9081_priv *wm9081 = snd_soc_codec_get_drvdata(codec);
-        struct snd_soc_dapm_context *dapm = &codec->dapm;
         int ret;
         u16 reg;
 
@@ -1255,6 +1233,14 @@ static int wm9081_probe(struct snd_soc_codec *codec)
                 return ret;
         }
 
+        reg = 0;
+        if (wm9081->pdata.irq_high)
+                reg |= WM9081_IRQ_POL;
+        if (!wm9081->pdata.irq_cmos)
+                reg |= WM9081_IRQ_OP_CTRL;
+        snd_soc_update_bits(codec, WM9081_INTERRUPT_CONTROL,
+                            WM9081_IRQ_POL | WM9081_IRQ_OP_CTRL, reg);
+
         wm9081_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
 
         /* Enable zero cross by default */
@@ -1266,17 +1252,13 @@ static int wm9081_probe(struct snd_soc_codec *codec)
 
         snd_soc_add_controls(codec, wm9081_snd_controls,
                              ARRAY_SIZE(wm9081_snd_controls));
-        if (!wm9081->retune) {
+        if (!wm9081->pdata.num_retune_configs) {
                 dev_dbg(codec->dev,
                         "No ReTune Mobile data, using normal EQ\n");
                 snd_soc_add_controls(codec, wm9081_eq_controls,
                                      ARRAY_SIZE(wm9081_eq_controls));
         }
 
-        snd_soc_dapm_new_controls(dapm, wm9081_dapm_widgets,
-                                  ARRAY_SIZE(wm9081_dapm_widgets));
-        snd_soc_dapm_add_routes(dapm, audio_paths, ARRAY_SIZE(audio_paths));
-
         return ret;
 }
 
@@ -1320,11 +1302,19 @@ static struct snd_soc_codec_driver soc_codec_dev_wm9081 = {
         .remove =       wm9081_remove,
         .suspend =      wm9081_suspend,
         .resume =       wm9081_resume,
+
+        .set_sysclk = wm9081_set_sysclk,
         .set_bias_level = wm9081_set_bias_level,
+
         .reg_cache_size = ARRAY_SIZE(wm9081_reg_defaults),
         .reg_word_size = sizeof(u16),
         .reg_cache_default = wm9081_reg_defaults,
         .volatile_register = wm9081_volatile_register,
+
+        .dapm_widgets     = wm9081_dapm_widgets,
+        .num_dapm_widgets = ARRAY_SIZE(wm9081_dapm_widgets),
+        .dapm_routes     = wm9081_audio_paths,
+        .num_dapm_routes = ARRAY_SIZE(wm9081_audio_paths),
 };
 
 #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
@@ -1343,8 +1333,8 @@ static __devinit int wm9081_i2c_probe(struct i2c_client *i2c,
         wm9081->control_data = i2c;
 
         if (dev_get_platdata(&i2c->dev))
-                memcpy(&wm9081->retune, dev_get_platdata(&i2c->dev),
-                       sizeof(wm9081->retune));
+                memcpy(&wm9081->pdata, dev_get_platdata(&i2c->dev),
+                       sizeof(wm9081->pdata));
 
         ret = snd_soc_register_codec(&i2c->dev,
                         &soc_codec_dev_wm9081, &wm9081_dai, 1);
@@ -1368,7 +1358,7 @@ MODULE_DEVICE_TABLE(i2c, wm9081_i2c_id);
 
 static struct i2c_driver wm9081_i2c_driver = {
         .driver = {
-                .name = "wm9081-codec",
+                .name = "wm9081",
                 .owner = THIS_MODULE,
         },
         .probe =    wm9081_i2c_probe,