Commit 50643bbc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "Still more changes floating than wished at this late stage, but all
  are small device-specific fixes, and look less troublesome.

  Including a few ASoC quirk / ID additoins, a series of ASoC STM fixes,
  HD-audio conexant codec regression fix, and other various quirks and
  device-specific fixes"

* tag 'sound-6.12-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ASoC: SOF: sof-client-probes-ipc4: Set param_size extension bits
  ASoC: stm: Prevent potential division by zero in stm32_sai_get_clk_div()
  ASoC: stm: Prevent potential division by zero in stm32_sai_mclk_round_rate()
  ASoC: amd: yc: Support dmic on another model of Lenovo Thinkpad E14 Gen 6
  ASoC: SOF: amd: Fix for incorrect DMA ch status register offset
  ASoC: amd: yc: fix internal mic on Xiaomi Book Pro 14 2022
  ASoC: stm32: spdifrx: fix dma channel release in stm32_spdifrx_remove
  MAINTAINERS: Generic Sound Card section
  ALSA: usb-audio: Add quirk for HP 320 FHD Webcam
  ASoC: tas2781: Add new driver version for tas2563 & tas2781 qfn chip
  ALSA: firewire-lib: fix return value on fail in amdtp_tscm_init()
  ALSA: ump: Don't enumeration invalid groups for legacy rawmidi
  Revert "ALSA: hda/conexant: Mute speakers at suspend / shutdown"
parents ceb06133 fa59caa7

MAINTAINERS

+9 −0
Original line number Diff line number Diff line
@@ -21617,6 +21617,15 @@ S: Supported 
W:	https://github.com/thesofproject/linux/

F:	sound/soc/sof/









SOUND - GENERIC SOUND CARD (Simple-Audio-Card, Audio-Graph-Card)









M:	Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>









S:	Supported









L:	linux-sound@vger.kernel.org









F:	sound/soc/generic/









F:	include/sound/simple_card*









F:	Documentation/devicetree/bindings/sound/simple-card.yaml









F:	Documentation/devicetree/bindings/sound/audio-graph*.yaml

















SOUNDWIRE SUBSYSTEM









M:	Vinod Koul <vkoul@kernel.org>









M:	Bard Liao <yung-chuan.liao@linux.intel.com>

























sound/core/ump.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -1233,7 +1233,7 @@ static int fill_legacy_mapping(struct snd_ump_endpoint *ump)

















	num = 0;









	for (i = 0; i < SNDRV_UMP_MAX_GROUPS; i++)









		if (group_maps & (1U << i))









		if ((group_maps & (1U << i)) && ump->groups[i].valid)









			ump->legacy_mapping[num++] = i;



















	return num;
































sound/firewire/tascam/amdtp-tascam.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -238,7 +238,7 @@ int amdtp_tscm_init(struct amdtp_stream *s, struct fw_unit *unit,







	err = amdtp_stream_init(s, unit, dir, flags, fmt,









			process_ctx_payloads, sizeof(struct amdtp_tscm));









	if (err < 0)









		return 0;









		return err;



















	if (dir == AMDTP_OUT_STREAM) {









		// Use fixed value for FDF field.
































sound/pci/hda/patch_conexant.c



+0
−2






























Original line number
Diff line number
Diff line







@@ -205,8 +205,6 @@ static void cx_auto_shutdown(struct hda_codec *codec)







{









	struct conexant_spec *spec = codec->spec;



















	snd_hda_gen_shutup_speakers(codec);



















	/* Turn the problematic codec into D3 to avoid spurious noises









	   from the internal speaker during (and after) reboot */









	cx_auto_turn_eapd(codec, spec->num_eapds, spec->eapds, false);
































sound/soc/amd/yc/acp6x-mach.c



+14
−0






























Original line number
Diff line number
Diff line







@@ -227,6 +227,13 @@ static const struct dmi_system_id yc_acp_quirk_table[] = {







			DMI_MATCH(DMI_PRODUCT_NAME, "21M3"),









		}









	},









	{









		.driver_data = &acp6x_card,









		.matches = {









			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),









			DMI_MATCH(DMI_PRODUCT_NAME, "21M4"),









		}









	},









	{









		.driver_data = &acp6x_card,









		.matches = {








@@ -395,6 +402,13 @@ static const struct dmi_system_id yc_acp_quirk_table[] = {







			DMI_MATCH(DMI_PRODUCT_NAME, "Redmi Book Pro 15 2022"),









		}









	},









	{









		.driver_data = &acp6x_card,









		.matches = {









			DMI_MATCH(DMI_BOARD_VENDOR, "TIMI"),









			DMI_MATCH(DMI_PRODUCT_NAME, "Xiaomi Book Pro 14 2022"),









		}









	},









	{









		.driver_data = &acp6x_card,









		.matches = {