Merge branches 'for-2639/i2c/i2c-ce4100-v6', 'for-2639/i2c/i2c-eg20t-v3' and 'for...

[cascardo/linux.git] / sound / soc / soc-jack.c

diff --git a/sound/soc/soc-jack.c b/sound/soc/soc-jack.c
index ac5a5bc..fcab80b 100644 (file)
--- a/sound/soc/soc-jack.c
+++ b/sound/soc/soc-jack.c
@@ -37,6 +37,7 @@ int snd_soc_jack_new(struct snd_soc_codec *codec, const char *id, int type,
 {
        jack->codec = codec;
        INIT_LIST_HEAD(&jack->pins);
+       INIT_LIST_HEAD(&jack->jack_zones);
        BLOCKING_INIT_NOTIFIER_HEAD(&jack->notifier);
 
        return snd_jack_new(codec->card->snd_card, id, type, &jack->jack);
@@ -100,7 +101,7 @@ void snd_soc_jack_report(struct snd_soc_jack *jack, int status, int mask)
        }
 
        /* Report before the DAPM sync to help users updating micbias status */
-       blocking_notifier_call_chain(&jack->notifier, status, NULL);
+       blocking_notifier_call_chain(&jack->notifier, status, jack);
 
        snd_soc_dapm_sync(dapm);
 
@@ -111,6 +112,51 @@ out:
 }
 EXPORT_SYMBOL_GPL(snd_soc_jack_report);
 
+/**
+ * snd_soc_jack_add_zones - Associate voltage zones with jack
+ *
+ * @jack:  ASoC jack
+ * @count: Number of zones
+ * @zone:  Array of zones
+ *
+ * After this function has been called the zones specified in the
+ * array will be associated with the jack.
+ */
+int snd_soc_jack_add_zones(struct snd_soc_jack *jack, int count,
+                         struct snd_soc_jack_zone *zones)
+{
+       int i;
+
+       for (i = 0; i < count; i++) {
+               INIT_LIST_HEAD(&zones[i].list);
+               list_add(&(zones[i].list), &jack->jack_zones);
+       }
+       return 0;
+}
+EXPORT_SYMBOL_GPL(snd_soc_jack_add_zones);
+
+/**
+ * snd_soc_jack_get_type - Based on the mic bias value, this function returns
+ * the type of jack from the zones delcared in the jack type
+ *
+ * @micbias_voltage:  mic bias voltage at adc channel when jack is plugged in
+ *
+ * Based on the mic bias value passed, this function helps identify
+ * the type of jack from the already delcared jack zones
+ */
+int snd_soc_jack_get_type(struct snd_soc_jack *jack, int micbias_voltage)
+{
+       struct snd_soc_jack_zone *zone;
+
+       list_for_each_entry(zone, &jack->jack_zones, list) {
+               if (micbias_voltage >= zone->min_mv &&
+                       micbias_voltage < zone->max_mv)
+                               return zone->jack_type;
+       }
+       return 0;
+}
+EXPORT_SYMBOL_GPL(snd_soc_jack_get_type);
+
 /**
  * snd_soc_jack_add_pins - Associate DAPM pins with an ASoC jack
  *
@@ -194,7 +240,7 @@ static void snd_soc_jack_gpio_detect(struct snd_soc_jack_gpio *gpio)
        int enable;
        int report;
 
-       enable = gpio_get_value(gpio->gpio);
+       enable = gpio_get_value_cansleep(gpio->gpio);
        if (gpio->invert)
                enable = !enable;
 
@@ -284,6 +330,14 @@ int snd_soc_jack_add_gpios(struct snd_soc_jack *jack, int count,
                if (ret)
                        goto err;
 
+               if (gpios[i].wake) {
+                       ret = set_irq_wake(gpio_to_irq(gpios[i].gpio), 1);
+                       if (ret != 0)
+                               printk(KERN_ERR
+                                 "Failed to mark GPIO %d as wake source: %d\n",
+                                       gpios[i].gpio, ret);
+               }
+
 #ifdef CONFIG_GPIO_SYSFS
                /* Expose GPIO value over sysfs for diagnostic purposes */
                gpio_export(gpios[i].gpio, false);