Merge branch 'fix/hda' into topic/hda (52402791) · Commits · e / devices / android_kernel_sony_msm8994

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -403,4 +403,5 @@ STAC9872
		Cirrus Logic CS4206/4207
		========================
		mbp55 MacBook Pro 5,5
		imac27 IMac 27 Inch
		auto BIOS setup (default)

sound/pci/hda/hda_intel.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -2322,6 +2322,7 @@ static void __devinit check_probe_mask(struct azx *chip, int dev)
		* white/black-list for enable_msi
		*/
		static struct snd_pci_quirk msi_black_list[] __devinitdata = {
		SND_PCI_QUIRK(0x1043, 0x81f2, "ASUS", 0), /* Athlon64 X2 + nvidia */
		{}
		};

sound/pci/hda/patch_cirrus.c

+21 −1

Original line number	Diff line number	Diff line
		@@ -66,6 +66,7 @@ struct cs_spec {
		/* available models */
		enum {
		CS420X_MBP55,
		CS420X_IMAC27,
		CS420X_AUTO,
		CS420X_MODELS
		};
		@@ -833,7 +834,8 @@ static void cs_automute(struct hda_codec *codec)
		AC_VERB_SET_PIN_WIDGET_CONTROL,
		hp_present ? 0 : PIN_OUT);
		}
		if (spec->board_config == CS420X_MBP55) {
		if (spec->board_config == CS420X_MBP55 \|\|
		spec->board_config == CS420X_IMAC27) {
		unsigned int gpio = hp_present ? 0x02 : 0x08;
		snd_hda_codec_write(codec, 0x01, 0,
		AC_VERB_SET_GPIO_DATA, gpio);
		@@ -1075,12 +1077,14 @@ static int cs_parse_auto_config(struct hda_codec *codec)

		static const char *cs420x_models[CS420X_MODELS] = {
		[CS420X_MBP55] = "mbp55",
		[CS420X_IMAC27] = "imac27",
		[CS420X_AUTO] = "auto",
		};


		static struct snd_pci_quirk cs420x_cfg_tbl[] = {
		SND_PCI_QUIRK(0x10de, 0xcb79, "MacBookPro 5,5", CS420X_MBP55),
		SND_PCI_QUIRK(0x8086, 0x7270, "IMac 27 Inch", CS420X_IMAC27),
		{} /* terminator */
		};

		@@ -1103,8 +1107,23 @@ static struct cs_pincfg mbp55_pincfgs[] = {
		{} /* terminator */
		};

		static struct cs_pincfg imac27_pincfgs[] = {
		{ 0x09, 0x012b4050 },
		{ 0x0a, 0x90100140 },
		{ 0x0b, 0x90100142 },
		{ 0x0c, 0x018b3020 },
		{ 0x0d, 0x90a00110 },
		{ 0x0e, 0x400000f0 },
		{ 0x0f, 0x01cbe030 },
		{ 0x10, 0x014be060 },
		{ 0x12, 0x01ab9070 },
		{ 0x15, 0x400000f0 },
		{} /* terminator */
		};

		static struct cs_pincfg *cs_pincfgs[CS420X_MODELS] = {
		[CS420X_MBP55] = mbp55_pincfgs,
		[CS420X_IMAC27] = imac27_pincfgs,
		};

		static void fix_pincfg(struct hda_codec *codec, int model)
		@@ -1134,6 +1153,7 @@ static int patch_cs420x(struct hda_codec *codec)
		fix_pincfg(codec, spec->board_config);

		switch (spec->board_config) {
		case CS420X_IMAC27:
		case CS420X_MBP55:
		/* GPIO1 = headphones */
		/* GPIO3 = speakers */

sound/pci/hda/patch_conexant.c

+37 −6

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@

		#include "hda_codec.h"
		#include "hda_local.h"
		#include "hda_beep.h"

		#define CXT_PIN_DIR_IN 0x00
		#define CXT_PIN_DIR_OUT 0x01
		@@ -111,6 +112,7 @@ struct conexant_spec {
		unsigned int dell_automute;
		unsigned int port_d_mode;
		unsigned char ext_mic_bias;
		unsigned int dell_vostro;
		};

		static int conexant_playback_pcm_open(struct hda_pcm_stream *hinfo,
		@@ -476,6 +478,7 @@ static void conexant_free(struct hda_codec *codec)
		snd_array_free(&spec->jacks);
		}
		#endif
		snd_hda_detach_beep_device(codec);
		kfree(codec->spec);
		}

		@@ -2109,9 +2112,12 @@ static int cxt5066_mic_boost_mux_enum_get(struct snd_kcontrol *kcontrol,
		{
		struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
		int val;
		hda_nid_t nid = kcontrol->private_value & 0xff;
		int inout = (kcontrol->private_value & 0x100) ?
		AC_AMP_GET_INPUT : AC_AMP_GET_OUTPUT;

		val = snd_hda_codec_read(codec, 0x17, 0,
		AC_VERB_GET_AMP_GAIN_MUTE, AC_AMP_GET_OUTPUT);
		val = snd_hda_codec_read(codec, nid, 0,
		AC_VERB_GET_AMP_GAIN_MUTE, inout);

		ucontrol->value.enumerated.item[0] = val & AC_AMP_GAIN;
		return 0;
		@@ -2123,6 +2129,9 @@ static int cxt5066_mic_boost_mux_enum_put(struct snd_kcontrol *kcontrol,
		struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
		const struct hda_input_mux *imux = &cxt5066_analog_mic_boost;
		unsigned int idx;
		hda_nid_t nid = kcontrol->private_value & 0xff;
		int inout = (kcontrol->private_value & 0x100) ?
		AC_AMP_SET_INPUT : AC_AMP_SET_OUTPUT;

		if (!imux->num_items)
		return 0;
		@@ -2130,9 +2139,9 @@ static int cxt5066_mic_boost_mux_enum_put(struct snd_kcontrol *kcontrol,
		if (idx >= imux->num_items)
		idx = imux->num_items - 1;

		snd_hda_codec_write_cache(codec, 0x17, 0,
		snd_hda_codec_write_cache(codec, nid, 0,
		AC_VERB_SET_AMP_GAIN_MUTE,
		AC_AMP_SET_RIGHT \| AC_AMP_SET_LEFT \| AC_AMP_SET_OUTPUT \|
		AC_AMP_SET_RIGHT \| AC_AMP_SET_LEFT \| inout \|
		imux->items[idx].index);

		return 1;
		@@ -2202,10 +2211,11 @@ static struct snd_kcontrol_new cxt5066_mixers[] = {

		{
		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
		.name = "Analog Mic Boost Capture Enum",
		.name = "Ext Mic Boost Capture Enum",
		.info = cxt5066_mic_boost_mux_enum_info,
		.get = cxt5066_mic_boost_mux_enum_get,
		.put = cxt5066_mic_boost_mux_enum_put,
		.private_value = 0x17,
		},

		HDA_BIND_VOL("Capture Volume", &cxt5066_bind_capture_vol_others),
		@@ -2213,6 +2223,19 @@ static struct snd_kcontrol_new cxt5066_mixers[] = {
		{}
		};

		static struct snd_kcontrol_new cxt5066_vostro_mixers[] = {
		{
		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
		.name = "Int Mic Boost Capture Enum",
		.info = cxt5066_mic_boost_mux_enum_info,
		.get = cxt5066_mic_boost_mux_enum_get,
		.put = cxt5066_mic_boost_mux_enum_put,
		.private_value = 0x23 \| 0x100,
		},
		HDA_CODEC_VOLUME_MONO("Beep Playback Volume", 0x13, 1, 0x0, HDA_OUTPUT),
		{}
		};

		static struct hda_verb cxt5066_init_verbs[] = {
		{0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80}, /* Port B */
		{0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80}, /* Port C */
		@@ -2398,10 +2421,15 @@ static struct hda_verb cxt5066_init_verbs_portd_lo[] = {
		/* initialize jack-sensing, too */
		static int cxt5066_init(struct hda_codec *codec)
		{
		struct conexant_spec *spec = codec->spec;

		snd_printdd("CXT5066: init\n");
		conexant_init(codec);
		if (codec->patch_ops.unsol_event) {
		cxt5066_hp_automute(codec);
		if (spec->dell_vostro)
		cxt5066_vostro_automic(codec);
		else
		cxt5066_automic(codec);
		}
		return 0;
		@@ -2501,7 +2529,10 @@ static int patch_cxt5066(struct hda_codec *codec)
		spec->init_verbs[0] = cxt5066_init_verbs_vostro;
		spec->mixers[spec->num_mixers++] = cxt5066_mixer_master_olpc;
		spec->mixers[spec->num_mixers++] = cxt5066_mixers;
		spec->mixers[spec->num_mixers++] = cxt5066_vostro_mixers;
		spec->port_d_mode = 0;
		spec->dell_vostro = 1;
		snd_hda_attach_beep_device(codec, 0x13);

		/* no S/PDIF out */
		spec->multiout.dig_out_nid = 0;

sound/pci/hda/patch_realtek.c

+72 −7

Original line number	Diff line number	Diff line
		@@ -337,6 +337,9 @@ struct alc_spec {
		/* hooks */
		void (init_hook)(struct hda_codec codec);
		void (unsol_event)(struct hda_codec codec, unsigned int res);
		#ifdef CONFIG_SND_HDA_POWER_SAVE
		void (power_hook)(struct hda_codec codec, int power);
		#endif

		/* for pin sensing */
		unsigned int sense_updated: 1;
		@@ -388,6 +391,7 @@ struct alc_config_preset {
		void (init_hook)(struct hda_codec );
		#ifdef CONFIG_SND_HDA_POWER_SAVE
		struct hda_amp_list *loopbacks;
		void (power_hook)(struct hda_codec codec, int power);
		#endif
		};

		@@ -904,6 +908,7 @@ static void setup_preset(struct hda_codec *codec,
		spec->unsol_event = preset->unsol_event;
		spec->init_hook = preset->init_hook;
		#ifdef CONFIG_SND_HDA_POWER_SAVE
		spec->power_hook = preset->power_hook;
		spec->loopback.amplist = preset->loopbacks;
		#endif

		@@ -1669,9 +1674,6 @@ static struct hda_verb alc889_acer_aspire_8930g_verbs[] = {
		/* some bit here disables the other DACs. Init=0x4900 */
		{0x20, AC_VERB_SET_COEF_INDEX, 0x08},
		{0x20, AC_VERB_SET_PROC_COEF, 0x0000},
		/* Enable amplifiers */
		{0x14, AC_VERB_SET_EAPD_BTLENABLE, 0x02},
		{0x15, AC_VERB_SET_EAPD_BTLENABLE, 0x02},
		/* DMIC fix
		* This laptop has a stereo digital microphone. The mics are only 1cm apart
		* which makes the stereo useless. However, either the mic or the ALC889
		@@ -1784,6 +1786,25 @@ static struct snd_kcontrol_new alc888_base_mixer[] = {
		{ } /* end */
		};

		static struct snd_kcontrol_new alc889_acer_aspire_8930g_mixer[] = {
		HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
		HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),
		HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x0, HDA_OUTPUT),
		HDA_BIND_MUTE("Surround Playback Switch", 0x0d, 2, HDA_INPUT),
		HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x0e, 1, 0x0,
		HDA_OUTPUT),
		HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x0e, 2, 0x0, HDA_OUTPUT),
		HDA_BIND_MUTE_MONO("Center Playback Switch", 0x0e, 1, 2, HDA_INPUT),
		HDA_BIND_MUTE_MONO("LFE Playback Switch", 0x0e, 2, 2, HDA_INPUT),
		HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT),
		HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT),
		HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
		HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
		HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
		{ } /* end */
		};


		static void alc888_acer_aspire_4930g_setup(struct hda_codec *codec)
		{
		struct alc_spec *spec = codec->spec;
		@@ -1814,6 +1835,16 @@ static void alc889_acer_aspire_8930g_setup(struct hda_codec *codec)
		spec->autocfg.speaker_pins[2] = 0x1b;
		}

		#ifdef CONFIG_SND_HDA_POWER_SAVE
		static void alc889_power_eapd(struct hda_codec *codec, int power)
		{
		snd_hda_codec_write(codec, 0x14, 0,
		AC_VERB_SET_EAPD_BTLENABLE, power ? 2 : 0);
		snd_hda_codec_write(codec, 0x15, 0,
		AC_VERB_SET_EAPD_BTLENABLE, power ? 2 : 0);
		}
		#endif

		/*
		* ALC880 3-stack model
		*
		@@ -3688,12 +3719,29 @@ static void alc_free(struct hda_codec *codec)
		snd_hda_detach_beep_device(codec);
		}

		#ifdef CONFIG_SND_HDA_POWER_SAVE
		static int alc_suspend(struct hda_codec *codec, pm_message_t state)
		{
		struct alc_spec *spec = codec->spec;
		if (spec && spec->power_hook)
		spec->power_hook(codec, 0);
		return 0;
		}
		#endif

		#ifdef SND_HDA_NEEDS_RESUME
		static int alc_resume(struct hda_codec *codec)
		{
		#ifdef CONFIG_SND_HDA_POWER_SAVE
		struct alc_spec *spec = codec->spec;
		#endif
		codec->patch_ops.init(codec);
		snd_hda_codec_resume_amp(codec);
		snd_hda_codec_resume_cache(codec);
		#ifdef CONFIG_SND_HDA_POWER_SAVE
		if (spec && spec->power_hook)
		spec->power_hook(codec, 1);
		#endif
		return 0;
		}
		#endif
		@@ -3710,6 +3758,7 @@ static struct hda_codec_ops alc_patch_ops = {
		.resume = alc_resume,
		#endif
		#ifdef CONFIG_SND_HDA_POWER_SAVE
		.suspend = alc_suspend,
		.check_power_status = alc_check_power_status,
		#endif
		};
		@@ -9010,7 +9059,7 @@ static struct snd_pci_quirk alc882_cfg_tbl[] = {
		SND_PCI_QUIRK(0x1462, 0x040d, "MSI", ALC883_TARGA_2ch_DIG),
		SND_PCI_QUIRK(0x1462, 0x0579, "MSI", ALC883_TARGA_2ch_DIG),
		SND_PCI_QUIRK(0x1462, 0x28fb, "Targa T8", ALC882_TARGA), /* MSI-1049 T8 */
		SND_PCI_QUIRK(0x1462, 0x2fb3, "MSI", ALC883_TARGA_2ch_DIG),
		SND_PCI_QUIRK(0x1462, 0x2fb3, "MSI", ALC882_AUTO),
		SND_PCI_QUIRK(0x1462, 0x6668, "MSI", ALC882_6ST_DIG),
		SND_PCI_QUIRK(0x1462, 0x3729, "MSI S420", ALC883_TARGA_DIG),
		SND_PCI_QUIRK(0x1462, 0x3783, "NEC S970", ALC883_TARGA_DIG),
		@@ -9373,6 +9422,7 @@ static struct alc_config_preset alc882_presets[] = {
		.dac_nids = alc883_dac_nids,
		.adc_nids = alc883_adc_nids_alt,
		.num_adc_nids = ARRAY_SIZE(alc883_adc_nids_alt),
		.capsrc_nids = alc883_capsrc_nids,
		.dig_out_nid = ALC883_DIGOUT_NID,
		.num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes),
		.channel_mode = alc883_3ST_2ch_modes,
		@@ -9469,10 +9519,11 @@ static struct alc_config_preset alc882_presets[] = {
		.init_hook = alc_automute_amp,
		},
		[ALC888_ACER_ASPIRE_8930G] = {
		.mixers = { alc888_base_mixer,
		.mixers = { alc889_acer_aspire_8930g_mixer,
		alc883_chmode_mixer },
		.init_verbs = { alc883_init_verbs, alc880_gpio1_init_verbs,
		alc889_acer_aspire_8930g_verbs },
		alc889_acer_aspire_8930g_verbs,
		alc889_eapd_verbs},
		.num_dacs = ARRAY_SIZE(alc883_dac_nids),
		.dac_nids = alc883_dac_nids,
		.num_adc_nids = ARRAY_SIZE(alc889_adc_nids),
		@@ -9489,6 +9540,9 @@ static struct alc_config_preset alc882_presets[] = {
		.unsol_event = alc_automute_amp_unsol_event,
		.setup = alc889_acer_aspire_8930g_setup,
		.init_hook = alc_automute_amp,
		#ifdef CONFIG_SND_HDA_POWER_SAVE
		.power_hook = alc889_power_eapd,
		#endif
		},
		[ALC888_ACER_ASPIRE_7730G] = {
		.mixers = { alc883_3ST_6ch_mixer,
		@@ -9519,6 +9573,7 @@ static struct alc_config_preset alc882_presets[] = {
		.dac_nids = alc883_dac_nids,
		.adc_nids = alc883_adc_nids_alt,
		.num_adc_nids = ARRAY_SIZE(alc883_adc_nids_alt),
		.capsrc_nids = alc883_capsrc_nids,
		.num_channel_mode = ARRAY_SIZE(alc883_sixstack_modes),
		.channel_mode = alc883_sixstack_modes,
		.input_mux = &alc883_capture_source,
		@@ -9580,6 +9635,7 @@ static struct alc_config_preset alc882_presets[] = {
		.dac_nids = alc883_dac_nids,
		.adc_nids = alc883_adc_nids_alt,
		.num_adc_nids = ARRAY_SIZE(alc883_adc_nids_alt),
		.capsrc_nids = alc883_capsrc_nids,
		.num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes),
		.channel_mode = alc883_3ST_2ch_modes,
		.input_mux = &alc883_lenovo_101e_capture_source,
		@@ -9759,6 +9815,7 @@ static struct alc_config_preset alc882_presets[] = {
		alc880_gpio1_init_verbs },
		.adc_nids = alc883_adc_nids,
		.num_adc_nids = ARRAY_SIZE(alc883_adc_nids),
		.capsrc_nids = alc883_capsrc_nids,
		.dac_nids = alc883_dac_nids,
		.num_dacs = ARRAY_SIZE(alc883_dac_nids),
		.channel_mode = alc889A_mb31_6ch_modes,
		@@ -10781,6 +10838,13 @@ static struct hda_verb alc262_lenovo_3000_unsol_verbs[] = {
		{}
		};

		static struct hda_verb alc262_lenovo_3000_init_verbs[] = {
		/* Front Mic pin: input vref at 50% */
		{0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF50},
		{0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
		{}
		};

		static struct hda_input_mux alc262_fujitsu_capture_source = {
		.num_items = 3,
		.items = {
		@@ -11835,7 +11899,8 @@ static struct alc_config_preset alc262_presets[] = {
		[ALC262_LENOVO_3000] = {
		.mixers = { alc262_lenovo_3000_mixer },
		.init_verbs = { alc262_init_verbs, alc262_EAPD_verbs,
		alc262_lenovo_3000_unsol_verbs },
		alc262_lenovo_3000_unsol_verbs,
		alc262_lenovo_3000_init_verbs },
		.num_dacs = ARRAY_SIZE(alc262_dac_nids),
		.dac_nids = alc262_dac_nids,
		.hp_nid = 0x03,