1 files changed, 66 insertions, 161 deletions

diff --git a/sound/soc/codecs/twl6040.c b/sound/soc/codecs/twl6040.c
index f2f4bcb2ff71..0afe8bef6765 100644
--- a/sound/soc/codecs/twl6040.c
+++ b/sound/soc/codecs/twl6040.c
@@ -72,6 +72,7 @@ struct twl6040_data {
         int hs_power_mode_locked;
         bool dl1_unmuted;
         bool dl2_unmuted;
+        u8 dl12_cache[TWL6040_REG_HFRCTL - TWL6040_REG_HSLCTL + 1];
         unsigned int clk_in;
         unsigned int sysclk;
         struct twl6040_jack_data hs_jack;
@@ -79,75 +80,6 @@ struct twl6040_data {
         struct mutex mutex;
 };
 
-/*
- * twl6040 register cache & default register settings
- */
-static const u8 twl6040_reg[TWL6040_CACHEREGNUM] = {
-        0x00, /* not used       0x00    */
-        0x4B, /* REG_ASICID     0x01 (ro) */
-        0x00, /* REG_ASICREV    0x02 (ro) */
-        0x00, /* REG_INTID      0x03    */
-        0x00, /* REG_INTMR      0x04    */
-        0x00, /* REG_NCPCTRL    0x05    */
-        0x00, /* REG_LDOCTL     0x06    */
-        0x60, /* REG_HPPLLCTL   0x07    */
-        0x00, /* REG_LPPLLCTL   0x08    */
-        0x4A, /* REG_LPPLLDIV   0x09    */
-        0x00, /* REG_AMICBCTL   0x0A    */
-        0x00, /* REG_DMICBCTL   0x0B    */
-        0x00, /* REG_MICLCTL    0x0C    */
-        0x00, /* REG_MICRCTL    0x0D    */
-        0x00, /* REG_MICGAIN    0x0E    */
-        0x1B, /* REG_LINEGAIN   0x0F    */
-        0x00, /* REG_HSLCTL     0x10    */
-        0x00, /* REG_HSRCTL     0x11    */
-        0x00, /* REG_HSGAIN     0x12    */
-        0x00, /* REG_EARCTL     0x13    */
-        0x00, /* REG_HFLCTL     0x14    */
-        0x00, /* REG_HFLGAIN    0x15    */
-        0x00, /* REG_HFRCTL     0x16    */
-        0x00, /* REG_HFRGAIN    0x17    */
-        0x00, /* REG_VIBCTLL    0x18    */
-        0x00, /* REG_VIBDATL    0x19    */
-        0x00, /* REG_VIBCTLR    0x1A    */
-        0x00, /* REG_VIBDATR    0x1B    */
-        0x00, /* REG_HKCTL1     0x1C    */
-        0x00, /* REG_HKCTL2     0x1D    */
-        0x00, /* REG_GPOCTL     0x1E    */
-        0x00, /* REG_ALB        0x1F    */
-        0x00, /* REG_DLB        0x20    */
-        0x00, /* not used       0x21    */
-        0x00, /* not used       0x22    */
-        0x00, /* not used       0x23    */
-        0x00, /* not used       0x24    */
-        0x00, /* not used       0x25    */
-        0x00, /* not used       0x26    */
-        0x00, /* not used       0x27    */
-        0x00, /* REG_TRIM1      0x28    */
-        0x00, /* REG_TRIM2      0x29    */
-        0x00, /* REG_TRIM3      0x2A    */
-        0x00, /* REG_HSOTRIM    0x2B    */
-        0x00, /* REG_HFOTRIM    0x2C    */
-        0x09, /* REG_ACCCTL     0x2D    */
-        0x00, /* REG_STATUS     0x2E (ro) */
-};
-
-/* List of registers to be restored after power up */
-static const int twl6040_restore_list[] = {
-        TWL6040_REG_MICLCTL,
-        TWL6040_REG_MICRCTL,
-        TWL6040_REG_MICGAIN,
-        TWL6040_REG_LINEGAIN,
-        TWL6040_REG_HSLCTL,
-        TWL6040_REG_HSRCTL,
-        TWL6040_REG_HSGAIN,
-        TWL6040_REG_EARCTL,
-        TWL6040_REG_HFLCTL,
-        TWL6040_REG_HFLGAIN,
-        TWL6040_REG_HFRCTL,
-        TWL6040_REG_HFRGAIN,
-};
-
 /* set of rates for each pll: low-power and high-performance */
 static unsigned int lp_rates[] = {
         8000,
@@ -174,53 +106,33 @@ static struct snd_pcm_hw_constraint_list sysclk_constraints[] = {
         { .count = ARRAY_SIZE(hp_rates), .list = hp_rates, },
 };
 
-/*
- * read twl6040 register cache
- */
-static inline unsigned int twl6040_read_reg_cache(struct snd_soc_codec *codec,
-                                                unsigned int reg)
-{
-        u8 *cache = codec->reg_cache;
-
-        if (reg >= TWL6040_CACHEREGNUM)
-                return -EIO;
-
-        return cache[reg];
-}
-
-/*
- * write twl6040 register cache
- */
-static inline void twl6040_write_reg_cache(struct snd_soc_codec *codec,
-                                                u8 reg, u8 value)
-{
-        u8 *cache = codec->reg_cache;
-
-        if (reg >= TWL6040_CACHEREGNUM)
-                return;
-        cache[reg] = value;
-}
-
-/*
- * read from twl6040 hardware register
- */
-static int twl6040_read_reg_volatile(struct snd_soc_codec *codec,
-                        unsigned int reg)
+static unsigned int twl6040_read(struct snd_soc_codec *codec, unsigned int reg)
 {
+        struct twl6040_data *priv = snd_soc_codec_get_drvdata(codec);
         struct twl6040 *twl6040 = codec->control_data;
         u8 value;
 
         if (reg >= TWL6040_CACHEREGNUM)
                 return -EIO;
 
-        value = twl6040_reg_read(twl6040, reg);
-        twl6040_write_reg_cache(codec, reg, value);
+        switch (reg) {
+        case TWL6040_REG_HSLCTL:
+        case TWL6040_REG_HSRCTL:
+        case TWL6040_REG_EARCTL:
+        case TWL6040_REG_HFLCTL:
+        case TWL6040_REG_HFRCTL:
+                value = priv->dl12_cache[reg - TWL6040_REG_HSLCTL];
+                break;
+        default:
+                value = twl6040_reg_read(twl6040, reg);
+                break;
+        }
 
         return value;
 }
 
-static bool twl6040_is_path_unmuted(struct snd_soc_codec *codec,
-                                    unsigned int reg)
+static bool twl6040_can_write_to_chip(struct snd_soc_codec *codec,
+                                  unsigned int reg)
 {
         struct twl6040_data *priv = snd_soc_codec_get_drvdata(codec);
 
@@ -238,9 +150,24 @@ static bool twl6040_is_path_unmuted(struct snd_soc_codec *codec,
         }
 }
 
-/*
- * write to the twl6040 register space
- */
+static inline void twl6040_update_dl12_cache(struct snd_soc_codec *codec,
+                                             u8 reg, u8 value)
+{
+        struct twl6040_data *priv = snd_soc_codec_get_drvdata(codec);
+
+        switch (reg) {
+        case TWL6040_REG_HSLCTL:
+        case TWL6040_REG_HSRCTL:
+        case TWL6040_REG_EARCTL:
+        case TWL6040_REG_HFLCTL:
+        case TWL6040_REG_HFRCTL:
+                priv->dl12_cache[reg - TWL6040_REG_HSLCTL] = value;
+                break;
+        default:
+                break;
+        }
+}
+
 static int twl6040_write(struct snd_soc_codec *codec,
                         unsigned int reg, unsigned int value)
 {
@@ -249,8 +176,8 @@ static int twl6040_write(struct snd_soc_codec *codec,
         if (reg >= TWL6040_CACHEREGNUM)
                 return -EIO;
 
-        twl6040_write_reg_cache(codec, reg, value);
-        if (twl6040_is_path_unmuted(codec, reg))
+        twl6040_update_dl12_cache(codec, reg, value);
+        if (twl6040_can_write_to_chip(codec, reg))
                 return twl6040_reg_write(twl6040, reg, value);
         else
                 return 0;
@@ -258,45 +185,27 @@ static int twl6040_write(struct snd_soc_codec *codec,
 
 static void twl6040_init_chip(struct snd_soc_codec *codec)
 {
-        struct twl6040 *twl6040 = codec->control_data;
-        u8 val;
-
-        /* Update reg_cache: ASICREV, and TRIM values */
-        val = twl6040_get_revid(twl6040);
-        twl6040_write_reg_cache(codec, TWL6040_REG_ASICREV, val);
-
-        twl6040_read_reg_volatile(codec, TWL6040_REG_TRIM1);
-        twl6040_read_reg_volatile(codec, TWL6040_REG_TRIM2);
-        twl6040_read_reg_volatile(codec, TWL6040_REG_TRIM3);
-        twl6040_read_reg_volatile(codec, TWL6040_REG_HSOTRIM);
-        twl6040_read_reg_volatile(codec, TWL6040_REG_HFOTRIM);
+        twl6040_read(codec, TWL6040_REG_TRIM1);
+        twl6040_read(codec, TWL6040_REG_TRIM2);
+        twl6040_read(codec, TWL6040_REG_TRIM3);
+        twl6040_read(codec, TWL6040_REG_HSOTRIM);
+        twl6040_read(codec, TWL6040_REG_HFOTRIM);
 
         /* Change chip defaults */
         /* No imput selected for microphone amplifiers */
-        twl6040_write_reg_cache(codec, TWL6040_REG_MICLCTL, 0x18);
-        twl6040_write_reg_cache(codec, TWL6040_REG_MICRCTL, 0x18);
+        twl6040_write(codec, TWL6040_REG_MICLCTL, 0x18);
+        twl6040_write(codec, TWL6040_REG_MICRCTL, 0x18);
 
         /*
          * We need to lower the default gain values, so the ramp code
          * can work correctly for the first playback.
          * This reduces the pop noise heard at the first playback.
          */
-        twl6040_write_reg_cache(codec, TWL6040_REG_HSGAIN, 0xff);
-        twl6040_write_reg_cache(codec, TWL6040_REG_EARCTL, 0x1e);
-        twl6040_write_reg_cache(codec, TWL6040_REG_HFLGAIN, 0x1d);
-        twl6040_write_reg_cache(codec, TWL6040_REG_HFRGAIN, 0x1d);
-        twl6040_write_reg_cache(codec, TWL6040_REG_LINEGAIN, 0);
-}
-
-static void twl6040_restore_regs(struct snd_soc_codec *codec)
-{
-        u8 *cache = codec->reg_cache;
-        int reg, i;
-
-        for (i = 0; i < ARRAY_SIZE(twl6040_restore_list); i++) {
-                reg = twl6040_restore_list[i];
-                twl6040_write(codec, reg, cache[reg]);
-        }
+        twl6040_write(codec, TWL6040_REG_HSGAIN, 0xff);
+        twl6040_write(codec, TWL6040_REG_EARCTL, 0x1e);
+        twl6040_write(codec, TWL6040_REG_HFLGAIN, 0x1d);
+        twl6040_write(codec, TWL6040_REG_HFRGAIN, 0x1d);
+        twl6040_write(codec, TWL6040_REG_LINEGAIN, 0);
 }
 
 /* set headset dac and driver power mode */
@@ -305,8 +214,8 @@ static int headset_power_mode(struct snd_soc_codec *codec, int high_perf)
         int hslctl, hsrctl;
         int mask = TWL6040_HSDRVMODE | TWL6040_HSDACMODE;
 
-        hslctl = twl6040_read_reg_cache(codec, TWL6040_REG_HSLCTL);
-        hsrctl = twl6040_read_reg_cache(codec, TWL6040_REG_HSRCTL);
+        hslctl = twl6040_read(codec, TWL6040_REG_HSLCTL);
+        hsrctl = twl6040_read(codec, TWL6040_REG_HSRCTL);
 
         if (high_perf) {
                 hslctl &= ~mask;
@@ -333,8 +242,8 @@ static int twl6040_hs_dac_event(struct snd_soc_dapm_widget *w,
          * Both HS DAC need to be turned on (before the HS driver) and off at
          * the same time.
          */
-        hslctl = twl6040_read_reg_cache(codec, TWL6040_REG_HSLCTL);
-        hsrctl = twl6040_read_reg_cache(codec, TWL6040_REG_HSRCTL);
+        hslctl = twl6040_read(codec, TWL6040_REG_HSLCTL);
+        hsrctl = twl6040_read(codec, TWL6040_REG_HSRCTL);
         if (SND_SOC_DAPM_EVENT_ON(event)) {
                 hslctl |= TWL6040_HSDACENA;
                 hsrctl |= TWL6040_HSDACENA;
@@ -379,7 +288,7 @@ static void twl6040_hs_jack_report(struct snd_soc_codec *codec,
         mutex_lock(&priv->mutex);
 
         /* Sync status */
-        status = twl6040_read_reg_volatile(codec, TWL6040_REG_STATUS);
+        status = twl6040_read(codec, TWL6040_REG_STATUS);
         if (status & TWL6040_PLUGCOMP)
                 snd_soc_jack_report(jack, report, report);
         else
@@ -431,7 +340,7 @@ static int twl6040_soc_dapm_put_vibra_enum(struct snd_kcontrol *kcontrol,
         unsigned int val;
 
         /* Do not allow changes while Input/FF efect is running */
-        val = twl6040_read_reg_volatile(codec, e->reg);
+        val = twl6040_read(codec, e->reg);
         if (val & TWL6040_VIBENA && !(val & TWL6040_VIBSEL))
                 return -EBUSY;
 
@@ -656,7 +565,7 @@ int twl6040_get_trim_value(struct snd_soc_codec *codec, enum twl6040_trim trim)
         if (unlikely(trim >= TWL6040_TRIM_INVAL))
                 return -EINVAL;
 
-        return twl6040_read_reg_cache(codec, TWL6040_REG_TRIM1 + trim);
+        return twl6040_read(codec, TWL6040_REG_TRIM1 + trim);
 }
 EXPORT_SYMBOL_GPL(twl6040_get_trim_value);
 
@@ -931,8 +840,6 @@ static int twl6040_set_bias_level(struct snd_soc_codec *codec,
 
                 priv->codec_powered = 1;
 
-                twl6040_restore_regs(codec);
-
                 /* Set external boost GPO */
                 twl6040_write(codec, TWL6040_REG_GPOCTL, 0x02);
                 break;
@@ -1053,9 +960,9 @@ static void twl6040_mute_path(struct snd_soc_codec *codec, enum twl6040_dai_id i
 
         switch (id) {
         case TWL6040_DAI_DL1:
-                hslctl = twl6040_read_reg_cache(codec, TWL6040_REG_HSLCTL);
-                hsrctl = twl6040_read_reg_cache(codec, TWL6040_REG_HSRCTL);
-                earctl = twl6040_read_reg_cache(codec, TWL6040_REG_EARCTL);
+                hslctl = twl6040_read(codec, TWL6040_REG_HSLCTL);
+                hsrctl = twl6040_read(codec, TWL6040_REG_HSRCTL);
+                earctl = twl6040_read(codec, TWL6040_REG_EARCTL);
 
                 if (mute) {
                         /* Power down drivers and DACs */
@@ -1071,8 +978,8 @@ static void twl6040_mute_path(struct snd_soc_codec *codec, enum twl6040_dai_id i
                 priv->dl1_unmuted = !mute;
                 break;
         case TWL6040_DAI_DL2:
-                hflctl = twl6040_read_reg_cache(codec, TWL6040_REG_HFLCTL);
-                hfrctl = twl6040_read_reg_cache(codec, TWL6040_REG_HFRCTL);
+                hflctl = twl6040_read(codec, TWL6040_REG_HFLCTL);
+                hfrctl = twl6040_read(codec, TWL6040_REG_HFRCTL);
 
                 if (mute) {
                         /* Power down drivers and DACs */
@@ -1209,6 +1116,7 @@ static int twl6040_resume(struct snd_soc_codec *codec)
 static int twl6040_probe(struct snd_soc_codec *codec)
 {
         struct twl6040_data *priv;
+        struct twl6040 *twl6040 = dev_get_drvdata(codec->dev->parent);
         struct platform_device *pdev = container_of(codec->dev,
                                                    struct platform_device, dev);
         int ret = 0;
@@ -1220,7 +1128,7 @@ static int twl6040_probe(struct snd_soc_codec *codec)
         snd_soc_codec_set_drvdata(codec, priv);
 
         priv->codec = codec;
-        codec->control_data = dev_get_drvdata(codec->dev->parent);
+        codec->control_data = twl6040;
 
         priv->plug_irq = platform_get_irq(pdev, 0);
         if (priv->plug_irq < 0) {
@@ -1240,10 +1148,10 @@ static int twl6040_probe(struct snd_soc_codec *codec)
                 return ret;
         }
 
+        twl6040_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
         twl6040_init_chip(codec);
 
-        /* power on device */
-        return twl6040_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
+        return 0;
 }
 
 static int twl6040_remove(struct snd_soc_codec *codec)
@@ -1261,12 +1169,9 @@ static struct snd_soc_codec_driver soc_codec_dev_twl6040 = {
         .remove = twl6040_remove,
         .suspend = twl6040_suspend,
         .resume = twl6040_resume,
-        .read = twl6040_read_reg_cache,
+        .read = twl6040_read,
         .write = twl6040_write,
         .set_bias_level = twl6040_set_bias_level,
-        .reg_cache_size = ARRAY_SIZE(twl6040_reg),
-        .reg_word_size = sizeof(u8),
-        .reg_cache_default = twl6040_reg,
         .ignore_pmdown_time = true,
 
         .controls = twl6040_snd_controls,