summaryrefslogtreecommitdiffstats
path: root/sound/hda
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2024-06-18 11:57:46 +0200
committerTakashi Iwai <tiwai@suse.de>2024-06-18 11:57:52 +0200
commitd85002b5d1f464157ff7d0099234d4626aa6cbc2 (patch)
treeb2293770f54c45b73791c1eb206fd804191d5f36 /sound/hda
parentALSA: hda: intel-dsp-config: Add PTL support (diff)
parentALSA: hda/realtek: Add more codec ID to no shutup pins list (diff)
downloadlinux-d85002b5d1f464157ff7d0099234d4626aa6cbc2.tar.xz
linux-d85002b5d1f464157ff7d0099234d4626aa6cbc2.zip
Merge branch 'for-linus' into for-next
Pull 6.10-rc devel branch for applying more Cirrus codec changes. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/hda')
-rw-r--r--sound/hda/intel-dsp-config.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/hda/intel-dsp-config.c b/sound/hda/intel-dsp-config.c
index a7419d2e912e..913880b09065 100644
--- a/sound/hda/intel-dsp-config.c
+++ b/sound/hda/intel-dsp-config.c
@@ -18,7 +18,7 @@
static int dsp_driver;
module_param(dsp_driver, int, 0444);
-MODULE_PARM_DESC(dsp_driver, "Force the DSP driver for Intel DSP (0=auto, 1=legacy, 2=SST, 3=SOF)");
+MODULE_PARM_DESC(dsp_driver, "Force the DSP driver for Intel DSP (0=auto, 1=legacy, 2=SST, 3=SOF, 4=AVS)");
#define FLAG_SST BIT(0)
#define FLAG_SOF BIT(1)