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

Commit 8c8145b8 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda - Make jack-plug notification selectable 



Make the jack-plug notification via input layer selectable via Kconfig.
This is often unnecessary, and the similr function will be provided
using the ALSA control API in near future anyway.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 8c927b4a

sound/pci/hda/Kconfig

+8 −1
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ menuconfig SND_HDA_INTEL 
	tristate "Intel HD Audio"

	select SND_PCM

	select SND_VMASTER

	select SND_JACK if INPUT=y || INPUT=SND

	help

	  Say Y here to include support for Intel "High Definition

	  Audio" (Azalia) and its compatible devices.
@@ -39,6 +38,14 @@ config SND_HDA_INPUT_BEEP 
	  Say Y here to build a digital beep interface for HD-audio

	  driver. This interface is used to generate digital beeps.



config SND_HDA_INPUT_JACK

	bool "Support jack plugging notification via input layer"

	depends on INPUT=y || INPUT=SND_HDA_INTEL

	select SND_JACK

	help

	  Say Y here to enable the jack plugging notification via

	  input layer.



config SND_HDA_CODEC_REALTEK

	bool "Build Realtek HD-audio codec support"

	default y

sound/pci/hda/patch_conexant.c

+2 −2
Original line number Diff line number Diff line
@@ -349,7 +349,7 @@ static int conexant_mux_enum_put(struct snd_kcontrol *kcontrol, 
				     &spec->cur_mux[adc_idx]);

}



#ifdef CONFIG_SND_JACK

#ifdef CONFIG_SND_HDA_INPUT_JACK

static void conexant_free_jack_priv(struct snd_jack *jack)

{

	struct conexant_jack *jacks = jack->private_data;
@@ -463,7 +463,7 @@ static int conexant_init(struct hda_codec *codec) 


static void conexant_free(struct hda_codec *codec)

{

#ifdef CONFIG_SND_JACK

#ifdef CONFIG_SND_HDA_INPUT_JACK

	struct conexant_spec *spec = codec->spec;

	if (spec->jacks.list) {

		struct conexant_jack *jacks = spec->jacks.list;

sound/pci/hda/patch_sigmatel.c

+3 −3
Original line number Diff line number Diff line
@@ -4035,7 +4035,7 @@ static void stac_gpio_set(struct hda_codec *codec, unsigned int mask, 
			   AC_VERB_SET_GPIO_DATA, gpiostate); /* sync */

}



#ifdef CONFIG_SND_JACK

#ifdef CONFIG_SND_HDA_INPUT_JACK

static void stac92xx_free_jack_priv(struct snd_jack *jack)

{

	struct sigmatel_jack *jacks = jack->private_data;
@@ -4047,7 +4047,7 @@ static void stac92xx_free_jack_priv(struct snd_jack *jack) 
static int stac92xx_add_jack(struct hda_codec *codec,

		hda_nid_t nid, int type)

{

#ifdef CONFIG_SND_JACK

#ifdef CONFIG_SND_HDA_INPUT_JACK

	struct sigmatel_spec *spec = codec->spec;

	struct sigmatel_jack *jack;

	int def_conf = snd_hda_codec_get_pincfg(codec, nid);
@@ -4336,7 +4336,7 @@ static int stac92xx_init(struct hda_codec *codec) 


static void stac92xx_free_jacks(struct hda_codec *codec)

{

#ifdef CONFIG_SND_JACK

#ifdef CONFIG_SND_HDA_INPUT_JACK

	/* free jack instances manually when clearing/reconfiguring */

	struct sigmatel_spec *spec = codec->spec;

	if (!codec->bus->shutdown && spec->jacks.list) {