Merge tag 'asoc-v5.6-3' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorTakashi Iwai <tiwai@suse.de>
Thu, 6 Feb 2020 10:58:44 +0000 (11:58 +0100)
committerTakashi Iwai <tiwai@suse.de>
Thu, 6 Feb 2020 10:58:44 +0000 (11:58 +0100)
ASoC: Fix for v5.6

An incremental fix for the Qualcomm COMMON_CLK issue.

sound/soc/codecs/Kconfig

index 2865148..7e90f5d 100644 (file)
@@ -214,7 +214,7 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_UDA134X
        select SND_SOC_UDA1380 if I2C
        select SND_SOC_WCD9335 if SLIMBUS
-       select SND_SOC_WCD934X if MFD_WCD934X
+       select SND_SOC_WCD934X if MFD_WCD934X && COMMON_CLK
        select SND_SOC_WL1273 if MFD_WL1273_CORE
        select SND_SOC_WM0010 if SPI_MASTER
        select SND_SOC_WM1250_EV1 if I2C