ASoC: twl6040: Enable plug detection interrupts

Enable plug detection interrupt mask in order to get headset
PLUGINT/UNPLUGINT interrupts.

Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
Signed-off-by: Margarita Olaya Cabrera <magi.olaya@ti.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>

diff --git a/sound/soc/codecs/twl6040.c b/sound/soc/codecs/twl6040.c
index f5d5f89a2216dca5f9162e9ccecfa6a1b87ba699..a8ec9113cc339aee35a5dbc040dfadcd58ace883 100644 (file)
--- a/sound/soc/codecs/twl6040.c
+++ b/sound/soc/codecs/twl6040.c
@@ -1108,7 +1108,7 @@ static int twl6040_probe(struct snd_soc_codec *codec)
        struct twl6040_data *priv;
        int audpwron, naudint;
        int ret = 0;
-       u8 icrev;
+       u8 icrev, intmr = TWL6040_ALLINT_MSK;
 
        priv = kzalloc(sizeof(struct twl6040_data), GFP_KERNEL);
        if (priv == NULL)
@@ -1154,16 +1154,12 @@ static int twl6040_probe(struct snd_soc_codec *codec)
                priv->codec_powered = 0;
 
                /* enable only codec ready interrupt */
-               twl6040_write(codec, TWL6040_REG_INTMR,
-                                       ~TWL6040_READYMSK & TWL6040_ALLINT_MSK);
+               intmr &= ~(TWL6040_READYMSK | TWL6040_PLUGMSK);
 
                /* reset interrupt status to allow correct power up sequence */
                twl6040_read_reg_volatile(codec, TWL6040_REG_INTID);
-       } else {
-               /* no interrupts at all */
-               twl6040_write_reg_cache(codec, TWL6040_REG_INTMR,
-                                               TWL6040_ALLINT_MSK);
        }
+       twl6040_write(codec, TWL6040_REG_INTMR, intmr);
 
        if (naudint) {
                /* audio interrupt */

diff --git a/sound/soc/codecs/twl6040.h b/sound/soc/codecs/twl6040.h
index 67396f63c1ecf8df41cc2e8e765abe621a3fba2b..23aeed0963e69dbdcf72387bffb9526f270c299b 100644 (file)
--- a/sound/soc/codecs/twl6040.h
+++ b/sound/soc/codecs/twl6040.h
@@ -79,6 +79,7 @@
 
 /* INTMR (0x04) fields */
 
+#define TWL6040_PLUGMSK                        0x02
 #define TWL6040_READYMSK               0x40
 #define TWL6040_ALLINT_MSK             0x7B