2019-07-31 16:23:26 +00:00
|
|
|
From 618baa8ddc305c5bbe1cd4682c9df252e6fc386c Mon Sep 17 00:00:00 2001
|
2019-07-09 18:32:28 +00:00
|
|
|
From: Mark Brown <broonie@kernel.org>
|
|
|
|
|
Date: Tue, 26 Mar 2019 13:10:13 +0000
|
2019-07-31 16:23:26 +00:00
|
|
|
Subject: [PATCH 412/725] ASoC: tlv320aic32x4: Only enable with common clock
|
2019-07-09 18:32:28 +00:00
|
|
|
|
|
|
|
|
commit 64f01d2b5ccc621c3aa66b82daf9154f5581f36a upstream.
|
|
|
|
|
|
|
|
|
|
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 | 6 ++++--
|
|
|
|
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
|
|
|
|
|
|
|
--- a/sound/soc/codecs/Kconfig
|
|
|
|
|
+++ b/sound/soc/codecs/Kconfig
|
|
|
|
|
@@ -170,8 +170,8 @@ config SND_SOC_ALL_CODECS
|
|
|
|
|
select SND_SOC_TAS5713 if I2C
|
|
|
|
|
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
|
|
|
|
|
@@ -1030,11 +1030,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
|
