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

Commit 0c68e5bf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sound-4.1-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull sound fixes from Takashi Iwai:
 "This batch became slightly large, just because I've been on vacation
  for the last two weeks.  Nothing to scare much here, all
  device-specific fixes, mostly small patches.

  Majority of patches are for HD-audio, especially Dell machines.  The
  rest are small ASoC fixes for various codecs, and a USB-audio quirk.

  One PCM fix is included to ease the faulty condition checks in the
  case of two periods PCM buffers"

* tag 'sound-4.1-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda - Disable widget power-saving for ALC292 & co
  ALSA: hda - Reduce verbs by node power-saves
  ALSA: sound/atmel/ac97c.c: remove unused variable
  ALSA: usb-audio: Add quirk for MS LifeCam Studio
  ALSA: pcm: Modify double acknowledged interrupts check condition
  ALSA: hda/realtek - ALC292 dock fix for Thinkpad L450
  ALSA: hda - Add Conexant codecs CX20721, CX20722, CX20723 and CX20724
  ALSA: hda - Fix headset mic and mic-in for a Dell desktop
  ASoC: wm8994: correct BCLK DIV 348 to 384
  ASoC: wm8960: fix "RINPUT3" audio route error
  ASoC: dapm: Modify widget stream name according to prefix
  ALSA: hda - Add headset mic quirk for Dell Inspiron 5548
  ASoC: rt5645: Fix mask for setting RT5645_DMIC_2_DP_GPIO12 bit
  ASoC: rt5645: Add ACPI match ID
  ALSA: hda/realtek - Add ALC298 alias name for Dell
  ASoC: uda1380: Avoid accessing i2c bus when codec is disabled
  ALSA: hda/realtek - Fix typo for ALC286/ALC288
  ASoC: mc13783: Fix wrong mask value used in mc13xxx_reg_rmw() calls
  ALSA: hda - Add headphone quirk for Lifebook E752
  ASoC: davinci-mcasp: Correct pm status check in suspend callback
parents 18658921 219f47e4

sound/atmel/ac97c.c

+0 −1
Original line number Diff line number Diff line
@@ -916,7 +916,6 @@ static struct ac97c_platform_data *atmel_ac97c_probe_dt(struct device *dev) 
{

	struct ac97c_platform_data *pdata;

	struct device_node *node = dev->of_node;

	const struct of_device_id *match;



	if (!node) {

		dev_err(dev, "Device does not have associated DT data\n");

sound/core/pcm_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -339,7 +339,7 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream, 
		if (delta > new_hw_ptr) {

			/* check for double acknowledged interrupts */

			hdelta = curr_jiffies - runtime->hw_ptr_jiffies;

			if (hdelta > runtime->hw_ptr_buffer_jiffies/2) {

			if (hdelta > runtime->hw_ptr_buffer_jiffies/2 + 1) {

				hw_base += runtime->buffer_size;

				if (hw_base >= runtime->boundary) {

					hw_base = 0;

sound/pci/hda/hda_generic.c

+8 −0
Original line number Diff line number Diff line
@@ -844,8 +844,16 @@ static hda_nid_t path_power_update(struct hda_codec *codec, 
			snd_hda_codec_write(codec, nid, 0,

					    AC_VERB_SET_POWER_STATE, state);

			changed = nid;

			/* all known codecs seem to be capable to handl

			 * widgets state even in D3, so far.

			 * if any new codecs need to restore the widget

			 * states after D0 transition, call the function

			 * below.

			 */

#if 0 /* disabled */

			if (state == AC_PWRST_D0)

				snd_hdac_regmap_sync_node(&codec->core, nid);

#endif

		}

	}

	return changed;

sound/pci/hda/patch_conexant.c

+12 −0
Original line number Diff line number Diff line
@@ -968,6 +968,14 @@ static const struct hda_codec_preset snd_hda_preset_conexant[] = { 
	  .patch = patch_conexant_auto },

	{ .id = 0x14f150b9, .name = "CX20665",

	  .patch = patch_conexant_auto },

	{ .id = 0x14f150f1, .name = "CX20721",

	  .patch = patch_conexant_auto },

	{ .id = 0x14f150f2, .name = "CX20722",

	  .patch = patch_conexant_auto },

	{ .id = 0x14f150f3, .name = "CX20723",

	  .patch = patch_conexant_auto },

	{ .id = 0x14f150f4, .name = "CX20724",

	  .patch = patch_conexant_auto },

	{ .id = 0x14f1510f, .name = "CX20751/2",

	  .patch = patch_conexant_auto },

	{ .id = 0x14f15110, .name = "CX20751/2",
@@ -1002,6 +1010,10 @@ MODULE_ALIAS("snd-hda-codec-id:14f150ab"); 
MODULE_ALIAS("snd-hda-codec-id:14f150ac");

MODULE_ALIAS("snd-hda-codec-id:14f150b8");

MODULE_ALIAS("snd-hda-codec-id:14f150b9");

MODULE_ALIAS("snd-hda-codec-id:14f150f1");

MODULE_ALIAS("snd-hda-codec-id:14f150f2");

MODULE_ALIAS("snd-hda-codec-id:14f150f3");

MODULE_ALIAS("snd-hda-codec-id:14f150f4");

MODULE_ALIAS("snd-hda-codec-id:14f1510f");

MODULE_ALIAS("snd-hda-codec-id:14f15110");

MODULE_ALIAS("snd-hda-codec-id:14f15111");

sound/pci/hda/patch_realtek.c

+57 −3
Original line number Diff line number Diff line
@@ -883,6 +883,7 @@ static struct alc_codec_rename_pci_table rename_pci_tbl[] = { 
	{ 0x10ec0668, 0x1028, 0, "ALC3661" },

	{ 0x10ec0275, 0x1028, 0, "ALC3260" },

	{ 0x10ec0899, 0x1028, 0, "ALC3861" },

	{ 0x10ec0298, 0x1028, 0, "ALC3266" },

	{ 0x10ec0670, 0x1025, 0, "ALC669X" },

	{ 0x10ec0676, 0x1025, 0, "ALC679X" },

	{ 0x10ec0282, 0x1043, 0, "ALC3229" },
@@ -3673,6 +3674,10 @@ static void alc_headset_mode_mic_in(struct hda_codec *codec, hda_nid_t hp_pin, 
		alc_process_coef_fw(codec, coef0293);

		snd_hda_set_pin_ctl_cache(codec, mic_pin, PIN_VREF50);

		break;

	case 0x10ec0662:

		snd_hda_set_pin_ctl_cache(codec, hp_pin, 0);

		snd_hda_set_pin_ctl_cache(codec, mic_pin, PIN_VREF50);

		break;

	case 0x10ec0668:

		alc_write_coef_idx(codec, 0x11, 0x0001);

		snd_hda_set_pin_ctl_cache(codec, hp_pin, 0);
@@ -3738,7 +3743,6 @@ static void alc_headset_mode_default(struct hda_codec *codec) 
	case 0x10ec0288:

		alc_process_coef_fw(codec, coef0288);

		break;

		break;

	case 0x10ec0292:

		alc_process_coef_fw(codec, coef0292);

		break;
@@ -4012,7 +4016,7 @@ static void alc_update_headset_mode(struct hda_codec *codec) 
	if (new_headset_mode != ALC_HEADSET_MODE_MIC) {

		snd_hda_set_pin_ctl_cache(codec, hp_pin,

					  AC_PINCTL_OUT_EN | AC_PINCTL_HP_EN);

		if (spec->headphone_mic_pin)

		if (spec->headphone_mic_pin && spec->headphone_mic_pin != hp_pin)

			snd_hda_set_pin_ctl_cache(codec, spec->headphone_mic_pin,

						  PIN_VREFHIZ);

	}
@@ -4215,6 +4219,18 @@ static void alc_fixup_dell_xps13(struct hda_codec *codec, 
	}

}



static void alc_fixup_headset_mode_alc662(struct hda_codec *codec,

				const struct hda_fixup *fix, int action)

{

	struct alc_spec *spec = codec->spec;



	if (action == HDA_FIXUP_ACT_PRE_PROBE) {

		spec->parse_flags |= HDA_PINCFG_HEADSET_MIC;

		spec->gen.hp_mic = 1; /* Mic-in is same pin as headphone */

	} else

		alc_fixup_headset_mode(codec, fix, action);

}



static void alc_fixup_headset_mode_alc668(struct hda_codec *codec,

				const struct hda_fixup *fix, int action)

{
@@ -5119,6 +5135,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x104d, 0x9099, "Sony VAIO S13", ALC275_FIXUP_SONY_DISABLE_AAMIX),

	SND_PCI_QUIRK(0x10cf, 0x1475, "Lifebook", ALC269_FIXUP_LIFEBOOK),

	SND_PCI_QUIRK(0x10cf, 0x15dc, "Lifebook T731", ALC269_FIXUP_LIFEBOOK_HP_PIN),

	SND_PCI_QUIRK(0x10cf, 0x1757, "Lifebook E752", ALC269_FIXUP_LIFEBOOK_HP_PIN),

	SND_PCI_QUIRK(0x10cf, 0x1845, "Lifebook U904", ALC269_FIXUP_LIFEBOOK_EXTMIC),

	SND_PCI_QUIRK(0x144d, 0xc109, "Samsung Ativ book 9 (NP900X3G)", ALC269_FIXUP_INV_DMIC),

	SND_PCI_QUIRK(0x1458, 0xfa53, "Gigabyte BXBT-2807", ALC283_FIXUP_BXBT2807_MIC),
@@ -5148,6 +5165,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x17aa, 0x5026, "Thinkpad", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),

	SND_PCI_QUIRK(0x17aa, 0x5034, "Thinkpad T450", ALC292_FIXUP_TPT440_DOCK),

	SND_PCI_QUIRK(0x17aa, 0x5036, "Thinkpad T450s", ALC292_FIXUP_TPT440_DOCK),

	SND_PCI_QUIRK(0x17aa, 0x503c, "Thinkpad L450", ALC292_FIXUP_TPT440_DOCK),

	SND_PCI_QUIRK(0x17aa, 0x5109, "Thinkpad", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),

	SND_PCI_QUIRK(0x17aa, 0x3bf8, "Quanta FL1", ALC269_FIXUP_PCM_44K),

	SND_PCI_QUIRK(0x17aa, 0x9e54, "LENOVO NB", ALC269_FIXUP_LENOVO_EAPD),
@@ -5345,6 +5363,13 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { 
		{0x17, 0x40000000},

		{0x1d, 0x40700001},

		{0x21, 0x02211050}),

	SND_HDA_PIN_QUIRK(0x10ec0255, 0x1028, "Dell Inspiron 5548", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,

		ALC255_STANDARD_PINS,

		{0x12, 0x90a60180},

		{0x14, 0x90170130},

		{0x17, 0x40000000},

		{0x1d, 0x40700001},

		{0x21, 0x02211040}),

	SND_HDA_PIN_QUIRK(0x10ec0256, 0x1028, "Dell", ALC255_FIXUP_DELL1_MIC_NO_PRESENCE,

		ALC256_STANDARD_PINS,

		{0x13, 0x40000000}),
@@ -5598,6 +5623,7 @@ static int patch_alc269(struct hda_codec *codec) 


	spec = codec->spec;

	spec->gen.shared_mic_vref_pin = 0x18;

	if (codec->core.vendor_id != 0x10ec0292)

		codec->power_save_node = 1;



	snd_hda_pick_fixup(codec, alc269_fixup_models,
@@ -6079,7 +6105,9 @@ enum { 
	ALC662_FIXUP_NO_JACK_DETECT,

	ALC662_FIXUP_ZOTAC_Z68,

	ALC662_FIXUP_INV_DMIC,

	ALC662_FIXUP_DELL_MIC_NO_PRESENCE,

	ALC668_FIXUP_DELL_MIC_NO_PRESENCE,

	ALC662_FIXUP_HEADSET_MODE,

	ALC668_FIXUP_HEADSET_MODE,

	ALC662_FIXUP_BASS_MODE4_CHMAP,

	ALC662_FIXUP_BASS_16,
@@ -6272,6 +6300,20 @@ static const struct hda_fixup alc662_fixups[] = { 
		.chained = true,

		.chain_id = ALC668_FIXUP_DELL_MIC_NO_PRESENCE

	},

	[ALC662_FIXUP_DELL_MIC_NO_PRESENCE] = {

		.type = HDA_FIXUP_PINS,

		.v.pins = (const struct hda_pintbl[]) {

			{ 0x19, 0x03a1113c }, /* use as headset mic, without its own jack detect */

			/* headphone mic by setting pin control of 0x1b (headphone out) to in + vref_50 */

			{ }

		},

		.chained = true,

		.chain_id = ALC662_FIXUP_HEADSET_MODE

	},

	[ALC662_FIXUP_HEADSET_MODE] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = alc_fixup_headset_mode_alc662,

	},

	[ALC668_FIXUP_DELL_MIC_NO_PRESENCE] = {

		.type = HDA_FIXUP_PINS,

		.v.pins = (const struct hda_pintbl[]) {
@@ -6423,6 +6465,18 @@ static const struct hda_model_fixup alc662_fixup_models[] = { 
};



static const struct snd_hda_pin_quirk alc662_pin_fixup_tbl[] = {

	SND_HDA_PIN_QUIRK(0x10ec0662, 0x1028, "Dell", ALC662_FIXUP_DELL_MIC_NO_PRESENCE,

		{0x12, 0x4004c000},

		{0x14, 0x01014010},

		{0x15, 0x411111f0},

		{0x16, 0x411111f0},

		{0x18, 0x01a19020},

		{0x19, 0x411111f0},

		{0x1a, 0x0181302f},

		{0x1b, 0x0221401f},

		{0x1c, 0x411111f0},

		{0x1d, 0x4054c601},

		{0x1e, 0x411111f0}),

	SND_HDA_PIN_QUIRK(0x10ec0668, 0x1028, "Dell", ALC668_FIXUP_AUTO_MUTE,

		{0x12, 0x99a30130},

		{0x14, 0x90170110},