Commit 8d084337 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "A collection of small fixes:

   - Potential OOB access fixes in USB-audio driver

   - ASoC kconfig menu fix for improving the generic drivers

   - HD-audio quirks and a fix revert

   - Codec and platform-specific small fixes for ASoC"

* tag 'sound-6.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda/tas2781: Normalize the volume kcontrol name
  ALSA: usb-audio: Validate UAC3 cluster segment descriptors
  ALSA: usb-audio: Validate UAC3 power domain descriptors, too
  Revert "ALSA: hda: Add ASRock X670E Taichi to denylist"
  ALSA: azt3328: Put __maybe_unused for inline functions for gameport
  ASoC: tas2781: Normalize the volume kcontrol name
  ASoC: stm: stm32_i2s: Fix calc_clk_div() error handling in determine_rate()
  ASoC: codecs: Call strscpy() with correct size argument
  ALSA: hda/realtek: Fix headset mic on HONOR BRB-X
  ALSA: hda/realtek: Add Framework Laptop 13 (AMD Ryzen AI 300) to quirks
  ASoC: tas2781: Fix spelling mistake "dismatch" -> "mismatch"
  ASoC: rt1320: fix random cycle mute issue
  ASoC: rt721: fix FU33 Boost Volume control not working
  ASoC: generic: tidyup standardized ASoC menu for generic
  ASoC: codec: sma1307: replace spelling mistake with new error message
  ASoC: codecs: tx-macro: correct tx_macro_component_drv name
  ASoC: fsl_sai: replace regmap_write with regmap_update_bits
parents 7bb7780e c345102d

sound/hda/codecs/realtek/alc269.c

+2 −0
Original line number Diff line number Diff line
@@ -7140,6 +7140,7 @@ static const struct hda_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1d72, 0x1901, "RedmiBook 14", ALC256_FIXUP_ASUS_HEADSET_MIC),

	SND_PCI_QUIRK(0x1d72, 0x1945, "Redmi G", ALC256_FIXUP_ASUS_HEADSET_MIC),

	SND_PCI_QUIRK(0x1d72, 0x1947, "RedmiBook Air", ALC255_FIXUP_XIAOMI_HEADSET_MIC),

	SND_PCI_QUIRK(0x1ee7, 0x2078, "HONOR BRB-X M1010", ALC2XX_FIXUP_HEADSET_MIC),

	SND_PCI_QUIRK(0x1f66, 0x0105, "Ayaneo Portable Game Player", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x2014, 0x800a, "Positivo ARN50", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),

	SND_PCI_QUIRK(0x2782, 0x0214, "VAIO VJFE-CL", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),
@@ -7158,6 +7159,7 @@ static const struct hda_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0xf111, 0x0001, "Framework Laptop", ALC295_FIXUP_FRAMEWORK_LAPTOP_MIC_NO_PRESENCE),

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

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

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

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



#if 0

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

+1 −1
Original line number Diff line number Diff line
@@ -265,7 +265,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 Gain", TAS2781_AMP_LEVEL,

	ACARD_SINGLE_RANGE_EXT_TLV("Speaker Analog Volume", TAS2781_AMP_LEVEL,

		1, 0, 20, 0, tas2781_amp_getvol,

		tas2781_amp_putvol, amp_vol_tlv),

	ACARD_SINGLE_BOOL_EXT("Speaker Force Firmware Load", 0,

sound/hda/controllers/intel.c

+0 −1
Original line number Diff line number Diff line
@@ -2077,7 +2077,6 @@ static const struct pci_device_id driver_denylist[] = { 
	{ PCI_DEVICE_SUB(0x1022, 0x1487, 0x1043, 0x874f) }, /* ASUS ROG Zenith II / Strix */

	{ PCI_DEVICE_SUB(0x1022, 0x1487, 0x1462, 0xcb59) }, /* MSI TRX40 Creator */

	{ PCI_DEVICE_SUB(0x1022, 0x1487, 0x1462, 0xcb60) }, /* MSI TRX40 */

	{ PCI_DEVICE_SUB(0x1022, 0x15e3, 0x1022, 0xd601) }, /* ASRock X670E Taichi */

	{}

};

sound/pci/azt3328.c

+4 −4
Original line number Diff line number Diff line
@@ -412,25 +412,25 @@ snd_azf3328_ctrl_outl(const struct snd_azf3328 *chip, unsigned reg, u32 value) 
	outl(value, chip->ctrl_io + reg);

}



static inline void

static inline void __maybe_unused

snd_azf3328_game_outb(const struct snd_azf3328 *chip, unsigned reg, u8 value)

{

	outb(value, chip->game_io + reg);

}



static inline void

static inline void __maybe_unused

snd_azf3328_game_outw(const struct snd_azf3328 *chip, unsigned reg, u16 value)

{

	outw(value, chip->game_io + reg);

}



static inline u8

static inline u8 __maybe_unused

snd_azf3328_game_inb(const struct snd_azf3328 *chip, unsigned reg)

{

	return inb(chip->game_io + reg);

}



static inline u16

static inline u16 __maybe_unused

snd_azf3328_game_inw(const struct snd_azf3328 *chip, unsigned reg)

{

	return inw(chip->game_io + reg);

sound/soc/Kconfig

+3 −1
Original line number Diff line number Diff line
@@ -111,7 +111,6 @@ source "sound/soc/bcm/Kconfig" 
source "sound/soc/cirrus/Kconfig"

source "sound/soc/dwc/Kconfig"

source "sound/soc/fsl/Kconfig"

source "sound/soc/generic/Kconfig"

source "sound/soc/google/Kconfig"

source "sound/soc/hisilicon/Kconfig"

source "sound/soc/jz4740/Kconfig"
@@ -149,5 +148,8 @@ source "sound/soc/codecs/Kconfig" 


source "sound/soc/sdw_utils/Kconfig"



# generic frame-work

source "sound/soc/generic/Kconfig"



endif	# SND_SOC