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

Commit 4e3f0dc6 authored by Jie Yang's avatar Jie Yang Committed by Takashi Iwai
Browse files

ALSA: jack: extend snd_jack_new to support phantom jack 



Dont create input devices for phantom jacks.

Here, we extend snd_jack_new() to support phantom jack creating:
pass in a bool param for [non-]phantom flag, and a bool param
initial_jack to indicate whether we need to create a kctl at
this stage.

We can also add a kctl to the jack after its created meaning we
can now integrate the HDA and ASoC jacks.

Signed-off-by: default avatarJie Yang <yang.jie@intel.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent b8dd0866

include/sound/jack.h

+2 −2
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ struct snd_jack { 
#ifdef CONFIG_SND_JACK



int snd_jack_new(struct snd_card *card, const char *id, int type,

		 struct snd_jack **jack);

		 struct snd_jack **jack, bool initial_kctl, bool phantom_jack);

int snd_jack_add_new_kctl(struct snd_jack *jack, const char * name, int mask);

void snd_jack_set_parent(struct snd_jack *jack, struct device *parent);

int snd_jack_set_key(struct snd_jack *jack, enum snd_jack_types type,
@@ -97,7 +97,7 @@ void snd_jack_report(struct snd_jack *jack, int status); 


#else

static inline int snd_jack_new(struct snd_card *card, const char *id, int type,

			       struct snd_jack **jack)

			       struct snd_jack **jack, bool initial_kctl, bool phantom_jack)

{

	return 0;

}

sound/core/jack.c

+28 −12
Original line number Diff line number Diff line
@@ -191,6 +191,8 @@ EXPORT_SYMBOL(snd_jack_add_new_kctl); 
 * @type:  a bitmask of enum snd_jack_type values that can be detected by

 *         this jack

 * @jjack: Used to provide the allocated jack object to the caller.

 * @initial_kctl: if true, create a kcontrol and add it to the jack list.

 * @phantom_jack: Don't create a input device for phantom jacks.

 *

 * Creates a new jack object.

 *
@@ -198,9 +200,10 @@ EXPORT_SYMBOL(snd_jack_add_new_kctl); 
 * On success @jjack will be initialised.

 */

int snd_jack_new(struct snd_card *card, const char *id, int type,

		 struct snd_jack **jjack)

		 struct snd_jack **jjack, bool initial_kctl, bool phantom_jack)

{

	struct snd_jack *jack;

	struct snd_jack_kctl *jack_kctl = NULL;

	int err;

	int i;

	static struct snd_device_ops ops = {
@@ -209,12 +212,20 @@ int snd_jack_new(struct snd_card *card, const char *id, int type, 
		.dev_disconnect = snd_jack_dev_disconnect,

	};



	if (initial_kctl) {

		jack_kctl = snd_jack_kctl_new(card, id, type);

		if (!jack_kctl)

			return -ENOMEM;

	}



	jack = kzalloc(sizeof(struct snd_jack), GFP_KERNEL);

	if (jack == NULL)

		return -ENOMEM;



	jack->id = kstrdup(id, GFP_KERNEL);



	/* don't creat input device for phantom jack */

	if (!phantom_jack) {

		jack->input_dev = input_allocate_device();

		if (jack->input_dev == NULL) {

			err = -ENOMEM;
@@ -230,6 +241,8 @@ int snd_jack_new(struct snd_card *card, const char *id, int type, 
				input_set_capability(jack->input_dev, EV_SW,

						     jack_switch_types[i]);



	}



	err = snd_device_new(card, SNDRV_DEV_JACK, jack, &ops);

	if (err < 0)

		goto fail_input;
@@ -237,6 +250,9 @@ int snd_jack_new(struct snd_card *card, const char *id, int type, 
	jack->card = card;

	INIT_LIST_HEAD(&jack->kctl_list);



	if (initial_kctl)

		snd_jack_kctl_add(jack, jack_kctl);



	*jjack = jack;



	return 0;

sound/pci/hda/hda_jack.c

+1 −1
Original line number Diff line number Diff line
@@ -417,7 +417,7 @@ static int __snd_hda_jack_add_kctl(struct hda_codec *codec, hda_nid_t nid, 
	if (!phantom_jack) {

		jack->type = get_input_jack_type(codec, nid);

		err = snd_jack_new(codec->card, name, jack->type,

				   &jack->jack);

				   &jack->jack, false, false);

		if (err < 0)

			return err;

		jack->jack->private_data = jack;

sound/pci/oxygen/xonar_wm87x6.c

+1 −1
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ static void xonar_ds_init(struct oxygen *chip) 
	xonar_enable_output(chip);



	snd_jack_new(chip->card, "Headphone",

		     SND_JACK_HEADPHONE, &data->hp_jack);

		     SND_JACK_HEADPHONE, &data->hp_jack, false, false);

	xonar_ds_handle_hp_jack(chip);



	snd_component_add(chip->card, "WM8776");

sound/soc/soc-jack.c

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ int snd_soc_card_jack_new(struct snd_soc_card *card, const char *id, int type, 
	INIT_LIST_HEAD(&jack->jack_zones);

	BLOCKING_INIT_NOTIFIER_HEAD(&jack->notifier);



	ret = snd_jack_new(card->snd_card, id, type, &jack->jack);

	ret = snd_jack_new(card->snd_card, id, type, &jack->jack, false, false);

	if (ret)

		return ret;