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

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

Pull sound fixes from Takashi Iwai:
 "A collection of small fixes.

  At this time, quite a few fixes for the old PCI drivers are found.
  Although they are not regression fixes, I took these as they are
  materials for stable kernels.

  In addition, a couple of regression fixes and another couple of
  HD-audio quirks are included"

* tag 'sound-6.3-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda/hdmi: disable KAE for Intel DG2
  ALSA: hda/realtek: Add quirks for Lenovo Z13/Z16 Gen2
  ALSA: hda: patch_realtek: add quirk for Asus N7601ZM
  ALSA: firewire-tascam: add missing unwind goto in snd_tscm_stream_start_duplex()
  ALSA: emu10k1: don't create old pass-through playback device on Audigy
  ALSA: emu10k1: fix capture interrupt handler unlinking
  ALSA: hda/sigmatel: fix S/PDIF out on Intel D*45* motherboards
  ALSA: hda/sigmatel: add pin overrides for Intel DP45SG motherboard
  ALSA: i2c/cs8427: fix iec958 mixer control deactivation
parents aee3c14e 6ab6f98f

Documentation/sound/hd-audio/models.rst

+1 −1
Original line number Diff line number Diff line
@@ -704,7 +704,7 @@ ref 
no-jd

    BIOS setup but without jack-detection

intel

    Intel DG45* mobos

    Intel D*45* mobos

dell-m6-amic

    Dell desktops/laptops with analog mics

dell-m6-dmic

sound/firewire/tascam/tascam-stream.c

+1 −1
Original line number Diff line number Diff line
@@ -490,7 +490,7 @@ int snd_tscm_stream_start_duplex(struct snd_tscm *tscm, unsigned int rate) 
		// packet is important for media clock recovery.

		err = amdtp_domain_start(&tscm->domain, tx_init_skip_cycles, true, true);

		if (err < 0)

			return err;

			goto error;



		if (!amdtp_domain_wait_ready(&tscm->domain, READY_TIMEOUT_MS)) {

			err = -ETIMEDOUT;

sound/i2c/cs8427.c

+5 −2
Original line number Diff line number Diff line
@@ -561,10 +561,13 @@ int snd_cs8427_iec958_active(struct snd_i2c_device *cs8427, int active) 
	if (snd_BUG_ON(!cs8427))

		return -ENXIO;

	chip = cs8427->private_data;

	if (active)

	if (active) {

		memcpy(chip->playback.pcm_status,

		       chip->playback.def_status, 24);

		chip->playback.pcm_ctl->vd[0].access &= ~SNDRV_CTL_ELEM_ACCESS_INACTIVE;

	} else {

		chip->playback.pcm_ctl->vd[0].access |= SNDRV_CTL_ELEM_ACCESS_INACTIVE;

	}

	snd_ctl_notify(cs8427->bus->card,

		       SNDRV_CTL_EVENT_MASK_VALUE | SNDRV_CTL_EVENT_MASK_INFO,

		       &chip->playback.pcm_ctl->id);

sound/pci/emu10k1/emupcm.c

+9 −5
Original line number Diff line number Diff line
@@ -1236,7 +1236,7 @@ static int snd_emu10k1_capture_mic_close(struct snd_pcm_substream *substream) 
{

	struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);



	emu->capture_interrupt = NULL;

	emu->capture_mic_interrupt = NULL;

	emu->pcm_capture_mic_substream = NULL;

	return 0;

}
@@ -1344,7 +1344,7 @@ static int snd_emu10k1_capture_efx_close(struct snd_pcm_substream *substream) 
{

	struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);



	emu->capture_interrupt = NULL;

	emu->capture_efx_interrupt = NULL;

	emu->pcm_capture_efx_substream = NULL;

	return 0;

}
@@ -1781,16 +1781,20 @@ int snd_emu10k1_pcm_efx(struct snd_emu10k1 *emu, int device) 
	struct snd_kcontrol *kctl;

	int err;



	err = snd_pcm_new(emu->card, "emu10k1 efx", device, 8, 1, &pcm);

	err = snd_pcm_new(emu->card, "emu10k1 efx", device, emu->audigy ? 0 : 8, 1, &pcm);

	if (err < 0)

		return err;



	pcm->private_data = emu;



	if (!emu->audigy)

		snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_emu10k1_fx8010_playback_ops);

	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_emu10k1_capture_efx_ops);



	pcm->info_flags = 0;

	if (emu->audigy)

		strcpy(pcm->name, "Multichannel Capture");

	else

		strcpy(pcm->name, "Multichannel Capture/PT Playback");

	emu->pcm_efx = pcm;

sound/pci/hda/patch_hdmi.c

+1 −1
Original line number Diff line number Diff line
@@ -4604,7 +4604,7 @@ HDA_CODEC_ENTRY(0x80862814, "DG1 HDMI", patch_i915_tgl_hdmi), 
HDA_CODEC_ENTRY(0x80862815, "Alderlake HDMI",	patch_i915_tgl_hdmi),

HDA_CODEC_ENTRY(0x80862816, "Rocketlake HDMI",	patch_i915_tgl_hdmi),

HDA_CODEC_ENTRY(0x80862818, "Raptorlake HDMI",	patch_i915_tgl_hdmi),

HDA_CODEC_ENTRY(0x80862819, "DG2 HDMI",	patch_i915_adlp_hdmi),

HDA_CODEC_ENTRY(0x80862819, "DG2 HDMI",	patch_i915_tgl_hdmi),

HDA_CODEC_ENTRY(0x8086281a, "Jasperlake HDMI",	patch_i915_icl_hdmi),

HDA_CODEC_ENTRY(0x8086281b, "Elkhartlake HDMI",	patch_i915_icl_hdmi),

HDA_CODEC_ENTRY(0x8086281c, "Alderlake-P HDMI", patch_i915_adlp_hdmi),