From: Mark Brown Date: Wed, 12 Mar 2014 23:04:09 +0000 (+0000) Subject: Merge remote-tracking branches 'asoc/topic/88pm860x', 'asoc/topic/ad1836', 'asoc... X-Git-Tag: submit/tizen/20160607.132125~4775^2~1^2~5^2~8 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=950c66721df4f3ee27b25884bbc5b7e919ff47bc;p=sdk%2Femulator%2Femulator-kernel.git Merge remote-tracking branches 'asoc/topic/88pm860x', 'asoc/topic/ad1836', 'asoc/topic/ad193x', 'asoc/topic/adau1977', 'asoc/topic/ak4104', 'asoc/topic/ak4641', 'asoc/topic/ak4671' and 'asoc/topic/alc5623' into asoc-next --- 950c66721df4f3ee27b25884bbc5b7e919ff47bc diff --cc sound/soc/blackfin/Kconfig index 4544d8e,54f74f8,54f74f8,3591367,18abd88,54f74f8,54f74f8,54f74f8,54f74f8..b210791 --- a/sound/soc/blackfin/Kconfig +++ b/sound/soc/blackfin/Kconfig @@@@@@@@@@ -44,9 -45,9 -45,9 -45,9 -45,10 -45,9 -45,9 -45,9 -45,9 +44,10 @@@@@@@@@@ config SND_SOC_BFIN_EVAL_ADAU137 config SND_SOC_BFIN_EVAL_ADAV80X tristate "Support for the EVAL-ADAV80X boards on Blackfin eval boards" -------- depends on SND_BF5XX_I2S && (SPI_MASTER || I2C) ++++++++ depends on SND_BF5XX_I2S && SND_SOC_I2C_AND_SPI select SND_BF5XX_SOC_I2S ---- ---- select SND_SOC_ADAV80X ++++ ++++ select SND_SOC_ADAV801 if SPI_MASTER ++++ ++++ select SND_SOC_ADAV803 if I2C help Say Y if you want to add support for the Analog Devices EVAL-ADAV801 or EVAL-ADAV803 board connected to one of the Blackfin evaluation boards @@@@@@@@@@ -65,9 -66,9 -66,9 -66,10 -67,9 -66,9 -66,9 -66,9 -66,9 +66,10 @@@@@@@@@@ config SND_BF5XX_SOC_AD183 config SND_BF5XX_SOC_AD193X tristate "SoC AD193X Audio support for Blackfin" -------- depends on SND_BF5XX_I2S ++++++++ depends on SND_BF5XX_I2S && SND_SOC_I2C_AND_SPI select SND_BF5XX_SOC_I2S --- ----- select SND_SOC_AD193X +++ +++++ select SND_SOC_AD193X_I2C if I2C +++ +++++ select SND_SOC_AD193X_SPI if SPI_MASTER help Say Y if you want to add support for AD193X codec on Blackfin. This driver supports AD1936, AD1937, AD1938 and AD1939.