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

Commit c3c2c9e7 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda/realtek - Remove leftover static quirks for ALC260 



Now we can clean up all static quirks for ALC260.
Also many codes in alc_quirks.c can be ripped off since they have been
used only by ALC260 static quirks.

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

Documentation/sound/alsa/HD-Audio-Models.txt

+1 −5
Original line number Original line Diff line number Diff line
@@ -29,11 +29,7 @@ ALC880 




ALC260

ALC260

======

======

  basic		fixed pin assignment (old default model)

  N/A

  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

ALC262

======

======

sound/pci/hda/alc260_quirks.c

deleted100644 → 0
+0 −432
Original line number Original line Diff line number Diff line 
/*

 * ALC260 quirk models

 * included by patch_realtek.c

 */



/* ALC260 models */

enum {

	ALC260_AUTO,

	ALC260_BASIC,

#ifdef CONFIG_SND_DEBUG

	ALC260_TEST,

#endif

	ALC260_MODEL_LAST /* last tag */

};



static const hda_nid_t alc260_dac_nids[1] = {

	/* front */

	0x02,

};



static const hda_nid_t alc260_adc_nids[1] = {

	/* ADC0 */

	0x04,

};



static const hda_nid_t alc260_adc_nids_alt[1] = {

	/* ADC1 */

	0x05,

};



/* NIDs used when simultaneous access to both ADCs makes sense.  Note that

 * alc260_capture_mixer assumes ADC0 (nid 0x04) is the first ADC.

 */

static const hda_nid_t alc260_dual_adc_nids[2] = {

	/* ADC0, ADC1 */

	0x04, 0x05

};



#define ALC260_DIGOUT_NID	0x03

#define ALC260_DIGIN_NID	0x06



static const struct hda_input_mux alc260_capture_source = {

	.num_items = 4,

	.items = {

		{ "Mic", 0x0 },

		{ "Front Mic", 0x1 },

		{ "Line", 0x2 },

		{ "CD", 0x4 },

	},

};



/* Acer TravelMate(/Extensa/Aspire) notebooks have similar configuration to

 * the Fujitsu S702x, but jacks are marked differently.

 */

static const struct hda_input_mux alc260_acer_capture_sources[2] = {

	{

		.num_items = 4,

		.items = {

			{ "Mic", 0x0 },

			{ "Line", 0x2 },

			{ "CD", 0x4 },

			{ "Headphone", 0x5 },

		},

	},

	{

		.num_items = 5,

		.items = {

			{ "Mic", 0x0 },

			{ "Line", 0x2 },

			{ "CD", 0x4 },

			{ "Headphone", 0x6 },

			{ "Mixer", 0x5 },

		},

	},

};



/*

 * This is just place-holder, so there's something for alc_build_pcms to look

 * at when it calculates the maximum number of channels. ALC260 has no mixer

 * element which allows changing the channel mode, so the verb list is

 * never used.

 */

static const struct hda_channel_mode alc260_modes[1] = {

	{ 2, NULL },

};





/* Mixer combinations

 *

 * basic: base_output + input + pc_beep + capture

 * fujitsu: fujitsu + capture

 * acer: acer + capture

 */



static const struct snd_kcontrol_new alc260_base_output_mixer[] = {

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

	HDA_BIND_MUTE("Front Playback Switch", 0x08, 2, HDA_INPUT),

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

	HDA_BIND_MUTE("Headphone Playback Switch", 0x09, 2, HDA_INPUT),

	HDA_CODEC_VOLUME_MONO("Mono Playback Volume", 0x0a, 1, 0x0, HDA_OUTPUT),

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

	{ } /* end */

};



static const struct snd_kcontrol_new alc260_input_mixer[] = {

	HDA_CODEC_VOLUME("CD Playback Volume", 0x07, 0x04, HDA_INPUT),

	HDA_CODEC_MUTE("CD Playback Switch", 0x07, 0x04, HDA_INPUT),

	HDA_CODEC_VOLUME("Line Playback Volume", 0x07, 0x02, HDA_INPUT),

	HDA_CODEC_MUTE("Line Playback Switch", 0x07, 0x02, HDA_INPUT),

	HDA_CODEC_VOLUME("Mic Playback Volume", 0x07, 0x0, HDA_INPUT),

	HDA_CODEC_MUTE("Mic Playback Switch", 0x07, 0x0, HDA_INPUT),

	HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x07, 0x01, HDA_INPUT),

	HDA_CODEC_MUTE("Front Mic Playback Switch", 0x07, 0x01, HDA_INPUT),

	{ } /* end */

};



/*

 * initialization verbs

 */

static const struct hda_verb alc260_init_verbs[] = {

	/* Line In pin widget for input */

	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},

	/* CD pin widget for input */

	{0x16, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},

	/* Mic1 (rear panel) pin widget for input and vref at 80% */

	{0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},

	/* Mic2 (front panel) pin widget for input and vref at 80% */

	{0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},

	/* LINE-2 is used for line-out in rear */

	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},

	/* select line-out */

	{0x0e, AC_VERB_SET_CONNECT_SEL, 0x00},

	/* LINE-OUT pin */

	{0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},

	/* enable HP */

	{0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},

	/* enable Mono */

	{0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},

	/* mute capture amp left and right */

	{0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},

	/* set connection select to line in (default select for this ADC) */

	{0x04, AC_VERB_SET_CONNECT_SEL, 0x02},

	/* mute capture amp left and right */

	{0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},

	/* set connection select to line in (default select for this ADC) */

	{0x05, AC_VERB_SET_CONNECT_SEL, 0x02},

	/* set vol=0 Line-Out mixer amp left and right */

	{0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},

	/* unmute pin widget amp left and right (no gain on this amp) */

	{0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},

	/* set vol=0 HP mixer amp left and right */

	{0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},

	/* unmute pin widget amp left and right (no gain on this amp) */

	{0x10, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},

	/* set vol=0 Mono mixer amp left and right */

	{0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},

	/* unmute pin widget amp left and right (no gain on this amp) */

	{0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},

	/* unmute LINE-2 out pin */

	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},

	/* Amp Indexes: CD = 0x04, Line In 1 = 0x02, Mic 1 = 0x00 &

	 * Line In 2 = 0x03

	 */

	/* mute analog inputs */

	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},

	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},

	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)},

	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},

	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},

	/* Amp Indexes: DAC = 0x01 & mixer = 0x00 */

	/* mute Front out path */

	{0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},

	{0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},

	/* mute Headphone out path */

	{0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},

	{0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},

	/* mute Mono out path */

	{0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},

	{0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},

	{ }

};



static const struct hda_verb alc260_hp_dc7600_verbs[] = {

	{0x05, AC_VERB_SET_CONNECT_SEL, 0x01},

	{0x15, AC_VERB_SET_CONNECT_SEL, 0x01},

	{0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},

	{0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},

	{0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},

	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},

	{0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},

	{0x10, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC_HP_EVENT},

	{0x11, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC_HP_EVENT},

	{0x15, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC_HP_EVENT},

	{}

};



/* Test configuration for debugging, modelled after the ALC880 test

 * configuration.

 */

#ifdef CONFIG_SND_DEBUG

static const hda_nid_t alc260_test_dac_nids[1] = {

	0x02,

};

static const hda_nid_t alc260_test_adc_nids[2] = {

	0x04, 0x05,

};

/* For testing the ALC260, each input MUX needs its own definition since

 * the signal assignments are different.  This assumes that the first ADC

 * is NID 0x04.

 */

static const struct hda_input_mux alc260_test_capture_sources[2] = {

	{

		.num_items = 7,

		.items = {

			{ "MIC1 pin", 0x0 },

			{ "MIC2 pin", 0x1 },

			{ "LINE1 pin", 0x2 },

			{ "LINE2 pin", 0x3 },

			{ "CD pin", 0x4 },

			{ "LINE-OUT pin", 0x5 },

			{ "HP-OUT pin", 0x6 },

		},

        },

	{

		.num_items = 8,

		.items = {

			{ "MIC1 pin", 0x0 },

			{ "MIC2 pin", 0x1 },

			{ "LINE1 pin", 0x2 },

			{ "LINE2 pin", 0x3 },

			{ "CD pin", 0x4 },

			{ "Mixer", 0x5 },

			{ "LINE-OUT pin", 0x6 },

			{ "HP-OUT pin", 0x7 },

		},

        },

};

static const struct snd_kcontrol_new alc260_test_mixer[] = {

	/* Output driver widgets */

	HDA_CODEC_VOLUME_MONO("Mono Playback Volume", 0x0a, 1, 0x0, HDA_OUTPUT),

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

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

	HDA_BIND_MUTE("LOUT2 Playback Switch", 0x09, 2, HDA_INPUT),

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

	HDA_BIND_MUTE("LOUT1 Playback Switch", 0x08, 2, HDA_INPUT),



	/* Modes for retasking pin widgets

	 * Note: the ALC260 doesn't seem to act on requests to enable mic

         * bias from NIDs 0x0f and 0x10.  The ALC260 datasheet doesn't

         * mention this restriction.  At this stage it's not clear whether

         * this behaviour is intentional or is a hardware bug in chip

         * revisions available at least up until early 2006.  Therefore for

         * now allow the "HP-OUT" and "LINE-OUT" Mode controls to span all

         * choices, but if it turns out that the lack of mic bias for these

         * NIDs is intentional we could change their modes from

         * ALC_PIN_DIR_INOUT to ALC_PIN_DIR_INOUT_NOMICBIAS.

	 */

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

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

	ALC_PIN_MODE("LINE2 pin mode", 0x15, ALC_PIN_DIR_INOUT),

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

	ALC_PIN_MODE("MIC2 pin mode", 0x13, ALC_PIN_DIR_INOUT),

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



	/* Loopback mixer controls */

	HDA_CODEC_VOLUME("MIC1 Playback Volume", 0x07, 0x00, HDA_INPUT),

	HDA_CODEC_MUTE("MIC1 Playback Switch", 0x07, 0x00, HDA_INPUT),

	HDA_CODEC_VOLUME("MIC2 Playback Volume", 0x07, 0x01, HDA_INPUT),

	HDA_CODEC_MUTE("MIC2 Playback Switch", 0x07, 0x01, HDA_INPUT),

	HDA_CODEC_VOLUME("LINE1 Playback Volume", 0x07, 0x02, HDA_INPUT),

	HDA_CODEC_MUTE("LINE1 Playback Switch", 0x07, 0x02, HDA_INPUT),

	HDA_CODEC_VOLUME("LINE2 Playback Volume", 0x07, 0x03, HDA_INPUT),

	HDA_CODEC_MUTE("LINE2 Playback Switch", 0x07, 0x03, HDA_INPUT),

	HDA_CODEC_VOLUME("CD Playback Volume", 0x07, 0x04, HDA_INPUT),

	HDA_CODEC_MUTE("CD Playback Switch", 0x07, 0x04, HDA_INPUT),

	HDA_CODEC_VOLUME("LINE-OUT loopback Playback Volume", 0x07, 0x06, HDA_INPUT),

	HDA_CODEC_MUTE("LINE-OUT loopback Playback Switch", 0x07, 0x06, HDA_INPUT),

	HDA_CODEC_VOLUME("HP-OUT loopback Playback Volume", 0x07, 0x7, HDA_INPUT),

	HDA_CODEC_MUTE("HP-OUT loopback Playback Switch", 0x07, 0x7, HDA_INPUT),



	/* 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 IO pins to be enabled.  The datasheet

	 * is ambigious as to which NID is which; testing on laptops which

	 * make this output available should provide clarification.

	 */

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

	ALC_SPDIF_CTRL_SWITCH("SPDIF Capture 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 */

};

static const struct hda_verb alc260_test_init_verbs[] = {

	/* Enable all GPIOs as outputs with an initial value of 0 */

	{0x01, AC_VERB_SET_GPIO_DIRECTION, 0x0f},

	{0x01, AC_VERB_SET_GPIO_DATA, 0x00},

	{0x01, AC_VERB_SET_GPIO_MASK, 0x0f},



	/* Enable retasking pins as output, initially without power amp */

	{0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},

	{0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},

	{0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},

	{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},

	{0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},

	{0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},



	/* Disable digital (SPDIF) pins initially, but users can enable

	 * them via a mixer switch.  In the case of SPDIF-out, this initverb

	 * payload also sets the generation to 0, output to be in "consumer"

	 * PCM format, copyright asserted, no pre-emphasis and no validity

	 * control.

	 */

	{0x03, AC_VERB_SET_DIGI_CONVERT_1, 0},

	{0x06, AC_VERB_SET_DIGI_CONVERT_1, 0},



	/* Ensure mic1, mic2, line1 and line2 pin widgets take input from the

	 * OUT1 sum bus when acting as an output.

	 */

	{0x0b, AC_VERB_SET_CONNECT_SEL, 0},

	{0x0c, AC_VERB_SET_CONNECT_SEL, 0},

	{0x0d, AC_VERB_SET_CONNECT_SEL, 0},

	{0x0e, AC_VERB_SET_CONNECT_SEL, 0},



	/* Start with output sum widgets muted and their output gains at min */

	{0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},

	{0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},

	{0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},

	{0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},

	{0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},

	{0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},

	{0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},

	{0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},

	{0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},



	/* Unmute retasking pin widget output buffers since the default

	 * state appears to be output.  As the pin mode is changed by the

	 * user the pin mode control will take care of enabling the pin's

	 * input/output buffers as needed.

	 */

	{0x10, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},

	{0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},

	{0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},

	{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},

	{0x13, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},

	{0x12, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},

	/* Also unmute the mono-out pin widget */

	{0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},



	/* Mute capture amp left and right */

	{0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},

	/* Set ADC connection select to match default mixer setting (mic1

	 * pin)

	 */

	{0x04, AC_VERB_SET_CONNECT_SEL, 0x00},



	/* Do the same for the second ADC: mute capture input amp and

	 * set ADC connection to mic1 pin

	 */

	{0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},

	{0x05, AC_VERB_SET_CONNECT_SEL, 0x00},



	/* Mute all inputs to mixer widget (even unconnected ones) */

	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, /* mic1 pin */

	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)}, /* mic2 pin */

	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)}, /* line1 pin */

	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)}, /* line2 pin */

	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)}, /* CD pin */

	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(5)}, /* Beep-gen pin */

	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(6)}, /* Line-out pin */

	{0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(7)}, /* HP-pin pin */



	{ }

};

#endif



/*

 * ALC260 configurations

 */

static const char * const alc260_models[ALC260_MODEL_LAST] = {

	[ALC260_BASIC]		= "basic",

#ifdef CONFIG_SND_DEBUG

	[ALC260_TEST]		= "test",

#endif

	[ALC260_AUTO]		= "auto",

};



static const struct snd_pci_quirk alc260_cfg_tbl[] = {

	SND_PCI_QUIRK(0x104d, 0x81bb, "Sony VAIO", ALC260_BASIC),

	SND_PCI_QUIRK(0x104d, 0x81cc, "Sony VAIO", ALC260_BASIC),

	SND_PCI_QUIRK(0x104d, 0x81cd, "Sony VAIO", ALC260_BASIC),

	SND_PCI_QUIRK(0x152d, 0x0729, "CTL U553W", ALC260_BASIC),

	{}

};



static const struct alc_config_preset alc260_presets[] = {

	[ALC260_BASIC] = {

		.mixers = { alc260_base_output_mixer,

			    alc260_input_mixer },

		.init_verbs = { alc260_init_verbs },

		.num_dacs = ARRAY_SIZE(alc260_dac_nids),

		.dac_nids = alc260_dac_nids,

		.num_adc_nids = ARRAY_SIZE(alc260_dual_adc_nids),

		.adc_nids = alc260_dual_adc_nids,

		.num_channel_mode = ARRAY_SIZE(alc260_modes),

		.channel_mode = alc260_modes,

		.input_mux = &alc260_capture_source,

	},

#ifdef CONFIG_SND_DEBUG

	[ALC260_TEST] = {

		.mixers = { alc260_test_mixer },

		.init_verbs = { alc260_test_init_verbs },

		.num_dacs = ARRAY_SIZE(alc260_test_dac_nids),

		.dac_nids = alc260_test_dac_nids,

		.num_adc_nids = ARRAY_SIZE(alc260_test_adc_nids),

		.adc_nids = alc260_test_adc_nids,

		.num_channel_mode = ARRAY_SIZE(alc260_modes),

		.channel_mode = alc260_modes,

		.num_mux_defs = ARRAY_SIZE(alc260_test_capture_sources),

		.input_mux = alc260_test_capture_sources,

	},

#endif

};

sound/pci/hda/alc_quirks.c

+0 −301

File changed.

Preview size limit exceeded, changes collapsed.

sound/pci/hda/patch_realtek.c

+8 −40
Original line number Original line Diff line number Diff line
@@ -4308,14 +4308,10 @@ static const struct snd_pci_quirk alc260_fixup_tbl[] = { 




/*

/*

 */

 */

#ifdef CONFIG_SND_HDA_ENABLE_REALTEK_QUIRKS

#include "alc260_quirks.c"

#endif



static int patch_alc260(struct hda_codec *codec)

static int patch_alc260(struct hda_codec *codec)

{

{

	struct alc_spec *spec;

	struct alc_spec *spec;

	int err, board_config;

	int err;





	spec = kzalloc(sizeof(*spec), GFP_KERNEL);

	spec = kzalloc(sizeof(*spec), GFP_KERNEL);

	if (spec == NULL)

	if (spec == NULL)
@@ -4325,38 +4321,13 @@ static int patch_alc260(struct hda_codec *codec) 




	spec->mixer_nid = 0x07;

	spec->mixer_nid = 0x07;





	board_config = alc_board_config(codec, ALC260_MODEL_LAST,

					alc260_models, alc260_cfg_tbl);

	if (board_config < 0) {

		snd_printd(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n",

			   codec->chip_name);

		board_config = ALC_MODEL_AUTO;

	}



	if (board_config == ALC_MODEL_AUTO) {

	alc_pick_fixup(codec, NULL, alc260_fixup_tbl, alc260_fixups);

	alc_pick_fixup(codec, NULL, alc260_fixup_tbl, alc260_fixups);

	alc_apply_fixup(codec, ALC_FIXUP_ACT_PRE_PROBE);

	alc_apply_fixup(codec, ALC_FIXUP_ACT_PRE_PROBE);

	}





	if (board_config == ALC_MODEL_AUTO) {

	/* automatic parse from the BIOS config */

	/* automatic parse from the BIOS config */

	err = alc260_parse_auto_config(codec);

	err = alc260_parse_auto_config(codec);

	if (err < 0)

	if (err < 0)

		goto error;

		goto error;

#ifdef CONFIG_SND_HDA_ENABLE_REALTEK_QUIRKS

		else if (!err) {

			printk(KERN_INFO

			       "hda_codec: Cannot set up configuration "

			       "from BIOS.  Using base mode...\n");

			board_config = ALC260_BASIC;

		}

#endif

	}



	if (board_config != ALC_MODEL_AUTO) {

		setup_preset(codec, &alc260_presets[board_config]);

		spec->vmaster_nid = 0x08;

	}





	if (!spec->no_analog && !spec->adc_nids) {

	if (!spec->no_analog && !spec->adc_nids) {

		alc_auto_fill_adc_caps(codec);

		alc_auto_fill_adc_caps(codec);
@@ -4377,10 +4348,7 @@ static int patch_alc260(struct hda_codec *codec) 
	alc_apply_fixup(codec, ALC_FIXUP_ACT_PROBE);

	alc_apply_fixup(codec, ALC_FIXUP_ACT_PROBE);





	codec->patch_ops = alc_patch_ops;

	codec->patch_ops = alc_patch_ops;

	if (board_config == ALC_MODEL_AUTO)

	spec->init_hook = alc_auto_init_std;

	spec->init_hook = alc_auto_init_std;

	else

		codec->patch_ops.build_controls = __alc_build_controls;

	spec->shutup = alc_eapd_shutup;

	spec->shutup = alc_eapd_shutup;

#ifdef CONFIG_SND_HDA_POWER_SAVE

#ifdef CONFIG_SND_HDA_POWER_SAVE

	if (!spec->loopback.amplist)

	if (!spec->loopback.amplist)