From: Mark Brown <broonie@kernel.org>
Date: Sun, 9 Jul 2023 21:43:21 +0000 (+0100)
Subject: Merge existing fixes from asoc/for-6.5 into new branch
X-Git-Tag: v6.6-rc1~135^2~5^2~85^2~53
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/3d74f42c56db263e82ad96f8fe23aef38cdc071f?hp=-c

Merge existing fixes from asoc/for-6.5 into new branch
---

3d74f42c56db263e82ad96f8fe23aef38cdc071f
diff --combined sound/soc/codecs/Kconfig
index 2a62dbd5339e,d379a670a46d..c2de4ee72183
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@@ -715,6 -715,7 +715,7 @@@ config SND_SOC_CS35L41_I2
  
  config SND_SOC_CS35L45
  	tristate
+ 	select REGMAP_IRQ
  
  config SND_SOC_CS35L45_SPI
  	tristate "Cirrus Logic CS35L45 CODEC (SPI)"
@@@ -1336,7 -1337,7 +1337,7 @@@ config SND_SOC_RK332
  
  config SND_SOC_RK817
  	tristate "Rockchip RK817 audio CODEC"
 -	depends on MFD_RK808 || COMPILE_TEST
 +	depends on MFD_RK8XX || COMPILE_TEST
  
  config SND_SOC_RL6231
  	tristate
@@@ -1942,6 -1943,7 +1943,7 @@@ config SND_SOC_WCD934
  	tristate "WCD9340/WCD9341 Codec"
  	depends on COMMON_CLK
  	depends on SLIMBUS
+ 	select REGMAP_IRQ
  	select REGMAP_SLIMBUS
  	select SND_SOC_WCD_MBHC
  	depends on MFD_WCD934X || COMPILE_TEST