OSDN Git Service

ASoC: tlv320aic32x4: Only enable with common clock
authorMark Brown <broonie@kernel.org>
Tue, 26 Mar 2019 13:10:13 +0000 (13:10 +0000)
committerMark Brown <broonie@kernel.org>
Tue, 26 Mar 2019 13:18:23 +0000 (13:18 +0000)
Some architectures do not yet support the common clock API at all but
the tlv320aic32x4 driver now requires it.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/Kconfig

index 6e99320..4191421 100644 (file)
@@ -180,8 +180,8 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_TLV320AIC23_SPI if SPI_MASTER
        select SND_SOC_TLV320AIC26 if SPI_MASTER
        select SND_SOC_TLV320AIC31XX if I2C
-       select SND_SOC_TLV320AIC32X4_I2C if I2C
-       select SND_SOC_TLV320AIC32X4_SPI if SPI_MASTER
+       select SND_SOC_TLV320AIC32X4_I2C if I2C && COMMON_CLK
+       select SND_SOC_TLV320AIC32X4_SPI if SPI_MASTER && COMMON_CLK
        select SND_SOC_TLV320AIC3X if I2C
        select SND_SOC_TPA6130A2 if I2C
        select SND_SOC_TLV320DAC33 if I2C
@@ -1110,11 +1110,13 @@ config SND_SOC_TLV320AIC32X4
 config SND_SOC_TLV320AIC32X4_I2C
        tristate "Texas Instruments TLV320AIC32x4 audio CODECs - I2C"
        depends on I2C
+       depends on COMMON_CLK
        select SND_SOC_TLV320AIC32X4
 
 config SND_SOC_TLV320AIC32X4_SPI
        tristate "Texas Instruments TLV320AIC32x4 audio CODECs - SPI"
        depends on SPI_MASTER
+       depends on COMMON_CLK
        select SND_SOC_TLV320AIC32X4
 
 config SND_SOC_TLV320AIC3X