Commit 996a18eb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "Quite a few small fixes, hopefully the last batch for 5.16.

  Most of them are device-specific quirks and/or fixes, and nothing
  looks scary for the late stage"

* tag 'sound-5.16-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda/realtek: Fix quirk for Clevo NJ51CU
  ALSA: rawmidi - fix the uninitalized user_pversion
  ALSA: hda: intel-sdw-acpi: go through HDAS ACPI at max depth of 2
  ALSA: hda: intel-sdw-acpi: harden detection of controller
  ALSA: hda/hdmi: Disable silent stream on GLK
  ALSA: hda/realtek: fix mute/micmute LEDs for a HP ProBook
  ASoC: meson: aiu: Move AIU_I2S_MISC hold setting to aiu-fifo-i2s
  ASoC: meson: aiu: fifo: Add missing dma_coerce_mask_and_coherent()
  ASoC: tas2770: Fix setting of high sample rates
  ASoC: rt5682: fix the wrong jack type detected
  ALSA: hda/realtek: Add new alc285-hp-amp-init model
  ALSA: hda/realtek: Amp init fixup for HP ZBook 15 G6
  ASoC: tegra: Restore headphones jack name on Nyan Big
  ASoC: tegra: Add DAPM switches for headphones and mic jack
  ALSA: jack: Check the return value of kstrdup()
  ALSA: drivers: opl3: Fix incorrect use of vp->state
  ASoC: SOF: Intel: pci-tgl: add new ADL-P variant
  ASoC: SOF: Intel: pci-tgl: add ADL-N support
parents 3bf6f013 edca7cc4

Documentation/sound/hd-audio/models.rst

+2 −0
Original line number Diff line number Diff line
@@ -326,6 +326,8 @@ usi-headset 
    Headset support on USI machines

dual-codecs

    Lenovo laptops with dual codecs

alc285-hp-amp-init

    HP laptops which require speaker amplifier initialization (ALC285)



ALC680

======

sound/core/jack.c

+4 −0
Original line number Diff line number Diff line
@@ -509,6 +509,10 @@ int snd_jack_new(struct snd_card *card, const char *id, int type, 
		return -ENOMEM;



	jack->id = kstrdup(id, GFP_KERNEL);

	if (jack->id == NULL) {

		kfree(jack);

		return -ENOMEM;

	}



	/* don't creat input device for phantom jack */

	if (!phantom_jack) {

sound/core/rawmidi.c

+1 −0
Original line number Diff line number Diff line
@@ -447,6 +447,7 @@ static int snd_rawmidi_open(struct inode *inode, struct file *file) 
		err = -ENOMEM;

		goto __error;

	}

	rawmidi_file->user_pversion = 0;

	init_waitqueue_entry(&wait, current);

	add_wait_queue(&rmidi->open_wait, &wait);

	while (1) {

sound/drivers/opl3/opl3_midi.c

+1 −1
Original line number Diff line number Diff line
@@ -397,7 +397,7 @@ void snd_opl3_note_on(void *p, int note, int vel, struct snd_midi_channel *chan) 
	}

	if (instr_4op) {

		vp2 = &opl3->voices[voice + 3];

		if (vp->state > 0) {

		if (vp2->state > 0) {

			opl3_reg = reg_side | (OPL3_REG_KEYON_BLOCK +

					       voice_offset + 3);

			reg_val = vp->keyon_reg & ~OPL3_KEYON_BIT;

sound/hda/intel-sdw-acpi.c

+10 −3
Original line number Diff line number Diff line
@@ -132,8 +132,6 @@ static acpi_status sdw_intel_acpi_cb(acpi_handle handle, u32 level, 
		return AE_NOT_FOUND;

	}



	info->handle = handle;



	/*

	 * On some Intel platforms, multiple children of the HDAS

	 * device can be found, but only one of them is the SoundWire
@@ -144,6 +142,9 @@ static acpi_status sdw_intel_acpi_cb(acpi_handle handle, u32 level, 
	if (FIELD_GET(GENMASK(31, 28), adr) != SDW_LINK_TYPE)

		return AE_OK; /* keep going */



	/* found the correct SoundWire controller */

	info->handle = handle;



	/* device found, stop namespace walk */

	return AE_CTRL_TERMINATE;

}
@@ -164,8 +165,14 @@ int sdw_intel_acpi_scan(acpi_handle *parent_handle, 
	acpi_status status;



	info->handle = NULL;

	/*

	 * In the HDAS ACPI scope, 'SNDW' may be either the child of

	 * 'HDAS' or the grandchild of 'HDAS'. So let's go through

	 * the ACPI from 'HDAS' at max depth of 2 to find the 'SNDW'

	 * device.

	 */

	status = acpi_walk_namespace(ACPI_TYPE_DEVICE,

				     parent_handle, 1,

				     parent_handle, 2,

				     sdw_intel_acpi_cb,

				     NULL, info, NULL);

	if (ACPI_FAILURE(status) || info->handle == NULL)