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

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

Pull sound fixes from Takashi Iwai:

 - Support for ASoC AMD ACP 7.2 with new IDs

 - ASoC Intel AVS and SOF fixes

 - Yet more kconfig adjustments for HD-audio codecs

 - TAS2781 codec fixes

 - Fixes for longstanding (rather minor) bugs in Intel LPE audio and
   USB-audio drivers

* tag 'sound-fix-6.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda/cirrus: Restrict prompt only for CONFIG_EXPERT
  ALSA: hda/hdmi: Restrict prompt only for CONFIG_EXPERT
  ALSA: hda/realtek: Restrict prompt only for CONFIG_EXPERT
  ALSA: hda/ca0132: Fix missing error handling in ca0132_alt_select_out()
  ASoC: SOF: Intel: hda-sdw-bpt: fix SND_SOF_SOF_HDA_SDW_BPT dependencies
  ALSA: hda/tas2781: Support L"SmartAmpCalibrationData" to save calibrated data
  ALSA: intel_hdmi: Fix off-by-one error in __hdmi_lpe_audio_probe()
  ALSA: hda/realtek: add LG gram 16Z90R-A to alc269 fixup table
  ALSA: usb-audio: Don't use printk_ratelimit for debug prints
  ASoC: Intel: sof_sdw: Add quirk for Alienware Area 51 (2025) 0CCC SKU
  ASoC: tas2781: Fix the wrong step for TLV on tas2781
  ASoC: amd: acp: Add SoundWire SOF machine driver support for acp7.2 platform
  ASoC: amd: acp: Add SoundWire legacy machine driver support for acp7.2 platform
  ASoC: amd: ps: Add SoundWire pci and dma driver support for acp7.2 platform
  ASoC: SOF: amd: Add sof audio support for acp7.2 platform
  ASoC: Intel: avs: Fix uninitialized pointer error in probe()
  ASoC: wm8962: Clear master mode when enter runtime suspend
  ASoC: SOF: amd: acp-loader: Use GFP_KERNEL for DMA allocations in resume context
parents 61d41792 e8e4f3c2

include/sound/tas2781-tlv.h

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
#ifndef __TAS2781_TLV_H__

#define __TAS2781_TLV_H__



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

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);



#endif

sound/hda/codecs/ca0132.c

+4 −1
Original line number Diff line number Diff line
@@ -4802,7 +4802,8 @@ static int ca0132_alt_select_out(struct hda_codec *codec) 
	if (err < 0)

		goto exit;



	if (ca0132_alt_select_out_quirk_set(codec) < 0)

	err = ca0132_alt_select_out_quirk_set(codec);

	if (err < 0)

		goto exit;



	switch (spec->cur_out_type) {
@@ -4892,6 +4893,8 @@ static int ca0132_alt_select_out(struct hda_codec *codec) 
				spec->bass_redirection_val);

	else

		err = ca0132_alt_surround_set_bass_redirection(codec, 0);

	if (err < 0)

		goto exit;



	/* Unmute DSP now that we're done with output selection. */

	err = dspio_set_uint_param(codec, 0x96,

sound/hda/codecs/cirrus/Kconfig

+12 −8
Original line number Diff line number Diff line
@@ -2,27 +2,31 @@ 


menuconfig SND_HDA_CODEC_CIRRUS

	tristate "Cirrus Logic HD-audio codec support"

	help

	  Say Y or M here to include Cirrus Logic HD-audio codec support.



	  This will enable both CS420x and CS421x HD-audio codec drivers

	  as default, but you can enable/disable each codec driver

	  individually, too (only when CONFIG_EXPERT is set).



if SND_HDA_CODEC_CIRRUS



config SND_HDA_CODEC_CS420X

	tristate "Build Cirrus Logic CS420x codec support"

	tristate "Build Cirrus Logic CS420x codec support" if EXPERT

	select SND_HDA_GENERIC

	default y

	help

	  Say Y or M here to include Cirrus Logic CS420x codec support in

	  snd-hda-intel driver

	  Say Y or M here to include Cirrus Logic CS420x codec support



comment "Set to Y if you want auto-loading the codec driver"

	depends on SND_HDA=y && SND_HDA_CODEC_CS420X=m



config SND_HDA_CODEC_CS421X

	tristate "Build Cirrus Logic CS421x codec support"

	tristate "Build Cirrus Logic CS421x codec support" if EXPERT

	select SND_HDA_GENERIC

	default y

	help

	  Say Y or M here to include Cirrus Logic CS421x codec support in

	  snd-hda-intel driver

	  Say Y or M here to include Cirrus Logic CS421x codec support



comment "Set to Y if you want auto-loading the codec driver"

	depends on SND_HDA=y && SND_HDA_CODEC_CS421X=m
@@ -31,8 +35,8 @@ config SND_HDA_CODEC_CS8409 
	tristate "Build Cirrus Logic HDA bridge support"

	select SND_HDA_GENERIC

	help

	  Say Y or M here to include Cirrus Logic HDA bridge support in

	  snd-hda-intel driver, such as CS8409.

	  Say Y or M here to include Cirrus Logic HDA bridge support

	  such as CS8409.



comment "Set to Y if you want auto-loading the codec driver"

	depends on SND_HDA=y && SND_HDA_CODEC_CS8409=m

sound/hda/codecs/hdmi/Kconfig

+13 −7
Original line number Diff line number Diff line
@@ -2,11 +2,17 @@ 


menuconfig SND_HDA_CODEC_HDMI

	tristate "HD-audio HDMI codec support"

	help

	  Say Y or M here to include HD-audio HDMI/DislayPort codec support.



	  This will enable all HDMI/DP codec drivers as default, but you can

	  enable/disable each codec driver individually, too (only when

	  CONFIG_EXPERT is set).



if SND_HDA_CODEC_HDMI



config SND_HDA_CODEC_HDMI_GENERIC

	tristate "Generic HDMI/DisplayPort HD-audio codec support"

	tristate "Generic HDMI/DisplayPort HD-audio codec support" if EXPERT

	select SND_DYNAMIC_MINORS

	select SND_PCM_ELD

	default y
@@ -18,14 +24,14 @@ config SND_HDA_CODEC_HDMI_GENERIC 
	  to assure the multiple streams for DP-MST support.



config SND_HDA_CODEC_HDMI_SIMPLE

	tristate "Simple HDMI/DisplayPort HD-audio codec support"

	tristate "Simple HDMI/DisplayPort HD-audio codec support" if EXPERT

	default y

	help

	  Say Y or M here to include Simple HDMI and DisplayPort HD-audio

	  codec support for VIA and other codecs.



config SND_HDA_CODEC_HDMI_INTEL

	tristate "Intel HDMI/DisplayPort HD-audio codec support"

	tristate "Intel HDMI/DisplayPort HD-audio codec support" if EXPERT

	select SND_HDA_CODEC_HDMI_GENERIC

	default y

	help
@@ -48,7 +54,7 @@ config SND_HDA_INTEL_HDMI_SILENT_STREAM 
	  are kept reserved both at transmitter and receiver.



config SND_HDA_CODEC_HDMI_ATI

	tristate "AMD/ATI HDMI/DisplayPort HD-audio codec support"

	tristate "AMD/ATI HDMI/DisplayPort HD-audio codec support" if EXPERT

	select SND_HDA_CODEC_HDMI_GENERIC

	default y

	help
@@ -56,7 +62,7 @@ config SND_HDA_CODEC_HDMI_ATI 
	  HD-audio codec support.



config SND_HDA_CODEC_HDMI_NVIDIA

	tristate "Nvidia HDMI/DisplayPort HD-audio codec support"

	tristate "Nvidia HDMI/DisplayPort HD-audio codec support" if EXPERT

	select SND_HDA_CODEC_HDMI_GENERIC

	default y

	help
@@ -64,7 +70,7 @@ config SND_HDA_CODEC_HDMI_NVIDIA 
	  support for the recent Nvidia graphics cards.



config SND_HDA_CODEC_HDMI_NVIDIA_MCP

	tristate "Legacy Nvidia HDMI/DisplayPort HD-audio codec support"

	tristate "Legacy Nvidia HDMI/DisplayPort HD-audio codec support" if EXPERT

	select SND_HDA_CODEC_HDMI_SIMPLE

	default y

	help
@@ -72,7 +78,7 @@ config SND_HDA_CODEC_HDMI_NVIDIA_MCP 
	  support for the legacy Nvidia graphics like MCP73, MCP67, MCP77/78.



config SND_HDA_CODEC_HDMI_TEGRA

	tristate "Nvidia Tegra HDMI/DisplayPort HD-audio codec support"

	tristate "Nvidia Tegra HDMI/DisplayPort HD-audio codec support" if EXPERT

	select SND_HDA_CODEC_HDMI_GENERIC

	default y

	help

sound/hda/codecs/realtek/Kconfig

+16 −12
Original line number Diff line number Diff line
@@ -2,6 +2,12 @@ 


menuconfig SND_HDA_CODEC_REALTEK

	tristate "Realtek HD-audio codec support"

	help

	  Say Y or M here to include Realtek HD-audio codec support.



	  This will enable all Realtek HD-audio codec drivers as default,

	  but you can enable/disable each codec driver individually, too

	  (only when CONFIG_EXPERT is set).



if SND_HDA_CODEC_REALTEK
@@ -12,7 +18,7 @@ config SND_HDA_CODEC_REALTEK_LIB 
	select SND_HDA_SCODEC_COMPONENT



config SND_HDA_CODEC_ALC260

	tristate "Build Realtek ALC260 HD-audio codec support"

	tristate "Build Realtek ALC260 HD-audio codec support" if EXPERT

	depends on INPUT

	select SND_HDA_CODEC_REALTEK_LIB

	default y
@@ -20,7 +26,7 @@ config SND_HDA_CODEC_ALC260 
	  Say Y or M here to include Realtek ALC260 HD-audio codec support



config SND_HDA_CODEC_ALC262

	tristate "Build Realtek ALC262 HD-audio codec support"

	tristate "Build Realtek ALC262 HD-audio codec support" if EXPERT

	depends on INPUT

	select SND_HDA_CODEC_REALTEK_LIB

	default y
@@ -28,7 +34,7 @@ config SND_HDA_CODEC_ALC262 
	  Say Y or M here to include Realtek ALC262 HD-audio codec support



config SND_HDA_CODEC_ALC268

	tristate "Build Realtek ALC268 HD-audio codec support"

	tristate "Build Realtek ALC268 HD-audio codec support" if EXPERT

	depends on INPUT

	select SND_HDA_CODEC_REALTEK_LIB

	default y
@@ -37,7 +43,7 @@ config SND_HDA_CODEC_ALC268 
	  codec support



config SND_HDA_CODEC_ALC269

	tristate "Build Realtek ALC269 HD-audio codecs support"

	tristate "Build Realtek ALC269 HD-audio codecs support" if EXPERT

	depends on INPUT

	select SND_HDA_CODEC_REALTEK_LIB

	default y
@@ -46,7 +52,7 @@ config SND_HDA_CODEC_ALC269 
	  codec support



config SND_HDA_CODEC_ALC662

	tristate "Build Realtek ALC662 HD-audio codecs support"

	tristate "Build Realtek ALC662 HD-audio codecs support" if EXPERT

	depends on INPUT

	select SND_HDA_CODEC_REALTEK_LIB

	default y
@@ -55,7 +61,7 @@ config SND_HDA_CODEC_ALC662 
	  codec support



config SND_HDA_CODEC_ALC680

	tristate "Build Realtek ALC680 HD-audio codecs support"

	tristate "Build Realtek ALC680 HD-audio codecs support" if EXPERT

	depends on INPUT

	select SND_HDA_CODEC_REALTEK_LIB

	default y
@@ -63,7 +69,7 @@ config SND_HDA_CODEC_ALC680 
	  Say Y or M here to include Realtek ALC680 HD-audio codec support



config SND_HDA_CODEC_ALC861

	tristate "Build Realtek ALC861 HD-audio codecs support"

	tristate "Build Realtek ALC861 HD-audio codecs support" if EXPERT

	depends on INPUT

	select SND_HDA_CODEC_REALTEK_LIB

	default y
@@ -71,7 +77,7 @@ config SND_HDA_CODEC_ALC861 
	  Say Y or M here to include Realtek ALC861 HD-audio codec support



config SND_HDA_CODEC_ALC861VD

	tristate "Build Realtek ALC861-VD HD-audio codecs support"

	tristate "Build Realtek ALC861-VD HD-audio codecs support" if EXPERT

	depends on INPUT

	select SND_HDA_CODEC_REALTEK_LIB

	default y
@@ -79,7 +85,7 @@ config SND_HDA_CODEC_ALC861VD 
	  Say Y or M here to include Realtek ALC861-VD HD-audio codec support



config SND_HDA_CODEC_ALC880

	tristate "Build Realtek ALC880 HD-audio codecs support"

	tristate "Build Realtek ALC880 HD-audio codecs support" if EXPERT

	depends on INPUT

	select SND_HDA_CODEC_REALTEK_LIB

	default y
@@ -87,7 +93,7 @@ config SND_HDA_CODEC_ALC880 
	  Say Y or M here to include Realtek ALC880 HD-audio codec support



config SND_HDA_CODEC_ALC882

	tristate "Build Realtek ALC882 HD-audio codecs support"

	tristate "Build Realtek ALC882 HD-audio codecs support" if EXPERT

	depends on INPUT

	select SND_HDA_CODEC_REALTEK_LIB

	default y
@@ -96,5 +102,3 @@ config SND_HDA_CODEC_ALC882 
	  codec support



endif