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

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

Pull sound fixes from Takashi Iwai:
 "Only small fixes.

   - ASoC Cirrus codec fixes

   - A regression fix for the recent TAS2781 codec refactoring

   - A fix for user-timer error handling

   - Fixes for USB-audio descriptor validators

   - Usual HD-audio and ASoC device-specific quirks"

* tag 'sound-6.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: usb-audio: Use correct sub-type for UAC3 feature unit validation
  ALSA: timer: fix ida_free call while not allocated
  ASoC: cs35l56: Remove SoundWire Clock Divider workaround for CS35L63
  ASoC: cs35l56: Handle new algorithms IDs for CS35L63
  ASoC: cs35l56: Update Firmware Addresses for CS35L63 for production silicon
  ALSA: hda: tas2781: Fix wrong reference of tasdevice_priv
  ALSA: hda/realtek: Audio disappears on HP 15-fc000 after warm boot again
  ALSA: hda/realtek: Fix headset mic on ASUS Zenbook 14
  ASoC: codecs: ES9389: Modify the standby configuration
  ALSA: usb-audio: Fix size validation in convert_chmap_v3()
  ALSA: hda/tas2781: Add name prefix tas2781 for tas2781's dvc_tlv and amp_vol_tlv
  ALSA: hda/realtek: Add support for HP EliteBook x360 830 G6 and EliteBook 830 G6
parents 3cfcd57d 8410fe81

include/sound/cs35l56.h

+3 −2
Original line number Diff line number Diff line
@@ -107,8 +107,8 @@ 
#define CS35L56_DSP1_PMEM_5114				0x3804FE8



#define CS35L63_DSP1_FW_VER				CS35L56_DSP1_FW_VER

#define CS35L63_DSP1_HALO_STATE				0x280396C

#define CS35L63_DSP1_PM_CUR_STATE			0x28042C8

#define CS35L63_DSP1_HALO_STATE				0x2803C04

#define CS35L63_DSP1_PM_CUR_STATE			0x2804518

#define CS35L63_PROTECTION_STATUS			0x340009C

#define CS35L63_TRANSDUCER_ACTUAL_PS			0x34000F4

#define CS35L63_MAIN_RENDER_USER_MUTE			0x3400020
@@ -306,6 +306,7 @@ struct cs35l56_base { 
	struct gpio_desc *reset_gpio;

	struct cs35l56_spi_payload *spi_payload_buf;

	const struct cs35l56_fw_reg *fw_reg;

	const struct cirrus_amp_cal_controls *calibration_controls;

};



static inline bool cs35l56_is_otp_register(unsigned int reg)

include/sound/tas2781-tlv.h

+3 −3
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
//

// ALSA SoC Texas Instruments TAS2781 Audio Smart Amplifier

//

// Copyright (C) 2022 - 2024 Texas Instruments Incorporated

// Copyright (C) 2022 - 2025 Texas Instruments Incorporated

// https://www.ti.com

//

// The TAS2781 driver implements a flexible and configurable
@@ -15,7 +15,7 @@ 
#ifndef __TAS2781_TLV_H__

#define __TAS2781_TLV_H__



static const __maybe_unused DECLARE_TLV_DB_SCALE(dvc_tlv, -10000, 50, 0);

static const __maybe_unused DECLARE_TLV_DB_SCALE(amp_vol_tlv, 1100, 50, 0);

static const __maybe_unused DECLARE_TLV_DB_SCALE(tas2781_dvc_tlv, -10000, 50, 0);

static const __maybe_unused DECLARE_TLV_DB_SCALE(tas2781_amp_tlv, 1100, 50, 0);



#endif

sound/core/timer.c

+2 −2
Original line number Diff line number Diff line
@@ -2139,14 +2139,14 @@ static int snd_utimer_create(struct snd_timer_uinfo *utimer_info, 
		goto err_take_id;

	}



	utimer->id = utimer_id;



	utimer->name = kasprintf(GFP_KERNEL, "snd-utimer%d", utimer_id);

	if (!utimer->name) {

		err = -ENOMEM;

		goto err_get_name;

	}



	utimer->id = utimer_id;



	tid.dev_sclass = SNDRV_TIMER_SCLASS_APPLICATION;

	tid.dev_class = SNDRV_TIMER_CLASS_GLOBAL;

	tid.card = -1;

sound/hda/codecs/realtek/alc269.c

+22 −9
Original line number Diff line number Diff line
@@ -510,6 +510,15 @@ static void alc256_shutup(struct hda_codec *codec) 
		hp_pin = 0x21;



	alc_update_coefex_idx(codec, 0x57, 0x04, 0x0007, 0x1); /* Low power */



	/* 3k pull low control for Headset jack. */

	/* NOTE: call this before clearing the pin, otherwise codec stalls */

	/* If disable 3k pulldown control for alc257, the Mic detection will not work correctly

	 * when booting with headset plugged. So skip setting it for the codec alc257

	 */

	if (spec->en_3kpull_low)

		alc_update_coef_idx(codec, 0x46, 0, 3 << 12);



	hp_pin_sense = snd_hda_jack_detect(codec, hp_pin);



	if (hp_pin_sense) {
@@ -520,14 +529,6 @@ static void alc256_shutup(struct hda_codec *codec) 


		msleep(75);



	/* 3k pull low control for Headset jack. */

	/* NOTE: call this before clearing the pin, otherwise codec stalls */

	/* If disable 3k pulldown control for alc257, the Mic detection will not work correctly

	 * when booting with headset plugged. So skip setting it for the codec alc257

	 */

		if (spec->en_3kpull_low)

			alc_update_coef_idx(codec, 0x46, 0, 3 << 12);



		if (!spec->no_shutup_pins)

			snd_hda_codec_write(codec, hp_pin, 0,

				    AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0);
@@ -3579,6 +3580,7 @@ enum { 
	ALC286_FIXUP_ACER_AIO_MIC_NO_PRESENCE,

	ALC294_FIXUP_ASUS_MIC,

	ALC294_FIXUP_ASUS_HEADSET_MIC,

	ALC294_FIXUP_ASUS_I2C_HEADSET_MIC,

	ALC294_FIXUP_ASUS_SPK,

	ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE,

	ALC285_FIXUP_LENOVO_PC_BEEP_IN_NOISE,
@@ -4889,6 +4891,15 @@ static const struct hda_fixup alc269_fixups[] = { 
		.chained = true,

		.chain_id = ALC269_FIXUP_HEADSET_MIC

	},

	[ALC294_FIXUP_ASUS_I2C_HEADSET_MIC] = {

		.type = HDA_FIXUP_PINS,

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

			{ 0x19, 0x03a19020 }, /* use as headset mic */

			{ }

		},

		.chained = true,

		.chain_id = ALC287_FIXUP_CS35L41_I2C_2

	},

	[ALC294_FIXUP_ASUS_SPK] = {

		.type = HDA_FIXUP_VERBS,

		.v.verbs = (const struct hda_verb[]) {
@@ -6368,6 +6379,8 @@ static const struct hda_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x103c, 0x84e7, "HP Pavilion 15", ALC269_FIXUP_HP_MUTE_LED_MIC3),

	SND_PCI_QUIRK(0x103c, 0x8519, "HP Spectre x360 15-df0xxx", ALC285_FIXUP_HP_SPECTRE_X360),

	SND_PCI_QUIRK(0x103c, 0x8537, "HP ProBook 440 G6", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),

	SND_PCI_QUIRK(0x103c, 0x8548, "HP EliteBook x360 830 G6", ALC285_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x854a, "HP EliteBook 830 G6", ALC285_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x85c6, "HP Pavilion x360 Convertible 14-dy1xxx", ALC295_FIXUP_HP_MUTE_LED_COEFBIT11),

	SND_PCI_QUIRK(0x103c, 0x85de, "HP Envy x360 13-ar0xxx", ALC285_FIXUP_HP_ENVY_X360),

	SND_PCI_QUIRK(0x103c, 0x860f, "HP ZBook 15 G6", ALC285_FIXUP_HP_GPIO_AMP_INIT),
@@ -6728,7 +6741,7 @@ static const struct hda_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1043, 0x1b13, "ASUS U41SV/GA403U", ALC285_FIXUP_ASUS_GA403U_HEADSET_MIC),

	SND_PCI_QUIRK(0x1043, 0x1b93, "ASUS G614JVR/JIR", ALC245_FIXUP_CS35L41_SPI_2),

	SND_PCI_QUIRK(0x1043, 0x1bbd, "ASUS Z550MA", ALC255_FIXUP_ASUS_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1043, 0x1c03, "ASUS UM3406HA", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x1043, 0x1c03, "ASUS UM3406HA", ALC294_FIXUP_ASUS_I2C_HEADSET_MIC),

	SND_PCI_QUIRK(0x1043, 0x1c23, "Asus X55U", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),

	SND_PCI_QUIRK(0x1043, 0x1c33, "ASUS UX5304MA", ALC245_FIXUP_CS35L41_SPI_2),

	SND_PCI_QUIRK(0x1043, 0x1c43, "ASUS UX8406MA", ALC245_FIXUP_CS35L41_SPI_2),

sound/hda/codecs/side-codecs/tas2781_hda_i2c.c

+2 −2
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ static const struct snd_kcontrol_new tas2770_snd_controls[] = { 
static const struct snd_kcontrol_new tas2781_snd_controls[] = {

	ACARD_SINGLE_RANGE_EXT_TLV("Speaker Analog Volume", TAS2781_AMP_LEVEL,

		1, 0, 20, 0, tas2781_amp_getvol,

		tas2781_amp_putvol, amp_vol_tlv),

		tas2781_amp_putvol, tas2781_amp_tlv),

	ACARD_SINGLE_BOOL_EXT("Speaker Force Firmware Load", 0,

		tas2781_force_fwload_get, tas2781_force_fwload_put),

};
@@ -305,7 +305,7 @@ static int tas2563_save_calibration(struct tas2781_hda *h) 
	efi_char16_t efi_name[TAS2563_CAL_VAR_NAME_MAX];

	unsigned long max_size = TAS2563_CAL_DATA_SIZE;

	unsigned char var8[TAS2563_CAL_VAR_NAME_MAX];

	struct tasdevice_priv *p = h->hda_priv;

	struct tasdevice_priv *p = h->priv;

	struct calidata *cd = &p->cali_data;

	struct cali_reg *r = &cd->cali_reg_array;

	unsigned int offset = 0;