Commit 68d187ec authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "A collection of pending fixes since a couple of weeks ago, which
  became slightly bigger than usual due to my vacation.

  Most of changes are about ASoC device-specific fixes while USB- and
  HD-audio received quirks as usual. All fixes, including two ASoC core
  changes, are reasonably small and safe to apply"

* tag 'sound-6.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (23 commits)
  ALSA: usb-audio: Fix microphone sound on Nexigo webcam.
  ALSA: hda/realtek: Change model for Intel RVP board
  ALSA: usb-audio: Fix microphone sound on Opencomm2 Headset
  ALSA: hda: cs35l41: Cleanup and fix double free in firmware request
  ASoC: dt-bindings: fsl,micfil: Document #sound-dai-cells
  ASoC: amd: yc: Fix non-functional mic on Lenovo 82YM
  ASoC: tlv320adc3xxx: BUG: Correct micbias setting
  ASoC: rt5682: Fix regulator enable/disable sequence
  ASoC: hdmi-codec: Fix broken channel map reporting
  ASoC: core: Do not call link_exit() on uninitialized rtd objects
  ASoC: core: Print component name when printing log
  ASoC: SOF: amd: fix for firmware reload failure after playback
  ASoC: fsl-asoc-card: use integer type for fll_id and pll_id
  ASoC: fsl_sai: Don't disable bitclock for i.MX8MP
  dt-bindings: ASoC: rockchip: Add compatible for RK3128 spdif
  ASoC: soc-generic-dmaengine-pcm: Fix function name in comment
  ALSA: hda/realtek - ALC287 merge RTK codec with CS CS35L41 AMP
  ASoC: simple-card: fixup asoc_simple_probe() error handling
  ASoC: simple-card-utils: fixup simple_util_startup() error handling
  ASoC: Intel: sof_sdw: add support for SKU 0B14
  ...
parents 94f6f055 4a63e68a

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

+3 −0
Original line number Diff line number Diff line
@@ -56,6 +56,9 @@ properties: 
      - const: clkext3

    minItems: 2



  "#sound-dai-cells":

    const: 0



required:

  - compatible

  - reg

Documentation/devicetree/bindings/sound/rockchip-spdif.yaml

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ properties: 
      - const: rockchip,rk3568-spdif

      - items:

          - enum:

              - rockchip,rk3128-spdif

              - rockchip,rk3188-spdif

              - rockchip,rk3288-spdif

              - rockchip,rk3308-spdif

include/sound/soc.h

+2 −0
Original line number Diff line number Diff line
@@ -1126,6 +1126,8 @@ struct snd_soc_pcm_runtime { 
	unsigned int pop_wait:1;

	unsigned int fe_compr:1; /* for Dynamic PCM */



	bool initialized;



	int num_components;

	struct snd_soc_component *components[]; /* CPU/Codec/Platform */

};

sound/pci/hda/cs35l41_hda.c

+79 −36
Original line number Diff line number Diff line
@@ -185,10 +185,14 @@ static int cs35l41_request_firmware_files_spkid(struct cs35l41_hda *cs35l41, 
					    cs35l41->speaker_id, "wmfw");

	if (!ret) {

		/* try cirrus/part-dspN-fwtype-sub<-spkidN><-ampname>.bin */

		return cs35l41_request_firmware_file(cs35l41, coeff_firmware, coeff_filename,

		ret = cs35l41_request_firmware_file(cs35l41, coeff_firmware, coeff_filename,

						    CS35L41_FIRMWARE_ROOT,

						    cs35l41->acpi_subsystem_id, cs35l41->amp_name,

						    cs35l41->speaker_id, "bin");

		if (ret)

			goto coeff_err;



		return 0;

	}



	/* try cirrus/part-dspN-fwtype-sub<-ampname>.wmfw */
@@ -197,10 +201,14 @@ static int cs35l41_request_firmware_files_spkid(struct cs35l41_hda *cs35l41, 
					    cs35l41->amp_name, -1, "wmfw");

	if (!ret) {

		/* try cirrus/part-dspN-fwtype-sub<-spkidN><-ampname>.bin */

		return cs35l41_request_firmware_file(cs35l41, coeff_firmware, coeff_filename,

		ret = cs35l41_request_firmware_file(cs35l41, coeff_firmware, coeff_filename,

						    CS35L41_FIRMWARE_ROOT,

						    cs35l41->acpi_subsystem_id, cs35l41->amp_name,

						    cs35l41->speaker_id, "bin");

		if (ret)

			goto coeff_err;



		return 0;

	}



	/* try cirrus/part-dspN-fwtype-sub<-spkidN>.wmfw */
@@ -215,10 +223,14 @@ static int cs35l41_request_firmware_files_spkid(struct cs35l41_hda *cs35l41, 
						    cs35l41->amp_name, cs35l41->speaker_id, "bin");

		if (ret)

			/* try cirrus/part-dspN-fwtype-sub<-spkidN>.bin */

			return cs35l41_request_firmware_file(cs35l41, coeff_firmware,

			ret = cs35l41_request_firmware_file(cs35l41, coeff_firmware,

							    coeff_filename, CS35L41_FIRMWARE_ROOT,

							    cs35l41->acpi_subsystem_id, NULL,

							    cs35l41->speaker_id, "bin");

		if (ret)

			goto coeff_err;



		return 0;

	}



	/* try cirrus/part-dspN-fwtype-sub.wmfw */
@@ -233,12 +245,50 @@ static int cs35l41_request_firmware_files_spkid(struct cs35l41_hda *cs35l41, 
						    cs35l41->speaker_id, "bin");

		if (ret)

			/* try cirrus/part-dspN-fwtype-sub<-spkidN>.bin */

			return cs35l41_request_firmware_file(cs35l41, coeff_firmware,

			ret = cs35l41_request_firmware_file(cs35l41, coeff_firmware,

							    coeff_filename, CS35L41_FIRMWARE_ROOT,

							    cs35l41->acpi_subsystem_id, NULL,

							    cs35l41->speaker_id, "bin");

		if (ret)

			goto coeff_err;

	}



	return ret;

coeff_err:

	release_firmware(*wmfw_firmware);

	kfree(*wmfw_filename);

	return ret;

}



static int cs35l41_fallback_firmware_file(struct cs35l41_hda *cs35l41,

					  const struct firmware **wmfw_firmware,

					  char **wmfw_filename,

					  const struct firmware **coeff_firmware,

					  char **coeff_filename)

{

	int ret;



	/* Handle fallback */

	dev_warn(cs35l41->dev, "Falling back to default firmware.\n");



	/* fallback try cirrus/part-dspN-fwtype.wmfw */

	ret = cs35l41_request_firmware_file(cs35l41, wmfw_firmware, wmfw_filename,

					    CS35L41_FIRMWARE_ROOT, NULL, NULL, -1, "wmfw");

	if (ret)

		goto err;



	/* fallback try cirrus/part-dspN-fwtype.bin */

	ret = cs35l41_request_firmware_file(cs35l41, coeff_firmware, coeff_filename,

					    CS35L41_FIRMWARE_ROOT, NULL, NULL, -1, "bin");

	if (ret) {

		release_firmware(*wmfw_firmware);

		kfree(*wmfw_filename);

		goto err;

	}

	return 0;



err:

	dev_warn(cs35l41->dev, "Unable to find firmware and tuning\n");

	return ret;

}
@@ -254,7 +304,6 @@ static int cs35l41_request_firmware_files(struct cs35l41_hda *cs35l41, 
		ret = cs35l41_request_firmware_files_spkid(cs35l41, wmfw_firmware, wmfw_filename,

							   coeff_firmware, coeff_filename);

		goto out;



	}



	/* try cirrus/part-dspN-fwtype-sub<-ampname>.wmfw */
@@ -267,6 +316,9 @@ static int cs35l41_request_firmware_files(struct cs35l41_hda *cs35l41, 
						    CS35L41_FIRMWARE_ROOT,

						    cs35l41->acpi_subsystem_id, cs35l41->amp_name,

						    -1, "bin");

		if (ret)

			goto coeff_err;



		goto out;

	}
@@ -286,32 +338,23 @@ static int cs35l41_request_firmware_files(struct cs35l41_hda *cs35l41, 
							    CS35L41_FIRMWARE_ROOT,

							    cs35l41->acpi_subsystem_id, NULL, -1,

							    "bin");

		if (ret)

			goto coeff_err;

	}



out:

	if (!ret)

		return 0;



	/* Handle fallback */

	dev_warn(cs35l41->dev, "Falling back to default firmware.\n");



	release_firmware(*wmfw_firmware);

	kfree(*wmfw_filename);

	if (ret)

		/* if all attempts at finding firmware fail, try fallback */

		goto fallback;



	/* fallback try cirrus/part-dspN-fwtype.wmfw */

	ret = cs35l41_request_firmware_file(cs35l41, wmfw_firmware, wmfw_filename,

					    CS35L41_FIRMWARE_ROOT, NULL, NULL, -1, "wmfw");

	if (!ret)

		/* fallback try cirrus/part-dspN-fwtype.bin */

		ret = cs35l41_request_firmware_file(cs35l41, coeff_firmware, coeff_filename,

						    CS35L41_FIRMWARE_ROOT, NULL, NULL, -1, "bin");

	return 0;



	if (ret) {

coeff_err:

	release_firmware(*wmfw_firmware);

	kfree(*wmfw_filename);

		dev_warn(cs35l41->dev, "Unable to find firmware and tuning\n");

	}

	return ret;

fallback:

	return cs35l41_fallback_firmware_file(cs35l41, wmfw_firmware, wmfw_filename,

					      coeff_firmware, coeff_filename);

}



#if IS_ENABLED(CONFIG_EFI)

sound/pci/hda/patch_realtek.c

+17 −10
Original line number Diff line number Diff line
@@ -7343,6 +7343,7 @@ enum { 
	ALC245_FIXUP_HP_MUTE_LED_COEFBIT,

	ALC245_FIXUP_HP_X360_MUTE_LEDS,

	ALC287_FIXUP_THINKPAD_I2S_SPK,

	ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD,

};



/* A special fixup for Lenovo C940 and Yoga Duet 7;
@@ -9441,6 +9442,12 @@ static const struct hda_fixup alc269_fixups[] = { 
		.type = HDA_FIXUP_FUNC,

		.v.func = alc287_fixup_bind_dacs,

	},

	[ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = alc287_fixup_bind_dacs,

		.chained = true,

		.chain_id = ALC287_FIXUP_CS35L41_I2C_2_THINKPAD_ACPI,

	},

};



static const struct snd_pci_quirk alc269_fixup_tbl[] = {
@@ -9854,7 +9861,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x10ec, 0x124c, "Intel Reference board", ALC295_FIXUP_CHROME_BOOK),

	SND_PCI_QUIRK(0x10ec, 0x1252, "Intel Reference board", ALC295_FIXUP_CHROME_BOOK),

	SND_PCI_QUIRK(0x10ec, 0x1254, "Intel Reference board", ALC295_FIXUP_CHROME_BOOK),

	SND_PCI_QUIRK(0x10ec, 0x12cc, "Intel Reference board", ALC225_FIXUP_HEADSET_JACK),

	SND_PCI_QUIRK(0x10ec, 0x12cc, "Intel Reference board", ALC295_FIXUP_CHROME_BOOK),

	SND_PCI_QUIRK(0x10f7, 0x8338, "Panasonic CF-SZ6", ALC269_FIXUP_HEADSET_MODE),

	SND_PCI_QUIRK(0x144d, 0xc109, "Samsung Ativ book 9 (NP900X3G)", ALC269_FIXUP_INV_DMIC),

	SND_PCI_QUIRK(0x144d, 0xc169, "Samsung Notebook 9 Pen (NP930SBE-K01US)", ALC298_FIXUP_SAMSUNG_AMP),
@@ -9988,14 +9995,14 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x17aa, 0x22be, "Thinkpad X1 Carbon 8th", ALC285_FIXUP_THINKPAD_HEADSET_JACK),

	SND_PCI_QUIRK(0x17aa, 0x22c1, "Thinkpad P1 Gen 3", ALC285_FIXUP_THINKPAD_NO_BASS_SPK_HEADSET_JACK),

	SND_PCI_QUIRK(0x17aa, 0x22c2, "Thinkpad X1 Extreme Gen 3", ALC285_FIXUP_THINKPAD_NO_BASS_SPK_HEADSET_JACK),

	SND_PCI_QUIRK(0x17aa, 0x22f1, "Thinkpad", ALC287_FIXUP_CS35L41_I2C_2_THINKPAD_ACPI),

	SND_PCI_QUIRK(0x17aa, 0x22f2, "Thinkpad", ALC287_FIXUP_CS35L41_I2C_2_THINKPAD_ACPI),

	SND_PCI_QUIRK(0x17aa, 0x22f3, "Thinkpad", ALC287_FIXUP_CS35L41_I2C_2_THINKPAD_ACPI),

	SND_PCI_QUIRK(0x17aa, 0x2316, "Thinkpad P1 Gen 6", ALC287_FIXUP_CS35L41_I2C_2_THINKPAD_ACPI),

	SND_PCI_QUIRK(0x17aa, 0x2317, "Thinkpad P1 Gen 6", ALC287_FIXUP_CS35L41_I2C_2_THINKPAD_ACPI),

	SND_PCI_QUIRK(0x17aa, 0x2318, "Thinkpad Z13 Gen2", ALC287_FIXUP_CS35L41_I2C_2_THINKPAD_ACPI),

	SND_PCI_QUIRK(0x17aa, 0x2319, "Thinkpad Z16 Gen2", ALC287_FIXUP_CS35L41_I2C_2_THINKPAD_ACPI),

	SND_PCI_QUIRK(0x17aa, 0x231a, "Thinkpad Z16 Gen2", ALC287_FIXUP_CS35L41_I2C_2_THINKPAD_ACPI),

	SND_PCI_QUIRK(0x17aa, 0x22f1, "Thinkpad", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD),

	SND_PCI_QUIRK(0x17aa, 0x22f2, "Thinkpad", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD),

	SND_PCI_QUIRK(0x17aa, 0x22f3, "Thinkpad", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD),

	SND_PCI_QUIRK(0x17aa, 0x2316, "Thinkpad P1 Gen 6", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD),

	SND_PCI_QUIRK(0x17aa, 0x2317, "Thinkpad P1 Gen 6", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD),

	SND_PCI_QUIRK(0x17aa, 0x2318, "Thinkpad Z13 Gen2", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD),

	SND_PCI_QUIRK(0x17aa, 0x2319, "Thinkpad Z16 Gen2", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD),

	SND_PCI_QUIRK(0x17aa, 0x231a, "Thinkpad Z16 Gen2", ALC287_FIXUP_MG_RTKC_CSAMP_CS35L41_I2C_THINKPAD),

	SND_PCI_QUIRK(0x17aa, 0x30bb, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY),

	SND_PCI_QUIRK(0x17aa, 0x30e2, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY),

	SND_PCI_QUIRK(0x17aa, 0x310c, "ThinkCentre Station", ALC294_FIXUP_LENOVO_MIC_LOCATION),
@@ -10091,7 +10098,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x8086, 0x2074, "Intel NUC 8", ALC233_FIXUP_INTEL_NUC8_DMIC),

	SND_PCI_QUIRK(0x8086, 0x2080, "Intel NUC 8 Rugged", ALC256_FIXUP_INTEL_NUC8_RUGGED),

	SND_PCI_QUIRK(0x8086, 0x2081, "Intel NUC 10", ALC256_FIXUP_INTEL_NUC10),

	SND_PCI_QUIRK(0x8086, 0x3038, "Intel NUC 13", ALC225_FIXUP_HEADSET_JACK),

	SND_PCI_QUIRK(0x8086, 0x3038, "Intel NUC 13", ALC295_FIXUP_CHROME_BOOK),

	SND_PCI_QUIRK(0xf111, 0x0001, "Framework Laptop", ALC295_FIXUP_FRAMEWORK_LAPTOP_MIC_NO_PRESENCE),



#if 0