diff options
author | Takashi Iwai <tiwai@suse.de> | 2021-10-14 16:54:25 +0300 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2021-10-14 16:54:30 +0300 |
commit | 6f00d1651b32f7f2951d9f299eb79b03c10186e3 (patch) | |
tree | 0cdab37749571b878d832d897d11402889516b89 /sound/soc/mediatek/Kconfig | |
parent | 53451b6da8271905941eb1eb369db152c4bd92f2 (diff) | |
parent | aef454b40288158b850aab13e3d2a8c406779401 (diff) | |
download | linux-6f00d1651b32f7f2951d9f299eb79b03c10186e3.tar.xz |
Merge branch 'for-linus' into for-next
A back-merge of 5.15 branch into 5.16-devel branch for further
development of USB and ALSA core stuff that depends on 5.15 fixes.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/soc/mediatek/Kconfig')
-rw-r--r-- | sound/soc/mediatek/Kconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/soc/mediatek/Kconfig b/sound/soc/mediatek/Kconfig index 5a2f4667d50b..81ad2dcee9eb 100644 --- a/sound/soc/mediatek/Kconfig +++ b/sound/soc/mediatek/Kconfig @@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only config SND_SOC_MEDIATEK tristate + select REGMAP_MMIO config SND_SOC_MT2701 tristate "ASoC support for Mediatek MT2701 chip" @@ -188,7 +189,9 @@ config SND_SOC_MT8192_MT6359_RT1015_RT5682 config SND_SOC_MT8195 tristate "ASoC support for Mediatek MT8195 chip" depends on ARCH_MEDIATEK || COMPILE_TEST + depends on COMMON_CLK select SND_SOC_MEDIATEK + select MFD_SYSCON if SND_SOC_MT6359 help This adds ASoC platform driver support for Mediatek MT8195 chip that can be used with other codecs. |