Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa9879ed authored by Vinod Koul's avatar Vinod Koul Committed by Mark Brown
Browse files

ASoC: add support for multiple jack types 



This patch adds soc-jack support for adding voltage zones and for
detecting jack type

Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
Signed-off-by: default avatarHarsha Priya <priya.harsha@intel.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 866fd936

include/sound/soc.h

+23 −0
Original line number Diff line number Diff line
@@ -234,6 +234,7 @@ struct snd_soc_codec; 
struct snd_soc_codec_driver;

struct soc_enum;

struct snd_soc_jack;

struct snd_soc_jack_zone;

struct snd_soc_jack_pin;

struct snd_soc_cache_ops;

#include <sound/soc-dapm.h>
@@ -307,6 +308,9 @@ void snd_soc_jack_notifier_register(struct snd_soc_jack *jack, 
				    struct notifier_block *nb);

void snd_soc_jack_notifier_unregister(struct snd_soc_jack *jack,

				      struct notifier_block *nb);

int snd_soc_jack_add_zones(struct snd_soc_jack *jack, int count,

			  struct snd_soc_jack_zone *zones);

int snd_soc_jack_get_type(struct snd_soc_jack *jack, int micbias_voltage);

#ifdef CONFIG_GPIOLIB

int snd_soc_jack_add_gpios(struct snd_soc_jack *jack, int count,

			struct snd_soc_jack_gpio *gpios);
@@ -406,6 +410,24 @@ struct snd_soc_jack_pin { 
	bool invert;

};



/**

 * struct snd_soc_jack_zone - Describes voltage zones of jack detection

 *

 * @min_mv: start voltage in mv

 * @max_mv: end voltage in mv

 * @jack_type: type of jack that is expected for this voltage

 * @debounce_time: debounce_time for jack, codec driver should wait for this

 *		duration before reading the adc for voltages

 * @:list: list container

 */

struct snd_soc_jack_zone {

	unsigned int min_mv;

	unsigned int max_mv;

	unsigned int jack_type;

	unsigned int debounce_time;

	struct list_head list;

};



/**

 * struct snd_soc_jack_gpio - Describes a gpio pin for jack detection

 *
@@ -435,6 +457,7 @@ struct snd_soc_jack { 
	struct list_head pins;

	int status;

	struct blocking_notifier_head notifier;

	struct list_head jack_zones;

};



/* SoC PCM stream information */

sound/soc/soc-jack.c

+46 −0
Original line number Diff line number Diff line
@@ -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);
@@ -111,6 +112,51 @@ void snd_soc_jack_report(struct snd_soc_jack *jack, int status, int mask) 
}

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

 *