summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2025-01-29 16:39:55 +0300
committerTakashi Iwai <tiwai@suse.de>2025-01-29 16:39:55 +0300
commit86d0d3ee07de37d51764c62473f4bb58ef88badc (patch)
tree31c3bb9fb50297c3ac3b53e0acd14ebada25ffb4 /drivers
parent3b4309546b48fc167aa615a2d881a09c0a97971f (diff)
parent6c1bb4031729871fa203983bd77bed1ee3c61347 (diff)
downloadlinux-86d0d3ee07de37d51764c62473f4bb58ef88badc.tar.xz
Merge tag 'asoc-fix-v6.14-merge-window' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v6.14 A bunch of fixes that came in during the merge window, plus a few new device IDs. The i.MX changes are a little large since they add some new quirk data as well as device IDs, and the audio graph card change for picking the correct endpoint for links is large due to updating a number of call sites.
Diffstat (limited to 'drivers')
-rw-r--r--drivers/firmware/cirrus/Kconfig6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/firmware/cirrus/Kconfig b/drivers/firmware/cirrus/Kconfig
index ee09269c63b5..0a883091259a 100644
--- a/drivers/firmware/cirrus/Kconfig
+++ b/drivers/firmware/cirrus/Kconfig
@@ -6,15 +6,13 @@ config FW_CS_DSP
config FW_CS_DSP_KUNIT_TEST_UTILS
tristate
- depends on KUNIT
- select REGMAP
+ depends on KUNIT && REGMAP
select FW_CS_DSP
config FW_CS_DSP_KUNIT_TEST
tristate "KUnit tests for Cirrus Logic cs_dsp" if !KUNIT_ALL_TESTS
- depends on KUNIT
+ depends on KUNIT && REGMAP
default KUNIT_ALL_TESTS
- select REGMAP
select FW_CS_DSP
select FW_CS_DSP_KUNIT_TEST_UTILS
help