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

Commit 86c53bd2 authored by Jonathan Woithe's avatar Jonathan Woithe Committed by Jaroslav Kysela
Browse files

[ALSA] hda-codec - Add test model for ALC268 



This implements a test model for the ALC268.  It depends on the feature
added by alc260-test-eapd-0.2.diff.  This patch also adds a mention of
the ALC260 test model to ALSA-Configuration.txt since this seems to have
been missed.

Signed-off-by: default avatarJonathan Woithe <jwoithe@physics.adelaide.edu.au>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@perex.cz>
parent f8225f6d

Documentation/sound/alsa/ALSA-Configuration.txt

+6 −0
Original line number Diff line number Diff line
@@ -801,6 +801,9 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 
	  will		Will laptops (PB V7900)

	  replacer	Replacer 672V

	  basic		fixed pin assignment (old default model)

	  test		for testing/debugging purpose, almost all controls can

			adjusted.  Appearing only when compiled with

			$CONFIG_SND_DEBUG=y

	  auto		auto-config reading BIOS (default)



	ALC262
@@ -821,6 +824,9 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 
	  3stack	3-stack model

	  toshiba	Toshiba A205

	  acer		Acer laptops

	  test		for testing/debugging purpose, almost all controls can

			adjusted.  Appearing only when compiled with

			$CONFIG_SND_DEBUG=y

	  auto		auto-config reading BIOS (default)



	ALC662

sound/pci/hda/patch_realtek.c

+76 −0
Original line number Diff line number Diff line
@@ -106,6 +106,9 @@ enum { 
	ALC268_3ST,

	ALC268_TOSHIBA,

	ALC268_ACER,

#ifdef CONFIG_SND_DEBUG

	ALC268_TEST,

#endif

	ALC268_AUTO,

	ALC268_MODEL_LAST /* last tag */

};
@@ -9366,6 +9369,60 @@ static struct hda_input_mux alc268_capture_source = { 
	},

};



#ifdef CONFIG_SND_DEBUG

static struct snd_kcontrol_new alc268_test_mixer[] = {

	HDA_CODEC_VOLUME("Front Playback Volume", 0x2, 0x0, HDA_OUTPUT),

	HDA_CODEC_MUTE("Front Playback Switch", 0x14, 0x0, HDA_OUTPUT),

	HDA_CODEC_VOLUME("Headphone Playback Volume", 0x3, 0x0, HDA_OUTPUT),

	HDA_CODEC_MUTE("Headphone Playback Switch", 0x15, 0x0, HDA_OUTPUT),



	/* Volume widgets */

	HDA_CODEC_VOLUME("LOUT1 Playback Volume", 0x02, 0x0, HDA_OUTPUT),

	HDA_CODEC_VOLUME("LOUT2 Playback Volume", 0x03, 0x0, HDA_OUTPUT),

	HDA_BIND_MUTE_MONO("Mono sum Playback Switch", 0x0e, 1, 2, HDA_INPUT),

	HDA_BIND_MUTE("LINE-OUT sum Playback Switch", 0x0f, 2, HDA_INPUT),

	HDA_BIND_MUTE("HP-OUT sum Playback Switch", 0x10, 2, HDA_INPUT),

	HDA_BIND_MUTE("LINE-OUT Playback Switch", 0x14, 2, HDA_OUTPUT),

	HDA_BIND_MUTE("HP-OUT Playback Switch", 0x15, 2, HDA_OUTPUT),

	HDA_BIND_MUTE("Mono Playback Switch", 0x16, 2, HDA_OUTPUT),

	HDA_CODEC_VOLUME("MIC1 Capture Volume", 0x18, 0x0, HDA_INPUT),

	HDA_BIND_MUTE("MIC1 Capture Switch", 0x18, 2, HDA_OUTPUT),

	HDA_CODEC_VOLUME("MIC2 Capture Volume", 0x19, 0x0, HDA_INPUT),

	HDA_CODEC_VOLUME("LINE1 Capture Volume", 0x1a, 0x0, HDA_INPUT),

	HDA_BIND_MUTE("LINE1 Capture Switch", 0x1a, 2, HDA_OUTPUT),

	HDA_CODEC_VOLUME("PCBEEP Playback Volume", 0x1d, 0x0, HDA_INPUT),

	HDA_CODEC_VOLUME("PCM-IN1 Capture Volume", 0x23, 0x0, HDA_OUTPUT),

	HDA_BIND_MUTE("PCM-IN1 Capture Switch", 0x23, 2, HDA_OUTPUT),

	HDA_CODEC_VOLUME("PCM-IN2 Capture Volume", 0x24, 0x0, HDA_OUTPUT),

	HDA_BIND_MUTE("PCM-IN2 Capture Switch", 0x24, 2, HDA_OUTPUT),



	/* Modes for retasking pin widgets */

	ALC_PIN_MODE("LINE-OUT pin mode", 0x14, ALC_PIN_DIR_INOUT),

	ALC_PIN_MODE("HP-OUT pin mode", 0x15, ALC_PIN_DIR_INOUT),

	ALC_PIN_MODE("MIC1 pin mode", 0x18, ALC_PIN_DIR_INOUT),

	ALC_PIN_MODE("LINE1 pin mode", 0x1a, ALC_PIN_DIR_INOUT),



	/* Controls for GPIO pins, assuming they are configured as outputs */

	ALC_GPIO_DATA_SWITCH("GPIO pin 0", 0x01, 0x01),

	ALC_GPIO_DATA_SWITCH("GPIO pin 1", 0x01, 0x02),

	ALC_GPIO_DATA_SWITCH("GPIO pin 2", 0x01, 0x04),

	ALC_GPIO_DATA_SWITCH("GPIO pin 3", 0x01, 0x08),



	/* Switches to allow the digital SPDIF output pin to be enabled.

	 * The ALC268 does not have an SPDIF input.

	 */

	ALC_SPDIF_CTRL_SWITCH("SPDIF Playback Switch", 0x06, 0x01),



	/* A switch allowing EAPD to be enabled.  Some laptops seem to use

	 * this output to turn on an external amplifier.

	 */

	ALC_EAPD_CTRL_SWITCH("LINE-OUT EAPD Enable Switch", 0x0f, 0x02),

	ALC_EAPD_CTRL_SWITCH("HP-OUT EAPD Enable Switch", 0x10, 0x02),



	{ } /* end */

};

#endif



/* create input playback/capture controls for the given pin */

static int alc268_new_analog_output(struct alc_spec *spec, hda_nid_t nid,

				    const char *ctlname, int idx)
@@ -9578,6 +9635,9 @@ static const char *alc268_models[ALC268_MODEL_LAST] = { 
	[ALC268_3ST]		= "3stack",

	[ALC268_TOSHIBA]	= "toshiba",

	[ALC268_ACER]		= "acer",

#ifdef CONFIG_SND_DEBUG

	[ALC268_TEST]		= "test",

#endif

	[ALC268_AUTO]		= "auto",

};
@@ -9636,6 +9696,22 @@ static struct alc_config_preset alc268_presets[] = { 
		.unsol_event = alc268_acer_unsol_event,

		.init_hook = alc268_acer_init_hook,

	},

#ifdef CONFIG_SND_DEBUG

	[ALC268_TEST] = {

		.mixers = { alc268_test_mixer, alc268_capture_mixer },

		.init_verbs = { alc268_base_init_verbs, alc268_eapd_verbs,

				alc268_volume_init_verbs },

		.num_dacs = ARRAY_SIZE(alc268_dac_nids),

		.dac_nids = alc268_dac_nids,

		.num_adc_nids = ARRAY_SIZE(alc268_adc_nids_alt),

		.adc_nids = alc268_adc_nids_alt,

		.hp_nid = 0x03,

		.dig_out_nid = ALC268_DIGOUT_NID,

		.num_channel_mode = ARRAY_SIZE(alc268_modes),

		.channel_mode = alc268_modes,

		.input_mux = &alc268_capture_source,

	},

#endif

};



static int patch_alc268(struct hda_codec *codec)