Commit 299f489f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "A collection of small fixes. All changes are device-specific at this
  time:

   - Fixes for Cirrus codecs with SoundWire, including firmware name
     updates

   - Fix for i.MX8 SoC DSP

   - Usual HD-audio, USB-audio, and ASoC AMD quirks

   - Fixes for legendary SoundBlaster AWE32 ISA device (a real one, we
     still got a bug report after 25 years)

   - Minor build fixes"

* tag 'sound-6.16-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (24 commits)
  ALSA: hda/realtek: Enable headset Mic on Positivo P15X
  ASoC: Intel: sof-function-topology-lib: Print out the unsupported dmic count
  ASoC: doc: cs35l56: Add CS35L63 to the list of supported devices
  ASoC: SOF: imx8: add core shutdown operation for imx8/imx8x
  ALSA: hda/realtek: Add quirk for Asus GA605K
  ALSA: hda/realtek: enable headset mic on Latitude 5420 Rugged
  ASoC: amd: yc: update quirk data for HP Victus
  ASoC: apple: mca: Drop default ARCH_APPLE in Kconfig
  ALSA: usb-audio: Rename ALSA kcontrol PCM and PCM1 for the KTMicro sound card
  ASoC: amd: yc: Add quirk for MSI Bravo 17 D7VF internal mic
  ASoC: doc: cs35l56: Update to add new SoundWire firmware filename suffix
  ASoC: cs35l56: Use SoundWire address as alternate firmware suffix on L56 B0
  ASoC: cs35l56: Use SoundWire address as firmware name suffix for new silicon
  ASoC: sdw_utils: Fix potential NULL pointer deref in is_sdca_endpoint_present()
  ALSA: sb: Force to disable DMAs once when DMA mode is changed
  ALSA: sb: Don't allow changing the DMA mode during operations
  ALSA: hda/realtek: Add quirk for Asus GU605C
  ALSA: hda/realtek: Fix built-in mic on ASUS VivoBook X513EA
  ALSA: hda/realtek - Add mute LED support for HP Victus 16-s1xxx and HP Victus 15-fa1xxx
  ALSA: ctxfi: Replace deprecated strcpy() with strscpy()
  ...
parents d41fef1c 33bdee12

Documentation/sound/codecs/cs35l56.rst

+19 −5
Original line number Diff line number Diff line 
.. SPDX-License-Identifier: GPL-2.0-only



=====================================================================

Audio drivers for Cirrus Logic CS35L54/56/57 Boosted Smart Amplifiers

=====================================================================

========================================================================

Audio drivers for Cirrus Logic CS35L54/56/57/63 Boosted Smart Amplifiers

========================================================================

:Copyright: 2025 Cirrus Logic, Inc. and

                 Cirrus Logic International Semiconductor Ltd.
@@ -13,11 +13,11 @@ Summary 


The high-level summary of this document is:



**If you have a laptop that uses CS35L54/56/57 amplifiers but audio is not

**If you have a laptop that uses CS35L54/56/57/63 amplifiers but audio is not

working, DO NOT ATTEMPT TO USE FIRMWARE AND SETTINGS FROM ANOTHER LAPTOP,

EVEN IF THAT LAPTOP SEEMS SIMILAR.**



The CS35L54/56/57 amplifiers must be correctly configured for the power

The CS35L54/56/57/63 amplifiers must be correctly configured for the power

supply voltage, speaker impedance, maximum speaker voltage/current, and

other external hardware connections.
@@ -34,6 +34,7 @@ The cs35l56 drivers support: 
* CS35L54

* CS35L56

* CS35L57

* CS35L63



There are two drivers in the kernel
@@ -104,6 +105,13 @@ In this example the SSID is 10280c63. 


The format of the firmware file names is:



SoundWire (except CS35L56 Rev B0):

    cs35lxx-b0-dsp1-misc-SSID[-spkidX]-l?u?



SoundWire CS35L56 Rev B0:

    cs35lxx-b0-dsp1-misc-SSID[-spkidX]-ampN



Non-SoundWire (HDA and I2S):

    cs35lxx-b0-dsp1-misc-SSID[-spkidX]-ampN



Where:
@@ -111,12 +119,18 @@ Where: 
  * cs35lxx-b0 is the amplifier model and silicon revision. This information

    is logged by the driver during initialization.

  * SSID is the 8-digit hexadecimal SSID value.

  * l?u? is the physical address on the SoundWire bus of the amp this

    file applies to.

  * ampN is the amplifier number (for example amp1). This is the same as

    the prefix on the ALSA control names except that it is always lower-case

    in the file name.

  * spkidX is an optional part, used for laptops that have firmware

    configurations for different makes and models of internal speakers.



The CS35L56 Rev B0 continues to use the old filename scheme because a

large number of firmware files have already been published with these

names.



Sound Open Firmware and ALSA topology files

-------------------------------------------

sound/isa/sb/sb16_main.c

+7 −0
Original line number Diff line number Diff line
@@ -703,6 +703,9 @@ static int snd_sb16_dma_control_put(struct snd_kcontrol *kcontrol, struct snd_ct 
	unsigned char nval, oval;

	int change;

	

	if (chip->mode & (SB_MODE_PLAYBACK | SB_MODE_CAPTURE))

		return -EBUSY;



	nval = ucontrol->value.enumerated.item[0];

	if (nval > 2)

		return -EINVAL;
@@ -711,6 +714,10 @@ static int snd_sb16_dma_control_put(struct snd_kcontrol *kcontrol, struct snd_ct 
	change = nval != oval;

	snd_sb16_set_dma_mode(chip, nval);

	spin_unlock_irqrestore(&chip->reg_lock, flags);

	if (change) {

		snd_dma_disable(chip->dma8);

		snd_dma_disable(chip->dma16);

	}

	return change;

}

sound/pci/ctxfi/xfi.c

+2 −2
Original line number Diff line number Diff line
@@ -98,8 +98,8 @@ ct_card_probe(struct pci_dev *pci, const struct pci_device_id *pci_id) 
	if (err < 0)

		goto error;



	strcpy(card->driver, "SB-XFi");

	strcpy(card->shortname, "Creative X-Fi");

	strscpy(card->driver, "SB-XFi");

	strscpy(card->shortname, "Creative X-Fi");

	snprintf(card->longname, sizeof(card->longname), "%s %s %s",

		 card->shortname, atc->chip_name, atc->model_name);

sound/pci/hda/hda_intel.c

+2 −0
Original line number Diff line number Diff line
@@ -2283,6 +2283,8 @@ static const struct snd_pci_quirk power_save_denylist[] = { 
	SND_PCI_QUIRK(0x1734, 0x1232, "KONTRON SinglePC", 0),

	/* Dell ALC3271 */

	SND_PCI_QUIRK(0x1028, 0x0962, "Dell ALC3271", 0),

	/* https://bugzilla.kernel.org/show_bug.cgi?id=220210 */

	SND_PCI_QUIRK(0x17aa, 0x5079, "Lenovo Thinkpad E15", 0),

	{}

};

sound/pci/hda/patch_realtek.c

+30 −0
Original line number Diff line number Diff line
@@ -8030,6 +8030,9 @@ enum { 
	ALC294_FIXUP_ASUS_CS35L41_SPI_2,

	ALC274_FIXUP_HP_AIO_BIND_DACS,

	ALC287_FIXUP_PREDATOR_SPK_CS35L41_I2C_2,

	ALC285_FIXUP_ASUS_GA605K_HEADSET_MIC,

	ALC285_FIXUP_ASUS_GA605K_I2C_SPEAKER2_TO_DAC1,

	ALC269_FIXUP_POSITIVO_P15X_HEADSET_MIC,

};



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

		.v.func = alc274_fixup_hp_aio_bind_dacs,

	},

	[ALC285_FIXUP_ASUS_GA605K_HEADSET_MIC] = {

		.type = HDA_FIXUP_PINS,

		.v.pins = (const struct hda_pintbl[]) {

			{ 0x19, 0x03a11050 },

			{ 0x1b, 0x03a11c30 },

			{ }

		},

		.chained = true,

		.chain_id = ALC285_FIXUP_ASUS_GA605K_I2C_SPEAKER2_TO_DAC1

	},

	[ALC285_FIXUP_ASUS_GA605K_I2C_SPEAKER2_TO_DAC1] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = alc285_fixup_speaker2_to_dac1,

	},

	[ALC269_FIXUP_POSITIVO_P15X_HEADSET_MIC] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = alc269_fixup_limit_int_mic_boost,

		.chained = true,

		.chain_id = ALC269VC_FIXUP_ACER_MIC_NO_PRESENCE,

	},

};



static const struct hda_quirk alc269_fixup_tbl[] = {
@@ -10509,6 +10532,7 @@ static const struct hda_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1028, 0x0871, "Dell Precision 3630", ALC255_FIXUP_DELL_HEADSET_MIC),

	SND_PCI_QUIRK(0x1028, 0x0872, "Dell Precision 3630", ALC255_FIXUP_DELL_HEADSET_MIC),

	SND_PCI_QUIRK(0x1028, 0x0873, "Dell Precision 3930", ALC255_FIXUP_DUMMY_LINEOUT_VERB),

	SND_PCI_QUIRK(0x1028, 0x0879, "Dell Latitude 5420 Rugged", ALC269_FIXUP_DELL4_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1028, 0x08ad, "Dell WYSE AIO", ALC225_FIXUP_DELL_WYSE_AIO_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1028, 0x08ae, "Dell WYSE NB", ALC225_FIXUP_DELL1_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1028, 0x0935, "Dell", ALC274_FIXUP_DELL_AIO_LINEOUT_VERB),
@@ -10787,6 +10811,7 @@ static const struct hda_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x103c, 0x8b97, "HP", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),

	SND_PCI_QUIRK(0x103c, 0x8bb3, "HP Slim OMEN", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x103c, 0x8bb4, "HP Slim OMEN", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x103c, 0x8bc8, "HP Victus 15-fa1xxx", ALC245_FIXUP_HP_MUTE_LED_COEFBIT),

	SND_PCI_QUIRK(0x103c, 0x8bcd, "HP Omen 16-xd0xxx", ALC245_FIXUP_HP_MUTE_LED_V1_COEFBIT),

	SND_PCI_QUIRK(0x103c, 0x8bdd, "HP Envy 17", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x103c, 0x8bde, "HP Envy 17", ALC287_FIXUP_CS35L41_I2C_2),
@@ -10840,6 +10865,7 @@ static const struct hda_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x103c, 0x8c91, "HP EliteBook 660", ALC236_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8c96, "HP", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),

	SND_PCI_QUIRK(0x103c, 0x8c97, "HP ZBook", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),

	SND_PCI_QUIRK(0x103c, 0x8c9c, "HP Victus 16-s1xxx (MB 8C9C)", ALC245_FIXUP_HP_MUTE_LED_COEFBIT),

	SND_PCI_QUIRK(0x103c, 0x8ca1, "HP ZBook Power", ALC236_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8ca2, "HP ZBook Power", ALC236_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8ca4, "HP ZBook Fury", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),
@@ -10904,6 +10930,8 @@ static const struct hda_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x103c, 0x8e60, "HP Trekker ", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x103c, 0x8e61, "HP Trekker ", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x103c, 0x8e62, "HP Trekker ", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x1043, 0x1032, "ASUS VivoBook X513EA", ALC256_FIXUP_ASUS_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1043, 0x1034, "ASUS GU605C", ALC285_FIXUP_ASUS_GU605_SPI_SPEAKER2_TO_DAC1),

	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, 0x1054, "ASUS G614FH/FM/FP", ALC287_FIXUP_CS35L41_I2C_2),
@@ -10932,6 +10960,7 @@ static const struct hda_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1043, 0x12e0, "ASUS X541SA", ALC256_FIXUP_ASUS_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1043, 0x12f0, "ASUS X541UV", ALC256_FIXUP_ASUS_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1043, 0x1313, "Asus K42JZ", ALC269VB_FIXUP_ASUS_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1043, 0x1314, "ASUS GA605K", ALC285_FIXUP_ASUS_GA605K_HEADSET_MIC),

	SND_PCI_QUIRK(0x1043, 0x13b0, "ASUS Z550SA", ALC256_FIXUP_ASUS_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1043, 0x1427, "Asus Zenbook UX31E", ALC269VB_FIXUP_ASUS_ZENBOOK),

	SND_PCI_QUIRK(0x1043, 0x1433, "ASUS GX650PY/PZ/PV/PU/PYV/PZV/PIV/PVV", ALC285_FIXUP_ASUS_I2C_HEADSET_MIC),
@@ -11384,6 +11413,7 @@ static const struct hda_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x2782, 0x0214, "VAIO VJFE-CL", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),

	SND_PCI_QUIRK(0x2782, 0x0228, "Infinix ZERO BOOK 13", ALC269VB_FIXUP_INFINIX_ZERO_BOOK_13),

	SND_PCI_QUIRK(0x2782, 0x0232, "CHUWI CoreBook XPro", ALC269VB_FIXUP_CHUWI_COREBOOK_XPRO),

	SND_PCI_QUIRK(0x2782, 0x1407, "Positivo P15X", ALC269_FIXUP_POSITIVO_P15X_HEADSET_MIC),

	SND_PCI_QUIRK(0x2782, 0x1701, "Infinix Y4 Max", ALC269VC_FIXUP_INFINIX_Y4_MAX),

	SND_PCI_QUIRK(0x2782, 0x1705, "MEDION E15433", ALC269VC_FIXUP_INFINIX_Y4_MAX),

	SND_PCI_QUIRK(0x2782, 0x1707, "Vaio VJFE-ADL", ALC298_FIXUP_SPK_VOLUME),