Merge branch 'fix/hda' into for-linus (58936b29) · Commits · e / devices / android_kernel_samsung_universal8895

sound/pci/hda/hda_eld.c

+10 −14

Original line number	Original line	Diff line number	Diff line
	@@ -189,6 +189,9 @@ static void hdmi_update_short_audio_desc(struct cea_sad *a,
	a->channels = GRAB_BITS(buf, 0, 0, 3);		a->channels = GRAB_BITS(buf, 0, 0, 3);
	a->channels++;		a->channels++;

			a->sample_bits = 0;
			a->max_bitrate = 0;

	a->format = GRAB_BITS(buf, 0, 3, 4);		a->format = GRAB_BITS(buf, 0, 3, 4);
	switch (a->format) {		switch (a->format) {
	case AUDIO_CODING_TYPE_REF_STREAM_HEADER:		case AUDIO_CODING_TYPE_REF_STREAM_HEADER:
	@@ -198,7 +201,6 @@ static void hdmi_update_short_audio_desc(struct cea_sad *a,

	case AUDIO_CODING_TYPE_LPCM:		case AUDIO_CODING_TYPE_LPCM:
	val = GRAB_BITS(buf, 2, 0, 3);		val = GRAB_BITS(buf, 2, 0, 3);
	a->sample_bits = 0;
	for (i = 0; i < 3; i++)		for (i = 0; i < 3; i++)
	if (val & (1 << i))		if (val & (1 << i))
	a->sample_bits \|= cea_sample_sizes[i + 1];		a->sample_bits \|= cea_sample_sizes[i + 1];
	@@ -598,24 +600,19 @@ void hdmi_eld_update_pcm_info(struct hdmi_eld eld, struct hda_pcm_stream pcm,
	{		{
	int i;		int i;

	pcm->rates = 0;		/* assume basic audio support (the basic audio flag is not in ELD;
	pcm->formats = 0;		* however, all audio capable sinks are required to support basic
	pcm->maxbps = 0;		* audio) */
	pcm->channels_min = -1;		pcm->rates = SNDRV_PCM_RATE_32000 \| SNDRV_PCM_RATE_44100 \| SNDRV_PCM_RATE_48000;
	pcm->channels_max = 0;		pcm->formats = SNDRV_PCM_FMTBIT_S16_LE;
			pcm->maxbps = 16;
			pcm->channels_max = 2;
	for (i = 0; i < eld->sad_count; i++) {		for (i = 0; i < eld->sad_count; i++) {
	struct cea_sad *a = &eld->sad[i];		struct cea_sad *a = &eld->sad[i];
	pcm->rates \|= a->rates;		pcm->rates \|= a->rates;
	if (a->channels < pcm->channels_min)
	pcm->channels_min = a->channels;
	if (a->channels > pcm->channels_max)		if (a->channels > pcm->channels_max)
	pcm->channels_max = a->channels;		pcm->channels_max = a->channels;
	if (a->format == AUDIO_CODING_TYPE_LPCM) {		if (a->format == AUDIO_CODING_TYPE_LPCM) {
	if (a->sample_bits & AC_SUPPCM_BITS_16) {
	pcm->formats \|= SNDRV_PCM_FMTBIT_S16_LE;
	if (pcm->maxbps < 16)
	pcm->maxbps = 16;
	}
	if (a->sample_bits & AC_SUPPCM_BITS_20) {		if (a->sample_bits & AC_SUPPCM_BITS_20) {
	pcm->formats \|= SNDRV_PCM_FMTBIT_S32_LE;		pcm->formats \|= SNDRV_PCM_FMTBIT_S32_LE;
	if (pcm->maxbps < 20)		if (pcm->maxbps < 20)
	@@ -635,7 +632,6 @@ void hdmi_eld_update_pcm_info(struct hdmi_eld eld, struct hda_pcm_stream pcm,
	/* restrict the parameters by the values the codec provides */		/* restrict the parameters by the values the codec provides */
	pcm->rates &= codec_pars->rates;		pcm->rates &= codec_pars->rates;
	pcm->formats &= codec_pars->formats;		pcm->formats &= codec_pars->formats;
	pcm->channels_min = max(pcm->channels_min, codec_pars->channels_min);
	pcm->channels_max = min(pcm->channels_max, codec_pars->channels_max);		pcm->channels_max = min(pcm->channels_max, codec_pars->channels_max);
	pcm->maxbps = min(pcm->maxbps, codec_pars->maxbps);		pcm->maxbps = min(pcm->maxbps, codec_pars->maxbps);
	}		}

sound/pci/hda/hda_intel.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2296,6 +2296,7 @@ static int azx_dev_free(struct snd_device *device)
	*/		*/
	static struct snd_pci_quirk position_fix_list[] __devinitdata = {		static struct snd_pci_quirk position_fix_list[] __devinitdata = {
	SND_PCI_QUIRK(0x1025, 0x009f, "Acer Aspire 5110", POS_FIX_LPIB),		SND_PCI_QUIRK(0x1025, 0x009f, "Acer Aspire 5110", POS_FIX_LPIB),
			SND_PCI_QUIRK(0x1025, 0x026f, "Acer Aspire 5538", POS_FIX_LPIB),
	SND_PCI_QUIRK(0x1028, 0x01cc, "Dell D820", POS_FIX_LPIB),		SND_PCI_QUIRK(0x1028, 0x01cc, "Dell D820", POS_FIX_LPIB),
	SND_PCI_QUIRK(0x1028, 0x01de, "Dell Precision 390", POS_FIX_LPIB),		SND_PCI_QUIRK(0x1028, 0x01de, "Dell Precision 390", POS_FIX_LPIB),
	SND_PCI_QUIRK(0x1028, 0x01f6, "Dell Latitude 131L", POS_FIX_LPIB),		SND_PCI_QUIRK(0x1028, 0x01f6, "Dell Latitude 131L", POS_FIX_LPIB),

sound/pci/hda/patch_conexant.c

+18 −17

Original line number	Original line	Diff line number	Diff line
	@@ -2116,8 +2116,8 @@ static void cxt5066_update_speaker(struct hda_codec *codec)
	struct conexant_spec *spec = codec->spec;		struct conexant_spec *spec = codec->spec;
	unsigned int pinctl;		unsigned int pinctl;

	snd_printdd("CXT5066: update speaker, hp_present=%d\n",		snd_printdd("CXT5066: update speaker, hp_present=%d, cur_eapd=%d\n",
	spec->hp_present);		spec->hp_present, spec->cur_eapd);

	/* Port A (HP) */		/* Port A (HP) */
	pinctl = ((spec->hp_present & 1) && spec->cur_eapd) ? PIN_HP : 0;		pinctl = ((spec->hp_present & 1) && spec->cur_eapd) ? PIN_HP : 0;
	@@ -2125,11 +2125,20 @@ static void cxt5066_update_speaker(struct hda_codec *codec)
	pinctl);		pinctl);

	/* Port D (HP/LO) */		/* Port D (HP/LO) */
			if (spec->dell_automute) {
			/* DELL AIO Port Rule: PortA> PortD> IntSpk */
			pinctl = (!(spec->hp_present & 1) && spec->cur_eapd)
			? PIN_OUT : 0;
			} else if (spec->thinkpad) {
			if (spec->cur_eapd)
			pinctl = spec->port_d_mode;
			/* Mute dock line-out if Port A (laptop HP) is present */
			if (spec->hp_present& 1)
			pinctl = 0;
			} else {
	pinctl = ((spec->hp_present & 2) && spec->cur_eapd)		pinctl = ((spec->hp_present & 2) && spec->cur_eapd)
	? spec->port_d_mode : 0;		? spec->port_d_mode : 0;
	/* Mute if Port A is connected on Thinkpad */		}
	if (spec->thinkpad && (spec->hp_present & 1))
	pinctl = 0;
	snd_hda_codec_write(codec, 0x1c, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,		snd_hda_codec_write(codec, 0x1c, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,
	pinctl);		pinctl);

	@@ -2137,14 +2146,6 @@ static void cxt5066_update_speaker(struct hda_codec *codec)
	pinctl = (!spec->hp_present && spec->cur_eapd) ? PIN_OUT : 0;		pinctl = (!spec->hp_present && spec->cur_eapd) ? PIN_OUT : 0;
	snd_hda_codec_write(codec, 0x1f, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,		snd_hda_codec_write(codec, 0x1f, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,
	pinctl);		pinctl);

	if (spec->dell_automute) {
	/* DELL AIO Port Rule: PortA > PortD > IntSpk */
	pinctl = (!(spec->hp_present & 1) && spec->cur_eapd)
	? PIN_OUT : 0;
	snd_hda_codec_write(codec, 0x1c, 0,
	AC_VERB_SET_PIN_WIDGET_CONTROL, pinctl);
	}
	}		}

	/* turn on/off EAPD (+ mute HP) as a master switch */		/* turn on/off EAPD (+ mute HP) as a master switch */
	@@ -3095,8 +3096,7 @@ static const char *cxt5066_models[CXT5066_MODELS] = {
	static struct snd_pci_quirk cxt5066_cfg_tbl[] = {		static struct snd_pci_quirk cxt5066_cfg_tbl[] = {
	SND_PCI_QUIRK_MASK(0x1025, 0xff00, 0x0400, "Acer", CXT5066_IDEAPAD),		SND_PCI_QUIRK_MASK(0x1025, 0xff00, 0x0400, "Acer", CXT5066_IDEAPAD),
	SND_PCI_QUIRK(0x1028, 0x02d8, "Dell Vostro", CXT5066_DELL_VOSTRO),		SND_PCI_QUIRK(0x1028, 0x02d8, "Dell Vostro", CXT5066_DELL_VOSTRO),
	SND_PCI_QUIRK(0x1028, 0x02f5, "Dell",		SND_PCI_QUIRK(0x1028, 0x02f5, "Dell Vostro 320", CXT5066_IDEAPAD),
	CXT5066_DELL_LAPTOP),
	SND_PCI_QUIRK(0x1028, 0x0402, "Dell Vostro", CXT5066_DELL_VOSTRO),		SND_PCI_QUIRK(0x1028, 0x0402, "Dell Vostro", CXT5066_DELL_VOSTRO),
	SND_PCI_QUIRK(0x1028, 0x0408, "Dell Inspiron One 19T", CXT5066_IDEAPAD),		SND_PCI_QUIRK(0x1028, 0x0408, "Dell Inspiron One 19T", CXT5066_IDEAPAD),
	SND_PCI_QUIRK(0x103c, 0x360b, "HP G60", CXT5066_HP_LAPTOP),		SND_PCI_QUIRK(0x103c, 0x360b, "HP G60", CXT5066_HP_LAPTOP),
	@@ -3109,6 +3109,7 @@ static struct snd_pci_quirk cxt5066_cfg_tbl[] = {
	SND_PCI_QUIRK(0x152d, 0x0833, "OLPC XO-1.5", CXT5066_OLPC_XO_1_5),		SND_PCI_QUIRK(0x152d, 0x0833, "OLPC XO-1.5", CXT5066_OLPC_XO_1_5),
	SND_PCI_QUIRK(0x17aa, 0x20f2, "Lenovo T400s", CXT5066_THINKPAD),		SND_PCI_QUIRK(0x17aa, 0x20f2, "Lenovo T400s", CXT5066_THINKPAD),
	SND_PCI_QUIRK(0x17aa, 0x21b2, "Thinkpad X100e", CXT5066_IDEAPAD),		SND_PCI_QUIRK(0x17aa, 0x21b2, "Thinkpad X100e", CXT5066_IDEAPAD),
			SND_PCI_QUIRK(0x17aa, 0x21c5, "Thinkpad Edge 13", CXT5066_THINKPAD),
	SND_PCI_QUIRK(0x17aa, 0x21b3, "Thinkpad Edge 13 (197)", CXT5066_IDEAPAD),		SND_PCI_QUIRK(0x17aa, 0x21b3, "Thinkpad Edge 13 (197)", CXT5066_IDEAPAD),
	SND_PCI_QUIRK(0x17aa, 0x21b4, "Thinkpad Edge", CXT5066_IDEAPAD),		SND_PCI_QUIRK(0x17aa, 0x21b4, "Thinkpad Edge", CXT5066_IDEAPAD),
	SND_PCI_QUIRK(0x17aa, 0x21c8, "Thinkpad Edge 11", CXT5066_IDEAPAD),		SND_PCI_QUIRK(0x17aa, 0x21c8, "Thinkpad Edge 11", CXT5066_IDEAPAD),

sound/pci/hda/patch_hdmi.c

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -834,7 +834,6 @@ static int hdmi_pcm_open(struct hda_pcm_stream *hinfo,
	return -ENODEV;		return -ENODEV;
	} else {		} else {
	/* fallback to the codec default */		/* fallback to the codec default */
	hinfo->channels_min = codec_pars->channels_min;
	hinfo->channels_max = codec_pars->channels_max;		hinfo->channels_max = codec_pars->channels_max;
	hinfo->rates = codec_pars->rates;		hinfo->rates = codec_pars->rates;
	hinfo->formats = codec_pars->formats;		hinfo->formats = codec_pars->formats;

sound/pci/hda/patch_realtek.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -4595,6 +4595,7 @@ static struct snd_pci_quirk alc880_cfg_tbl[] = {
	SND_PCI_QUIRK(0x1734, 0x10b0, "Fujitsu", ALC880_FUJITSU),		SND_PCI_QUIRK(0x1734, 0x10b0, "Fujitsu", ALC880_FUJITSU),
	SND_PCI_QUIRK(0x1854, 0x0018, "LG LW20", ALC880_LG_LW),		SND_PCI_QUIRK(0x1854, 0x0018, "LG LW20", ALC880_LG_LW),
	SND_PCI_QUIRK(0x1854, 0x003b, "LG", ALC880_LG),		SND_PCI_QUIRK(0x1854, 0x003b, "LG", ALC880_LG),
			SND_PCI_QUIRK(0x1854, 0x005f, "LG P1 Express", ALC880_LG),
	SND_PCI_QUIRK(0x1854, 0x0068, "LG w1", ALC880_LG),		SND_PCI_QUIRK(0x1854, 0x0068, "LG w1", ALC880_LG),
	SND_PCI_QUIRK(0x1854, 0x0077, "LG LW25", ALC880_LG_LW),		SND_PCI_QUIRK(0x1854, 0x0077, "LG LW25", ALC880_LG_LW),
	SND_PCI_QUIRK(0x19db, 0x4188, "TCL S700", ALC880_TCL_S700),		SND_PCI_QUIRK(0x19db, 0x4188, "TCL S700", ALC880_TCL_S700),