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

Commit 2137397c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "Here are a few last-minute fixes for 5.0.

  The most significant one is the OF-node refcount fix for ASoC
  simple-card, which could be triggered on many boards. Another fix for
  ASoC core is for the error handling in topology, while others are
  device-specific fixes for Samsung and HD-audio"

* tag 'sound-5.0' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ASoC: simple-card: fixup refcount_t underflow
  ASoC: topology: free created components in tplg load error
  ALSA: hda/realtek: Disable PC beep in passthrough on alc285
  ALSA: hda/realtek - Headset microphone and internal speaker support for System76 oryp5
  ASoC: samsung: i2s: Fix prescaler setting for the secondary DAI
parents fb83f15e 26883664

sound/pci/hda/patch_realtek.c

+41 −1
Original line number Diff line number Diff line
@@ -1855,6 +1855,8 @@ enum { 
	ALC887_FIXUP_BASS_CHMAP,

	ALC1220_FIXUP_GB_DUAL_CODECS,

	ALC1220_FIXUP_CLEVO_P950,

	ALC1220_FIXUP_SYSTEM76_ORYP5,

	ALC1220_FIXUP_SYSTEM76_ORYP5_PINS,

};



static void alc889_fixup_coef(struct hda_codec *codec,
@@ -2056,6 +2058,17 @@ static void alc1220_fixup_clevo_p950(struct hda_codec *codec, 
	snd_hda_override_conn_list(codec, 0x1b, 1, conn1);

}



static void alc_fixup_headset_mode_no_hp_mic(struct hda_codec *codec,

				const struct hda_fixup *fix, int action);



static void alc1220_fixup_system76_oryp5(struct hda_codec *codec,

				     const struct hda_fixup *fix,

				     int action)

{

	alc1220_fixup_clevo_p950(codec, fix, action);

	alc_fixup_headset_mode_no_hp_mic(codec, fix, action);

}



static const struct hda_fixup alc882_fixups[] = {

	[ALC882_FIXUP_ABIT_AW9D_MAX] = {

		.type = HDA_FIXUP_PINS,
@@ -2300,6 +2313,19 @@ static const struct hda_fixup alc882_fixups[] = { 
		.type = HDA_FIXUP_FUNC,

		.v.func = alc1220_fixup_clevo_p950,

	},

	[ALC1220_FIXUP_SYSTEM76_ORYP5] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = alc1220_fixup_system76_oryp5,

	},

	[ALC1220_FIXUP_SYSTEM76_ORYP5_PINS] = {

		.type = HDA_FIXUP_PINS,

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

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

			{}

		},

		.chained = true,

		.chain_id = ALC1220_FIXUP_SYSTEM76_ORYP5,

	},

};



static const struct snd_pci_quirk alc882_fixup_tbl[] = {
@@ -2376,6 +2402,8 @@ static const struct snd_pci_quirk alc882_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1558, 0x9501, "Clevo P950HR", ALC1220_FIXUP_CLEVO_P950),

	SND_PCI_QUIRK(0x1558, 0x95e1, "Clevo P95xER", ALC1220_FIXUP_CLEVO_P950),

	SND_PCI_QUIRK(0x1558, 0x95e2, "Clevo P950ER", ALC1220_FIXUP_CLEVO_P950),

	SND_PCI_QUIRK(0x1558, 0x96e1, "System76 Oryx Pro (oryp5)", ALC1220_FIXUP_SYSTEM76_ORYP5_PINS),

	SND_PCI_QUIRK(0x1558, 0x97e1, "System76 Oryx Pro (oryp5)", ALC1220_FIXUP_SYSTEM76_ORYP5_PINS),

	SND_PCI_QUIRK_VENDOR(0x1558, "Clevo laptop", ALC882_FIXUP_EAPD),

	SND_PCI_QUIRK(0x161f, 0x2054, "Medion laptop", ALC883_FIXUP_EAPD),

	SND_PCI_QUIRK(0x17aa, 0x3a0d, "Lenovo Y530", ALC882_FIXUP_LENOVO_Y530),
@@ -5632,6 +5660,7 @@ enum { 
	ALC294_FIXUP_ASUS_SPK,

	ALC225_FIXUP_HEADSET_JACK,

	ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE,

	ALC285_FIXUP_LENOVO_PC_BEEP_IN_NOISE,

};



static const struct hda_fixup alc269_fixups[] = {
@@ -6587,6 +6616,17 @@ static const struct hda_fixup alc269_fixups[] = { 
		.chained = true,

		.chain_id = ALC269_FIXUP_HEADSET_MODE_NO_HP_MIC

	},

	[ALC285_FIXUP_LENOVO_PC_BEEP_IN_NOISE] = {

		.type = HDA_FIXUP_VERBS,

		.v.verbs = (const struct hda_verb[]) {

			/* Disable PCBEEP-IN passthrough */

			{ 0x20, AC_VERB_SET_COEF_INDEX, 0x36 },

			{ 0x20, AC_VERB_SET_PROC_COEF, 0x57d7 },

			{ }

		},

		.chained = true,

		.chain_id = ALC285_FIXUP_LENOVO_HEADPHONE_NOISE

	},

};



static const struct snd_pci_quirk alc269_fixup_tbl[] = {
@@ -7272,7 +7312,7 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { 
		{0x12, 0x90a60130},

		{0x19, 0x03a11020},

		{0x21, 0x0321101f}),

	SND_HDA_PIN_QUIRK(0x10ec0285, 0x17aa, "Lenovo", ALC285_FIXUP_LENOVO_HEADPHONE_NOISE,

	SND_HDA_PIN_QUIRK(0x10ec0285, 0x17aa, "Lenovo", ALC285_FIXUP_LENOVO_PC_BEEP_IN_NOISE,

		{0x12, 0x90a60130},

		{0x14, 0x90170110},

		{0x19, 0x04a11040},

sound/soc/generic/simple-card.c

+1 −1
Original line number Diff line number Diff line
@@ -462,7 +462,7 @@ static int asoc_simple_card_parse_of(struct simple_card_data *priv) 
	conf_idx	= 0;

	node = of_get_child_by_name(top, PREFIX "dai-link");

	if (!node) {

		node = dev->of_node;

		node = of_node_get(top);

		loop = 0;

	}

sound/soc/samsung/i2s.c

+7 −1
Original line number Diff line number Diff line
@@ -604,6 +604,7 @@ static int i2s_set_fmt(struct snd_soc_dai *dai, 
	unsigned int fmt)

{

	struct i2s_dai *i2s = to_info(dai);

	struct i2s_dai *other = get_other_dai(i2s);

	int lrp_shift, sdf_shift, sdf_mask, lrp_rlow, mod_slave;

	u32 mod, tmp = 0;

	unsigned long flags;
@@ -661,7 +662,8 @@ static int i2s_set_fmt(struct snd_soc_dai *dai, 
		 * CLK_I2S_RCLK_SRC clock is not exposed so we ensure any

		 * clock configuration assigned in DT is not overwritten.

		 */

		if (i2s->rclk_srcrate == 0 && i2s->clk_data.clks == NULL)

		if (i2s->rclk_srcrate == 0 && i2s->clk_data.clks == NULL &&

		    other->clk_data.clks == NULL)

			i2s_set_sysclk(dai, SAMSUNG_I2S_RCLKSRC_0,

							0, SND_SOC_CLOCK_IN);

		break;
@@ -699,6 +701,7 @@ static int i2s_hw_params(struct snd_pcm_substream *substream, 
	struct snd_pcm_hw_params *params, struct snd_soc_dai *dai)

{

	struct i2s_dai *i2s = to_info(dai);

	struct i2s_dai *other = get_other_dai(i2s);

	u32 mod, mask = 0, val = 0;

	struct clk *rclksrc;

	unsigned long flags;
@@ -784,6 +787,9 @@ static int i2s_hw_params(struct snd_pcm_substream *substream, 
	i2s->frmclk = params_rate(params);



	rclksrc = i2s->clk_table[CLK_I2S_RCLK_SRC];

	if (!rclksrc || IS_ERR(rclksrc))

		rclksrc = other->clk_table[CLK_I2S_RCLK_SRC];



	if (rclksrc && !IS_ERR(rclksrc))

		i2s->rclk_srcrate = clk_get_rate(rclksrc);

sound/soc/soc-topology.c

+7 −1
Original line number Diff line number Diff line
@@ -2487,6 +2487,7 @@ int snd_soc_tplg_component_load(struct snd_soc_component *comp, 
	struct snd_soc_tplg_ops *ops, const struct firmware *fw, u32 id)

{

	struct soc_tplg tplg;

	int ret;



	/* setup parsing context */

	memset(&tplg, 0, sizeof(tplg));
@@ -2500,7 +2501,12 @@ int snd_soc_tplg_component_load(struct snd_soc_component *comp, 
	tplg.bytes_ext_ops = ops->bytes_ext_ops;

	tplg.bytes_ext_ops_count = ops->bytes_ext_ops_count;



	return soc_tplg_load(&tplg);

	ret = soc_tplg_load(&tplg);

	/* free the created components if fail to load topology */

	if (ret)

		snd_soc_tplg_component_remove(comp, SND_SOC_TPLG_INDEX_ALL);



	return ret;

}

EXPORT_SYMBOL_GPL(snd_soc_tplg_component_load);