Merge remote branch 'broonie-asoc/for-2.6.37' into for-2.6.37

diff --combined sound/soc/codecs/tlv320aic3x.c
index 0b80e242a66df8623204bb9340d86e376cde7707,c07465720cdb2d8c134f6fc84dad96841c64b081..efae8b53fd64134a8095e0d362bf76815139e64b
--- 1/sound/soc/codecs/tlv320aic3x.c
--- 2/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
@@@ -12,11 -12,11 +12,11 @@@
   *
   * Notes:
   *  The AIC3X is a driver for a low power stereo audio
-  *  codecs aic31, aic32, aic33.
+  *  codecs aic31, aic32, aic33, aic3007.
   *
   *  It supports full aic33 codec functionality.
-  *  The compatibility with aic32, aic31 is as follows:
-  *        aic32        |        aic31
+  *  The compatibility with aic32, aic31 and aic3007 is as follows:
+  *    aic32/aic3007    |        aic31
   *  ---------------------------------------
   *   MONO_LOUT -> N/A  |  MONO_LOUT -> N/A
   *                     |  IN1L -> LINE1L
@@@ -70,6 -70,10 +70,10 @@@ struct aic3x_priv 
        unsigned int sysclk;
        int master;
        int gpio_reset;
+ #define AIC3X_MODEL_3X 0
+ #define AIC3X_MODEL_33 1
+ #define AIC3X_MODEL_3007 2
+       u16 model;
  };
  
  /*
@@@ -361,6 -365,14 +365,14 @@@ static const struct snd_kcontrol_new ai
        SOC_ENUM("ADC HPF Cut-off", aic3x_enum[ADC_HPF_ENUM]),
  };
  
+ /*
+  * Class-D amplifier gain. From 0 to 18 dB in 6 dB steps
+  */
+ static DECLARE_TLV_DB_SCALE(classd_amp_tlv, 0, 600, 0);
+ 
+ static const struct snd_kcontrol_new aic3x_classd_amp_gain_ctrl =
+       SOC_DOUBLE_TLV("Class-D Amplifier Gain", CLASSD_CTRL, 6, 4, 3, 0, classd_amp_tlv);
+ 
  /* Left DAC Mux */
  static const struct snd_kcontrol_new aic3x_left_dac_mux_controls =
  SOC_DAPM_ENUM("Route", aic3x_enum[LDAC_ENUM]);
@@@ -589,6 -601,15 +601,15 @@@ static const struct snd_soc_dapm_widge
        SND_SOC_DAPM_INPUT("LINE2R"),
  };
  
+ static const struct snd_soc_dapm_widget aic3007_dapm_widgets[] = {
+       /* Class-D outputs */
+       SND_SOC_DAPM_PGA("Left Class-D Out", CLASSD_CTRL, 3, 0, NULL, 0),
+       SND_SOC_DAPM_PGA("Right Class-D Out", CLASSD_CTRL, 2, 0, NULL, 0),
+ 
+       SND_SOC_DAPM_OUTPUT("SPOP"),
+       SND_SOC_DAPM_OUTPUT("SPOM"),
+ };
+ 
  static const struct snd_soc_dapm_route intercon[] = {
        /* Left Output */
        {"Left DAC Mux", "DAC_L1", "Left DAC"},
@@@ -759,14 -780,30 +780,30 @@@
        {"GPIO1 dmic modclk", NULL, "DMic Rate 32"},
  };
  
+ static const struct snd_soc_dapm_route intercon_3007[] = {
+       /* Class-D outputs */
+       {"Left Class-D Out", NULL, "Left Line Out"},
+       {"Right Class-D Out", NULL, "Left Line Out"},
+       {"SPOP", NULL, "Left Class-D Out"},
+       {"SPOM", NULL, "Right Class-D Out"},
+ };
+ 
  static int aic3x_add_widgets(struct snd_soc_codec *codec)
  {
+       struct aic3x_priv *aic3x = snd_soc_codec_get_drvdata(codec);
+ 
        snd_soc_dapm_new_controls(codec, aic3x_dapm_widgets,
                                  ARRAY_SIZE(aic3x_dapm_widgets));
  
        /* set up audio path interconnects */
        snd_soc_dapm_add_routes(codec, intercon, ARRAY_SIZE(intercon));
  
+       if (aic3x->model == AIC3X_MODEL_3007) {
+               snd_soc_dapm_new_controls(codec, aic3007_dapm_widgets,
+                       ARRAY_SIZE(aic3007_dapm_widgets));
+               snd_soc_dapm_add_routes(codec, intercon_3007, ARRAY_SIZE(intercon_3007));
+       }
+ 
        return 0;
  }
  
@@@ -1117,6 -1154,7 +1154,7 @@@ static struct snd_soc_dai_driver aic3x_
                .rates = AIC3X_RATES,
                .formats = AIC3X_FORMATS,},
        .ops = &aic3x_dai_ops,
+       .symmetric_rates = 1,
  };
  
  static int aic3x_suspend(struct snd_soc_codec *codec, pm_message_t state)
@@@ -1150,6 -1188,7 +1188,7 @@@ static int aic3x_resume(struct snd_soc_
   */
  static int aic3x_init(struct snd_soc_codec *codec)
  {
+       struct aic3x_priv *aic3x = snd_soc_codec_get_drvdata(codec);
        int reg;
  
        aic3x_write(codec, AIC3X_PAGE_SELECT, PAGE0_SELECT);
@@@ -1218,6 -1257,17 +1257,17 @@@
        aic3x_write(codec, LINE2L_2_MONOLOPM_VOL, DEFAULT_VOL);
        aic3x_write(codec, LINE2R_2_MONOLOPM_VOL, DEFAULT_VOL);
  
+       if (aic3x->model == AIC3X_MODEL_3007) {
+               /* Class-D speaker driver init; datasheet p. 46 */
+               aic3x_write(codec, AIC3X_PAGE_SELECT, 0x0D);
+               aic3x_write(codec, 0xD, 0x0D);
+               aic3x_write(codec, 0x8, 0x5C);
+               aic3x_write(codec, 0x8, 0x5D);
+               aic3x_write(codec, 0x8, 0x5C);
+               aic3x_write(codec, AIC3X_PAGE_SELECT, 0x00);
+               aic3x_write(codec, CLASSD_CTRL, 0);
+       }
+ 
        /* off, with power on */
        aic3x_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
  
@@@ -1231,8 -1281,6 +1281,8 @@@ static int aic3x_probe(struct snd_soc_c
        codec->hw_write = (hw_write_t) i2c_master_send;
        codec->control_data = aic3x->control_data;
  
 +      aic3x_init(codec);
 +
        if (aic3x->setup) {
                /* setup GPIO functions */
                aic3x_write(codec, AIC3X_GPIO1_REG,
@@@ -1241,8 -1289,12 +1291,10 @@@
                            (aic3x->setup->gpio_func[1] & 0xf) << 4);
        }
  
 -      aic3x_init(codec);
 -
        snd_soc_add_controls(codec, aic3x_snd_controls,
                             ARRAY_SIZE(aic3x_snd_controls));
+       if (aic3x->model == AIC3X_MODEL_3007)
+               snd_soc_add_controls(codec, &aic3x_classd_amp_gain_ctrl, 1);
  
        aic3x_add_widgets(codec);
  
@@@ -1274,6 -1326,14 +1326,14 @@@ static struct snd_soc_codec_driver soc_
   * 0x18, 0x19, 0x1A, 0x1B
   */
  
+ static const struct i2c_device_id aic3x_i2c_id[] = {
+       [AIC3X_MODEL_3X] = { "tlv320aic3x", 0 },
+       [AIC3X_MODEL_33] = { "tlv320aic33", 0 },
+       [AIC3X_MODEL_3007] = { "tlv320aic3007", 0 },
+       { }
+ };
+ MODULE_DEVICE_TABLE(i2c, aic3x_i2c_id);
+ 
  /*
   * If the i2c layer weren't so broken, we could pass this kind of data
   * around
@@@ -1285,6 -1345,7 +1345,7 @@@ static int aic3x_i2c_probe(struct i2c_c
        struct aic3x_setup_data *setup = pdata->setup;
        struct aic3x_priv *aic3x;
        int ret, i;
+       const struct i2c_device_id *tbl;
  
        aic3x = kzalloc(sizeof(struct aic3x_priv), GFP_KERNEL);
        if (aic3x == NULL) {
@@@ -1305,6 -1366,12 +1366,12 @@@
                gpio_direction_output(aic3x->gpio_reset, 0);
        }
  
+       for (tbl = aic3x_i2c_id; tbl->name[0]; tbl++) {
+               if (!strcmp(tbl->name, id->name))
+                       break;
+       }
+       aic3x->model = tbl - aic3x_i2c_id;
+ 
        for (i = 0; i < ARRAY_SIZE(aic3x->supplies); i++)
                aic3x->supplies[i].supply = aic3x_supply_names[i];
  
@@@ -1359,13 -1426,6 +1426,6 @@@ static int aic3x_i2c_remove(struct i2c_
        return 0;
  }
  
- static const struct i2c_device_id aic3x_i2c_id[] = {
-       { "tlv320aic3x", 0 },
-       { "tlv320aic33", 0 },
-       { }
- };
- MODULE_DEVICE_TABLE(i2c, aic3x_i2c_id);
- 
  /* machine i2c codec control layer */
  static struct i2c_driver aic3x_i2c_driver = {
        .driver = {