ASoC: twl4030: Move hs_extmute GPIO handling to driver

The external mute (if it is in use) is handled by a GPIO line. Prepare to
remove the set_hs_extmute callback and replace it with:
hs_extmute_gpio: the GPIO number to use for external mute

When the users of set_hs_extmute has been converted the callback can be removed.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h
index ac6488c..2040309 100644 (file)
--- a/include/linux/i2c/twl.h
+++ b/include/linux/i2c/twl.h
@@ -667,7 +667,9 @@ struct twl4030_codec_data {
        unsigned int check_defaults:1;
        unsigned int reset_registers:1;
        unsigned int hs_extmute:1;
-       void (*set_hs_extmute)(int mute);
+       void (*set_hs_extmute)(int mute); /* Deprecated, use hs_extmute_gpio and
+                                            hs_extmute_disable_level */
+       int hs_extmute_gpio;
 };
 
 struct twl4030_vibra_data {

diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c
index 962341d..0c83c92 100644 (file)
--- a/sound/soc/codecs/twl4030.c
+++ b/sound/soc/codecs/twl4030.c
@@ -28,6 +28,7 @@
 #include <linux/platform_device.h>
 #include <linux/i2c/twl.h>
 #include <linux/slab.h>
+#include <linux/gpio.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
@@ -302,6 +303,22 @@ static void twl4030_init_chip(struct snd_soc_codec *codec)
        u8 reg, byte;
        int i = 0;
 
+       if (pdata && pdata->hs_extmute &&
+           gpio_is_valid(pdata->hs_extmute_gpio)) {
+               int ret;
+
+               if (!pdata->hs_extmute_gpio)
+                       dev_warn(codec->dev,
+                                "Extmute GPIO is 0 is this correct?\n");
+
+               ret = gpio_request_one(pdata->hs_extmute_gpio,
+                                      GPIOF_OUT_INIT_LOW, "hs_extmute");
+               if (ret) {
+                       dev_err(codec->dev, "Failed to get hs_extmute GPIO\n");
+                       pdata->hs_extmute_gpio = -1;
+               }
+       }
+
        /* Check defaults, if instructed before anything else */
        if (pdata && pdata->check_defaults)
                twl4030_check_defaults(codec);
@@ -748,7 +765,10 @@ static void headset_ramp(struct snd_soc_codec *codec, int ramp)
        /* Enable external mute control, this dramatically reduces
         * the pop-noise */
        if (pdata && pdata->hs_extmute) {
-               if (pdata->set_hs_extmute) {
+               if (gpio_is_valid(pdata->hs_extmute_gpio)) {
+                       gpio_set_value(pdata->hs_extmute_gpio, 1);
+               } else if (pdata->set_hs_extmute) {
+                       dev_warn(codec->dev, "set_hs_extmute is deprecated\n");
                        pdata->set_hs_extmute(1);
                } else {
                        hs_pop |= TWL4030_EXTMUTE;
@@ -786,7 +806,10 @@ static void headset_ramp(struct snd_soc_codec *codec, int ramp)
 
        /* Disable external mute */
        if (pdata && pdata->hs_extmute) {
-               if (pdata->set_hs_extmute) {
+               if (gpio_is_valid(pdata->hs_extmute_gpio)) {
+                       gpio_set_value(pdata->hs_extmute_gpio, 0);
+               } else if (pdata->set_hs_extmute) {
+                       dev_warn(codec->dev, "set_hs_extmute is deprecated\n");
                        pdata->set_hs_extmute(0);
                } else {
                        hs_pop &= ~TWL4030_EXTMUTE;
@@ -2236,12 +2259,17 @@ static int twl4030_soc_probe(struct snd_soc_codec *codec)
 
 static int twl4030_soc_remove(struct snd_soc_codec *codec)
 {
+       struct twl4030_codec_data *pdata = dev_get_platdata(codec->dev);
        struct twl4030_priv *twl4030 = snd_soc_codec_get_drvdata(codec);
 
        /* Reset registers to their chip default before leaving */
        twl4030_reset_registers(codec);
        twl4030_set_bias_level(codec, SND_SOC_BIAS_OFF);
        kfree(twl4030);
+
+       if (pdata && pdata->hs_extmute && gpio_is_valid(pdata->hs_extmute_gpio))
+               gpio_free(pdata->hs_extmute_gpio);
+
        return 0;
 }