diff options
| author | Mark Brown <broonie@kernel.org> | 2021-06-07 16:18:18 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-06-07 16:18:18 +0100 |
| commit | b9de77d0bc518fa08b7d218a4de171edb42f0a79 (patch) | |
| tree | 9cc1028a8b5c9054ff12302322b77779495c27ea /sound/soc/codecs/Kconfig | |
| parent | ffb2df66ba8c65700e030fc6eeaa24b044c94e43 (diff) | |
| parent | ef7570b67541d8b938df1e45f56e54be70bf1360 (diff) | |
Merge tag 'tb-mfd-asoc-v5.14-1' of https://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd into asoc-5.14
Immutable branch between MFD and ASoC due for the v5.14 merge window
Diffstat (limited to 'sound/soc/codecs/Kconfig')
| -rw-r--r-- | sound/soc/codecs/Kconfig | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index d8f14b59bddb..bd8583f5ebae 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -155,6 +155,7 @@ config SND_SOC_ALL_CODECS imply SND_SOC_PCM512x_I2C imply SND_SOC_PCM512x_SPI imply SND_SOC_RK3328 + imply SND_SOC_RK817 imply SND_SOC_RT274 imply SND_SOC_RT286 imply SND_SOC_RT298 @@ -1064,6 +1065,11 @@ config SND_SOC_RK3328 tristate "Rockchip RK3328 audio CODEC" select REGMAP_MMIO +config SND_SOC_RK817 + tristate "Rockchip RK817 audio CODEC" + depends on MFD_RK808 + select REGMAP_I2C + config SND_SOC_RL6231 tristate default y if SND_SOC_RT5514=y |