Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 (25a02586) · Commits · e / devices / android_kernel_fairphone_FP4

Documentation/sound/alsa/ALSA-Configuration.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -795,6 +795,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
		lg-lw LG LW20/LW25 laptop
		tcl TCL S700
		clevo Clevo laptops (m520G, m665n)
		medion Medion Rim 2150
		test for testing/debugging purpose, almost all controls can be
		adjusted. Appearing only when compiled with
		$CONFIG_SND_DEBUG=y

include/sound/mpu401.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -50,6 +50,7 @@
		#define MPU401_INFO_INTEGRATED (1 << 2) /* integrated h/w port */
		#define MPU401_INFO_MMIO (1 << 3) /* MMIO access */
		#define MPU401_INFO_TX_IRQ (1 << 4) /* independent TX irq */
		#define MPU401_INFO_NO_ACK (1 << 6) /* No ACK cmd needed */

		#define MPU401_MODE_BIT_INPUT 0
		#define MPU401_MODE_BIT_OUTPUT 1

sound/drivers/Kconfig

+2 −0

Original line number	Diff line number	Diff line
		@@ -8,6 +8,8 @@ config SND_PCSP
		tristate "Internal PC speaker support"
		depends on X86_PC && HIGH_RES_TIMERS
		depends on INPUT
		depends on SND
		select SND_PCM
		help
		If you don't have a sound card in your computer, you can include a
		driver for the PC speaker which allows it to act like a primitive

sound/drivers/mpu401/mpu401_uart.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -243,7 +243,7 @@ static int snd_mpu401_uart_cmd(struct snd_mpu401 * mpu, unsigned char cmd,
		#endif
		}
		mpu->write(mpu, cmd, MPU401C(mpu));
		if (ack) {
		if (ack && !(mpu->info_flags & MPU401_INFO_NO_ACK)) {
		ok = 0;
		timeout = 10000;
		while (!ok && timeout-- > 0) {

sound/pci/hda/patch_realtek.c

+86 −0

Original line number	Diff line number	Diff line
		@@ -60,6 +60,7 @@ enum {
		ALC880_TCL_S700,
		ALC880_LG,
		ALC880_LG_LW,
		ALC880_MEDION_RIM,
		#ifdef CONFIG_SND_DEBUG
		ALC880_TEST,
		#endif
		@@ -2275,6 +2276,75 @@ static void alc880_lg_lw_unsol_event(struct hda_codec *codec, unsigned int res)
		alc880_lg_lw_automute(codec);
		}

		static struct snd_kcontrol_new alc880_medion_rim_mixer[] = {
		HDA_CODEC_VOLUME("Master Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
		HDA_BIND_MUTE("Master Playback Switch", 0x0c, 2, HDA_INPUT),
		HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
		HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
		HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
		HDA_CODEC_MUTE("Internal Playback Switch", 0x0b, 0x1, HDA_INPUT),
		{ } /* end */
		};

		static struct hda_input_mux alc880_medion_rim_capture_source = {
		.num_items = 2,
		.items = {
		{ "Mic", 0x0 },
		{ "Internal Mic", 0x1 },
		},
		};

		static struct hda_verb alc880_medion_rim_init_verbs[] = {
		{0x13, AC_VERB_SET_CONNECT_SEL, 0x00}, /* HP */

		{0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
		{0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},

		/* Mic1 (rear panel) pin widget for input and vref at 80% */
		{0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
		{0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
		/* Mic2 (as headphone out) for HP output */
		{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
		{0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
		/* Internal Speaker */
		{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
		{0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},

		{0x20, AC_VERB_SET_COEF_INDEX, 0x07},
		{0x20, AC_VERB_SET_PROC_COEF, 0x3060},

		{0x14, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN \| ALC880_HP_EVENT},
		{ }
		};

		/* toggle speaker-output according to the hp-jack state */
		static void alc880_medion_rim_automute(struct hda_codec *codec)
		{
		unsigned int present;
		unsigned char bits;

		present = snd_hda_codec_read(codec, 0x14, 0,
		AC_VERB_GET_PIN_SENSE, 0)
		& AC_PINSENSE_PRESENCE;
		bits = present ? HDA_AMP_MUTE : 0;
		snd_hda_codec_amp_stereo(codec, 0x1b, HDA_OUTPUT, 0,
		HDA_AMP_MUTE, bits);
		if (present)
		snd_hda_codec_write(codec, 0x01, 0, AC_VERB_SET_GPIO_DATA, 0);
		else
		snd_hda_codec_write(codec, 0x01, 0, AC_VERB_SET_GPIO_DATA, 2);
		}

		static void alc880_medion_rim_unsol_event(struct hda_codec *codec,
		unsigned int res)
		{
		/* Looks like the unsol event is incompatible with the standard
		* definition. 4bit tag is placed at 28 bit!
		*/
		if ((res >> 28) == ALC880_HP_EVENT)
		alc880_medion_rim_automute(codec);
		}

		#ifdef CONFIG_SND_HDA_POWER_SAVE
		static struct hda_amp_list alc880_loopbacks[] = {
		{ 0x0b, HDA_INPUT, 0 },
		@@ -2882,6 +2952,7 @@ static const char *alc880_models[ALC880_MODEL_LAST] = {
		[ALC880_F1734] = "F1734",
		[ALC880_LG] = "lg",
		[ALC880_LG_LW] = "lg-lw",
		[ALC880_MEDION_RIM] = "medion",
		#ifdef CONFIG_SND_DEBUG
		[ALC880_TEST] = "test",
		#endif
		@@ -2933,6 +3004,7 @@ static struct snd_pci_quirk alc880_cfg_tbl[] = {
		SND_PCI_QUIRK(0x1584, 0x9070, "Uniwill", ALC880_UNIWILL),
		SND_PCI_QUIRK(0x1584, 0x9077, "Uniwill P53", ALC880_UNIWILL_P53),
		SND_PCI_QUIRK(0x161f, 0x203d, "W810", ALC880_W810),
		SND_PCI_QUIRK(0x161f, 0x205d, "Medion Rim 2150", ALC880_MEDION_RIM),
		SND_PCI_QUIRK(0x1695, 0x400d, "EPoX", ALC880_5ST_DIG),
		SND_PCI_QUIRK(0x1695, 0x4012, "EPox EP-5LDA", ALC880_5ST_DIG),
		SND_PCI_QUIRK(0x1734, 0x107c, "FSC F1734", ALC880_F1734),
		@@ -3227,6 +3299,20 @@ static struct alc_config_preset alc880_presets[] = {
		.unsol_event = alc880_lg_lw_unsol_event,
		.init_hook = alc880_lg_lw_automute,
		},
		[ALC880_MEDION_RIM] = {
		.mixers = { alc880_medion_rim_mixer },
		.init_verbs = { alc880_volume_init_verbs,
		alc880_medion_rim_init_verbs,
		alc_gpio2_init_verbs },
		.num_dacs = ARRAY_SIZE(alc880_dac_nids),
		.dac_nids = alc880_dac_nids,
		.dig_out_nid = ALC880_DIGOUT_NID,
		.num_channel_mode = ARRAY_SIZE(alc880_2_jack_modes),
		.channel_mode = alc880_2_jack_modes,
		.input_mux = &alc880_medion_rim_capture_source,
		.unsol_event = alc880_medion_rim_unsol_event,
		.init_hook = alc880_medion_rim_automute,
		},
		#ifdef CONFIG_SND_DEBUG
		[ALC880_TEST] = {
		.mixers = { alc880_test_mixer },