Commit 769e155c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "The majority of changes are various ASoC device/platform-specific
  small fixes (including a removal of stale file) while the only common
  change is a clk management fix in ASoC simple-card driver.

  The rest are the usual HD-audio quirks"

* tag 'sound-5.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (44 commits)
  ALSA: usb-audio: Fix unintentional sign extension issue
  ALSA: hda/realtek: fix mute/micmute LEDs for HP 850 G8
  ASoC: dt-bindings: fsl_spdif: Add compatible string for new platforms
  ASoC: rt711: add snd_soc_component remove callback
  ASoC: rt5659: Update MCLK rate in set_sysclk()
  ASoC: simple-card-utils: Do not handle device clock
  ALSA: hda/realtek: fix mute/micmute LEDs for HP 440 G8
  ALSA: hda/realtek: fix mute/micmute LEDs for HP 840 G8
  ALSA: hda/realtek: apply pin quirk for XiaomiNotebook Pro
  ALSA: hda/realtek: Apply headset-mic quirks for Xiaomi Redmibook Air
  ASoC: mediatek: mt8192: fix tdm out data is valid on rising edge
  ALSA: dice: fix null pointer dereference when node is disconnected
  ALSA: hda: generic: Fix the micmute led init state
  ASoC: qcom: lpass-cpu: Fix lpass dai ids parse
  spi: cadence: set cqspi to the driver_data field of struct device
  ASoC: SOF: intel: fix wrong poll bits in dsp power down
  ASoC: codecs: wcd934x: add a sanity check in set channel map
  ASoC: qcom: sdm845: Fix array out of range on rx slim channels
  ASoC: qcom: sdm845: Fix array out of bounds access
  ASoC: remove remnants of sirf prima/atlas audio codec
  ...
parents 8b12a62a 50b1affc

Documentation/devicetree/bindings/sound/fsl,spdif.yaml

+4 −0
Original line number Diff line number Diff line
@@ -21,6 +21,10 @@ properties: 
      - fsl,vf610-spdif

      - fsl,imx6sx-spdif

      - fsl,imx8qm-spdif

      - fsl,imx8qxp-spdif

      - fsl,imx8mq-spdif

      - fsl,imx8mm-spdif

      - fsl,imx8mn-spdif



  reg:

    maxItems: 1

drivers/spi/spi-cadence-quadspi.c

+1 −0
Original line number Diff line number Diff line
@@ -1433,6 +1433,7 @@ static int cqspi_probe(struct platform_device *pdev) 
	cqspi = spi_master_get_devdata(master);



	cqspi->pdev = pdev;

	platform_set_drvdata(pdev, cqspi);



	/* Obtain configuration from OF. */

	ret = cqspi_of_get_pdata(cqspi);

sound/firewire/dice/dice-stream.c

+2 −3
Original line number Diff line number Diff line
@@ -493,11 +493,10 @@ void snd_dice_stream_stop_duplex(struct snd_dice *dice) 
	struct reg_params tx_params, rx_params;



	if (dice->substreams_counter == 0) {

		if (get_register_params(dice, &tx_params, &rx_params) >= 0) {

			amdtp_domain_stop(&dice->domain);

		if (get_register_params(dice, &tx_params, &rx_params) >= 0)

			finish_session(dice, &tx_params, &rx_params);

		}



		amdtp_domain_stop(&dice->domain);

		release_resources(dice);

	}

}

sound/pci/hda/hda_generic.c

+1 −1
Original line number Diff line number Diff line
@@ -4065,7 +4065,7 @@ static int add_micmute_led_hook(struct hda_codec *codec) 


	spec->micmute_led.led_mode = MICMUTE_LED_FOLLOW_MUTE;

	spec->micmute_led.capture = 0;

	spec->micmute_led.led_value = 0;

	spec->micmute_led.led_value = -1;

	spec->micmute_led.old_hook = spec->cap_sync_hook;

	spec->cap_sync_hook = update_micmute_led;

	if (!snd_hda_gen_add_kctl(spec, NULL, &micmute_led_mode_ctl))

sound/pci/hda/patch_realtek.c

+16 −0
Original line number Diff line number Diff line
@@ -4225,6 +4225,12 @@ static void alc_fixup_hp_gpio_led(struct hda_codec *codec, 
	}

}



static void alc236_fixup_hp_gpio_led(struct hda_codec *codec,

				const struct hda_fixup *fix, int action)

{

	alc_fixup_hp_gpio_led(codec, action, 0x02, 0x01);

}



static void alc269_fixup_hp_gpio_led(struct hda_codec *codec,

				const struct hda_fixup *fix, int action)

{
@@ -6381,6 +6387,7 @@ enum { 
	ALC294_FIXUP_ASUS_GX502_VERBS,

	ALC285_FIXUP_HP_GPIO_LED,

	ALC285_FIXUP_HP_MUTE_LED,

	ALC236_FIXUP_HP_GPIO_LED,

	ALC236_FIXUP_HP_MUTE_LED,

	ALC298_FIXUP_SAMSUNG_HEADPHONE_VERY_QUIET,

	ALC295_FIXUP_ASUS_MIC_NO_PRESENCE,
@@ -7616,6 +7623,10 @@ static const struct hda_fixup alc269_fixups[] = { 
		.type = HDA_FIXUP_FUNC,

		.v.func = alc285_fixup_hp_mute_led,

	},

	[ALC236_FIXUP_HP_GPIO_LED] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = alc236_fixup_hp_gpio_led,

	},

	[ALC236_FIXUP_HP_MUTE_LED] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = alc236_fixup_hp_mute_led,
@@ -8045,9 +8056,12 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x103c, 0x8783, "HP ZBook Fury 15 G7 Mobile Workstation",

		      ALC285_FIXUP_HP_GPIO_AMP_INIT),

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

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

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

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

	SND_PCI_QUIRK(0x103c, 0x87f7, "HP Spectre x360 14", ALC245_FIXUP_HP_X360_AMP),

	SND_PCI_QUIRK(0x103c, 0x8846, "HP EliteBook 850 G8 Notebook PC", ALC285_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x884c, "HP EliteBook 840 G8 Notebook PC", ALC285_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x1043, 0x103e, "ASUS X540SA", ALC256_FIXUP_ASUS_MIC),

	SND_PCI_QUIRK(0x1043, 0x103f, "ASUS TX300", ALC282_FIXUP_ASUS_TX300),

	SND_PCI_QUIRK(0x1043, 0x106d, "Asus K53BE", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),
@@ -8242,7 +8256,9 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1b35, 0x1237, "CZC L101", ALC269_FIXUP_CZC_L101),

	SND_PCI_QUIRK(0x1b7d, 0xa831, "Ordissimo EVE2 ", ALC269VB_FIXUP_ORDISSIMO_EVE2), /* Also known as Malata PC-B1303 */

	SND_PCI_QUIRK(0x1d72, 0x1602, "RedmiBook", ALC255_FIXUP_XIAOMI_HEADSET_MIC),

	SND_PCI_QUIRK(0x1d72, 0x1701, "XiaomiNotebook Pro", ALC298_FIXUP_DELL1_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1d72, 0x1901, "RedmiBook 14", ALC256_FIXUP_ASUS_HEADSET_MIC),

	SND_PCI_QUIRK(0x1d72, 0x1947, "RedmiBook Air", ALC255_FIXUP_XIAOMI_HEADSET_MIC),

	SND_PCI_QUIRK(0x10ec, 0x118c, "Medion EE4254 MD62100", ALC256_FIXUP_MEDION_HEADSET_NO_PRESENCE),

	SND_PCI_QUIRK(0x1c06, 0x2013, "Lemote A1802", ALC269_FIXUP_LEMOTE_A1802),

	SND_PCI_QUIRK(0x1c06, 0x2015, "Lemote A190X", ALC269_FIXUP_LEMOTE_A190X),