Unverified Commit 6c9802b8 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: simple-card-utils: create jack inputs for 

Merge series from Astrid Rost <astrid.rost@axis.com>:

Add a generic way to create jack inputs for auxiliary jack detection
drivers (e.g. via i2c, spi), which are not part of any real codec.
The simple-card can be used as combining card driver to add the jacks,
no new one is required.

Create a jack (for input-events) for jack devices in the auxiliary
device list (aux_devs). A device which returns a valid value on
get_jack_type counts as jack device; set_jack is required
to add the jack to the device.
parents aa9ff6a4 087b9dda

include/sound/simple_card_utils.h

+3 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ struct asoc_simple_priv { 
	} *dai_props;

	struct asoc_simple_jack hp_jack;

	struct asoc_simple_jack mic_jack;

	struct snd_soc_jack *aux_jacks;

	struct snd_soc_dai_link *dai_link;

	struct asoc_simple_dai *dais;

	struct snd_soc_dai_link_component *dlcs;
@@ -187,6 +188,8 @@ int asoc_simple_parse_pin_switches(struct snd_soc_card *card, 
int asoc_simple_init_jack(struct snd_soc_card *card,

			       struct asoc_simple_jack *sjack,

			       int is_hp, char *prefix, char *pin);

int asoc_simple_init_aux_jacks(struct asoc_simple_priv *priv,

				char *prefix);

int asoc_simple_init_priv(struct asoc_simple_priv *priv,

			       struct link_info *li);

int asoc_simple_remove(struct platform_device *pdev);

include/sound/soc-component.h

+2 −0
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ struct snd_soc_component_driver { 
		       int source, unsigned int freq_in, unsigned int freq_out);

	int (*set_jack)(struct snd_soc_component *component,

			struct snd_soc_jack *jack,  void *data);

	int (*get_jack_type)(struct snd_soc_component *component);



	/* DT */

	int (*of_xlate_dai_name)(struct snd_soc_component *component,
@@ -384,6 +385,7 @@ int snd_soc_component_set_pll(struct snd_soc_component *component, int pll_id, 
			      unsigned int freq_out);

int snd_soc_component_set_jack(struct snd_soc_component *component,

			       struct snd_soc_jack *jack, void *data);

int snd_soc_component_get_jack_type(struct snd_soc_component *component);



void snd_soc_component_seq_notifier(struct snd_soc_component *component,

				    enum snd_soc_dapm_type type, int subseq);

sound/soc/codecs/ts3a227e.c

+19 −1
Original line number Diff line number Diff line
@@ -258,7 +258,25 @@ int ts3a227e_enable_jack_detect(struct snd_soc_component *component, 
}

EXPORT_SYMBOL_GPL(ts3a227e_enable_jack_detect);



static struct snd_soc_component_driver ts3a227e_soc_driver;

static int ts3a227e_set_jack(struct snd_soc_component *component,

			     struct snd_soc_jack *jack, void *data)

{

	if (jack == NULL)

		return -EINVAL;



	return ts3a227e_enable_jack_detect(component, jack);

}



static int ts3a227e_get_jack_type(struct snd_soc_component *component)

{

	return SND_JACK_HEADSET;

}



static const struct snd_soc_component_driver ts3a227e_soc_driver = {

	.name = "ti,ts3a227e",

	.set_jack = ts3a227e_set_jack,

	.get_jack_type = ts3a227e_get_jack_type,

};



static const struct regmap_config ts3a227e_regmap_config = {

	.val_bits = 8,

sound/soc/generic/simple-card-utils.c

+49 −0
Original line number Diff line number Diff line
@@ -786,6 +786,55 @@ int asoc_simple_init_jack(struct snd_soc_card *card, 
}

EXPORT_SYMBOL_GPL(asoc_simple_init_jack);



int asoc_simple_init_aux_jacks(struct asoc_simple_priv *priv, char *prefix)

{

	struct snd_soc_card *card = simple_priv_to_card(priv);

	struct snd_soc_component *component;

	int found_jack_index = 0;

	int type = 0;

	int num = 0;

	int ret;



	if (priv->aux_jacks)

		return 0;



	for_each_card_auxs(card, component) {

		type = snd_soc_component_get_jack_type(component);

		if (type > 0)

			num++;

	}

	if (num < 1)

		return 0;



	priv->aux_jacks = devm_kcalloc(card->dev, num,

				       sizeof(struct snd_soc_jack), GFP_KERNEL);

	if (!priv->aux_jacks)

		return -ENOMEM;



	for_each_card_auxs(card, component) {

		char id[128];

		struct snd_soc_jack *jack;



		if (found_jack_index >= num)

			break;



		type = snd_soc_component_get_jack_type(component);

		if (type <= 0)

			continue;



		/* create jack */

		jack = &(priv->aux_jacks[found_jack_index++]);

		snprintf(id, sizeof(id), "%s-jack", component->name);

		ret = snd_soc_card_jack_new(card, id, type, jack);

		if (ret)

			continue;



		(void)snd_soc_component_set_jack(component, jack, NULL);

	}

	return 0;

}

EXPORT_SYMBOL_GPL(asoc_simple_init_aux_jacks);



int asoc_simple_init_priv(struct asoc_simple_priv *priv,

			  struct link_info *li)

{

sound/soc/generic/simple-card.c

+4 −0
Original line number Diff line number Diff line
@@ -623,6 +623,10 @@ static int simple_soc_probe(struct snd_soc_card *card) 
	if (ret < 0)

		return ret;



	ret = asoc_simple_init_aux_jacks(priv, PREFIX);

	if (ret < 0)

		return ret;



	return 0;

}