Commit dd9c1732 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "Some last-minute fixes. All changes are device-specific small fixes or
  quirks, safe to apply"

* tag 'sound-6.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ASoC: mediatek: common: fix device and OF node leak
  ALSA: hda/realtek: Fix mute LED mask on HP OMEN 16 laptop
  ALSA: usb-audio: qcom: Adjust mutex unlock order
  ASoC: SDCA: correct the calculation of the maximum init table size
  ASoC: rt5650: Eliminate the high frequency glitch
  ASoC: SOF: Intel: PTL: Add the sdw_process_wakeen op
  ALSA: hda/realtek - Add mute LED support for HP Pavilion 15-eg0xxx
  ALSA: hda/realtek - Add mute LED support for HP Victus 15-fa0xxx
  ASoC: mediatek: mt8365-dai-i2s: pass correct size to mt8365_dai_set_priv
parents cef6c8c9 0d57ed92

sound/pci/hda/patch_realtek.c

+3 −1
Original line number Diff line number Diff line
@@ -4753,7 +4753,7 @@ static void alc245_fixup_hp_mute_led_v1_coefbit(struct hda_codec *codec, 
	if (action == HDA_FIXUP_ACT_PRE_PROBE) {

		spec->mute_led_polarity = 0;

		spec->mute_led_coef.idx = 0x0b;

		spec->mute_led_coef.mask = 1 << 3;

		spec->mute_led_coef.mask = 3 << 2;

		spec->mute_led_coef.on = 1 << 3;

		spec->mute_led_coef.off = 0;

		snd_hda_gen_add_mute_led_cdev(codec, coef_mute_led_set);
@@ -10694,6 +10694,7 @@ static const struct hda_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x103c, 0x8788, "HP OMEN 15", ALC285_FIXUP_HP_MUTE_LED),

	SND_PCI_QUIRK(0x103c, 0x87b7, "HP Laptop 14-fq0xxx", ALC236_FIXUP_HP_MUTE_LED_COEFBIT2),

	SND_PCI_QUIRK(0x103c, 0x87c8, "HP", ALC287_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x87cc, "HP Pavilion 15-eg0xxx", ALC287_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x87d3, "HP Laptop 15-gw0xxx", ALC236_FIXUP_HP_MUTE_LED_COEFBIT2),

	SND_PCI_QUIRK(0x103c, 0x87df, "HP ProBook 430 G8 Notebook PC", ALC236_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x87e5, "HP ProBook 440 G8 Notebook PC", ALC236_FIXUP_HP_GPIO_LED),
@@ -10772,6 +10773,7 @@ static const struct hda_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x103c, 0x8a2e, "HP Envy 16", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x103c, 0x8a30, "HP Envy 17", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x103c, 0x8a31, "HP Envy 15", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x103c, 0x8a4f, "HP Victus 15-fa0xxx (MB 8A4F)", ALC245_FIXUP_HP_MUTE_LED_COEFBIT),

	SND_PCI_QUIRK(0x103c, 0x8a6e, "HP EDNA 360", ALC287_FIXUP_CS35L41_I2C_4),

	SND_PCI_QUIRK(0x103c, 0x8a74, "HP ProBook 440 G8 Notebook PC", ALC236_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8a78, "HP Dev One", ALC285_FIXUP_HP_LIMIT_INT_MIC_BOOST),

sound/soc/codecs/rt5645.c

+1 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ static const struct reg_sequence rt5650_init_list[] = { 
	{0xf6,	0x0100},

	{RT5645_PWR_ANLG1, 0x02},

	{RT5645_IL_CMD3, 0x6728},

	{RT5645_PR_BASE + 0x3a,	0x0000},

};



static const struct reg_default rt5645_reg[] = {

sound/soc/mediatek/common/mtk-soundcard-driver.c

+4 −0
Original line number Diff line number Diff line
@@ -262,9 +262,13 @@ int mtk_soundcard_common_probe(struct platform_device *pdev) 
				soc_card_data->accdet = accdet_comp;

			else

				dev_err(&pdev->dev, "No sound component found from mediatek,accdet property\n");



			put_device(&accdet_pdev->dev);

		} else {

			dev_err(&pdev->dev, "No device found from mediatek,accdet property\n");

		}



		of_node_put(accdet_node);

	}



	platform_node = of_parse_phandle(pdev->dev.of_node, "mediatek,platform", 0);

sound/soc/mediatek/mt8365/mt8365-dai-i2s.c

+1 −2
Original line number Diff line number Diff line
@@ -812,11 +812,10 @@ static const struct snd_soc_dapm_route mtk_dai_i2s_routes[] = { 
static int mt8365_dai_i2s_set_priv(struct mtk_base_afe *afe)

{

	int i, ret;

	struct mt8365_afe_private *afe_priv = afe->platform_priv;



	for (i = 0; i < DAI_I2S_NUM; i++) {

		ret = mt8365_dai_set_priv(afe, mt8365_i2s_priv[i].id,

					  sizeof(*afe_priv),

					  sizeof(mt8365_i2s_priv[i]),

					  &mt8365_i2s_priv[i]);

		if (ret)

			return ret;

sound/soc/sdca/sdca_functions.c

+1 −1
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ static int find_sdca_init_table(struct device *dev, 
	} else if (num_init_writes % sizeof(*raw) != 0) {

		dev_err(dev, "%pfwP: init table size invalid\n", function_node);

		return -EINVAL;

	} else if (num_init_writes > SDCA_MAX_INIT_COUNT) {

	} else if ((num_init_writes / sizeof(*raw)) > SDCA_MAX_INIT_COUNT) {

		dev_err(dev, "%pfwP: maximum init table size exceeded\n", function_node);

		return -EINVAL;

	}