Commit 041c9f71 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sound-fix-6.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull sound fixes from Takashi Iwai:
 "A collection of small fixes for 6.10-rc1. Most of changes are various
  device-specific fixes and quirks, while there are a few small changes
  in ALSA core timer and module / built-in fixes"

* tag 'sound-fix-6.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda/realtek: fix mute/micmute LEDs don't work for ProBook 440/460 G11.
  ALSA: core: Enable proc module when CONFIG_MODULES=y
  ALSA: core: Fix NULL module pointer assignment at card init
  ALSA: hda/realtek: Enable headset mic of JP-IK LEAP W502 with ALC897
  ASoC: dt-bindings: stm32: Ensure compatible pattern matches whole string
  ASoC: tas2781: Fix wrong loading calibrated data sequence
  ASoC: tas2552: Add TX path for capturing AUDIO-OUT data
  ALSA: usb-audio: Fix for sampling rates support for Mbox3
  Documentation: sound: Fix trailing whitespaces
  ALSA: timer: Set lower bound of start tick time
  ASoC: codecs: ES8326: solve hp and button detect issue
  ASoC: rt5645: mic-in detection threshold modification
  ASoC: Intel: sof_sdw_rt_sdca_jack_common: Use name_prefix for `-sdca` detection
parents e292ead0 d001e978

Documentation/devicetree/bindings/sound/st,stm32-sai.yaml

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ patternProperties: 
    properties:

      compatible:

        description: Compatible for SAI sub-block A or B.

        pattern: "st,stm32-sai-sub-[ab]"

        pattern: "^st,stm32-sai-sub-[ab]$"



      "#sound-dai-cells":

        const: 0

include/sound/tas2781-dsp.h

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

// ALSA SoC Texas Instruments TAS2781 Audio Smart Amplifier

//

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

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

// https://www.ti.com

//

// The TAS2781 driver implements a flexible and configurable
@@ -13,8 +13,8 @@ 
// Author: Kevin Lu <kevin-lu@ti.com>

//



#ifndef __TASDEVICE_DSP_H__

#define __TASDEVICE_DSP_H__

#ifndef __TAS2781_DSP_H__

#define __TAS2781_DSP_H__



#define MAIN_ALL_DEVICES			0x0d

#define MAIN_DEVICE_A				0x01
@@ -180,7 +180,6 @@ void tasdevice_calbin_remove(void *context); 
int tasdevice_select_tuningprm_cfg(void *context, int prm,

	int cfg_no, int rca_conf_no);

int tasdevice_prmg_load(void *context, int prm_no);

int tasdevice_prmg_calibdata_load(void *context, int prm_no);

void tasdevice_tuning_switch(void *context, int state);

int tas2781_load_calibration(void *context, char *file_name,

	unsigned short i);

sound/core/init.c

+5 −7
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ MODULE_PARM_DESC(slots, "Module names assigned to the slots."); 
static int module_slot_match(struct module *module, int idx)

{

	int match = 1;

#ifdef MODULE

#ifdef CONFIG_MODULES

	const char *s1, *s2;



	if (!module || !*module->name || !slots[idx])
@@ -77,7 +77,7 @@ static int module_slot_match(struct module *module, int idx) 
		if (!c1)

			break;

	}

#endif /* MODULE */

#endif /* CONFIG_MODULES */

	return match;

}
@@ -311,10 +311,8 @@ static int snd_card_init(struct snd_card *card, struct device *parent, 
	}

	card->dev = parent;

	card->number = idx;

#ifdef MODULE

	WARN_ON(!module);

	WARN_ON(IS_MODULE(CONFIG_SND) && !module);

	card->module = module;

#endif

	INIT_LIST_HEAD(&card->devices);

	init_rwsem(&card->controls_rwsem);

	rwlock_init(&card->ctl_files_rwlock);
@@ -969,7 +967,7 @@ void snd_card_info_read_oss(struct snd_info_buffer *buffer) 


#endif



#ifdef MODULE

#ifdef CONFIG_MODULES

static void snd_card_module_info_read(struct snd_info_entry *entry,

				      struct snd_info_buffer *buffer)

{
@@ -997,7 +995,7 @@ int __init snd_card_info_init(void) 
	if (snd_info_register(entry) < 0)

		return -ENOMEM; /* freed in error path */



#ifdef MODULE

#ifdef CONFIG_MODULES

	entry = snd_info_create_module_entry(THIS_MODULE, "modules", NULL);

	if (!entry)

		return -ENOMEM;

sound/core/timer.c

+8 −0
Original line number Diff line number Diff line
@@ -544,6 +544,14 @@ static int snd_timer_start1(struct snd_timer_instance *timeri, 
			     SNDRV_TIMER_IFLG_START))

		return -EBUSY;



	/* check the actual time for the start tick;

	 * bail out as error if it's way too low (< 100us)

	 */

	if (start) {

		if ((u64)snd_timer_hw_resolution(timer) * ticks < 100000)

			return -EINVAL;

	}



	if (start)

		timeri->ticks = timeri->cticks = ticks;

	else if (!timeri->cticks)

sound/pci/hda/patch_realtek.c

+12 −0
Original line number Diff line number Diff line
@@ -10194,8 +10194,11 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x103c, 0x8c70, "HP EliteBook 835 G11", ALC287_FIXUP_CS35L41_I2C_2_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8c71, "HP EliteBook 845 G11", ALC287_FIXUP_CS35L41_I2C_2_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8c72, "HP EliteBook 865 G11", ALC287_FIXUP_CS35L41_I2C_2_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8c89, "HP ProBook 460 G11", ALC236_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8c8a, "HP EliteBook 630", ALC236_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8c8c, "HP EliteBook 660", ALC236_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8c8d, "HP ProBook 440 G11", ALC236_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8c8e, "HP ProBook 460 G11", ALC236_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8c90, "HP EliteBook 640", ALC236_FIXUP_HP_GPIO_LED),

	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),
@@ -12028,6 +12031,7 @@ enum { 
	ALC897_FIXUP_LENOVO_HEADSET_MODE,

	ALC897_FIXUP_HEADSET_MIC_PIN2,

	ALC897_FIXUP_UNIS_H3C_X500S,

	ALC897_FIXUP_HEADSET_MIC_PIN3,

};



static const struct hda_fixup alc662_fixups[] = {
@@ -12474,10 +12478,18 @@ static const struct hda_fixup alc662_fixups[] = { 
			{}

		},

	},

	[ALC897_FIXUP_HEADSET_MIC_PIN3] = {

		.type = HDA_FIXUP_PINS,

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

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

			{ }

		},

	},

};



static const struct snd_pci_quirk alc662_fixup_tbl[] = {

	SND_PCI_QUIRK(0x1019, 0x9087, "ECS", ALC662_FIXUP_ASUS_MODE2),

	SND_PCI_QUIRK(0x1019, 0x9859, "JP-IK LEAP W502", ALC897_FIXUP_HEADSET_MIC_PIN3),

	SND_PCI_QUIRK(0x1025, 0x022f, "Acer Aspire One", ALC662_FIXUP_INV_DMIC),

	SND_PCI_QUIRK(0x1025, 0x0241, "Packard Bell DOTS", ALC662_FIXUP_INV_DMIC),

	SND_PCI_QUIRK(0x1025, 0x0308, "Acer Aspire 8942G", ALC662_FIXUP_ASPIRE),