Merge branch 'topic/const' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@kernel.org>
Thu, 17 Aug 2017 17:15:39 +0000 (18:15 +0100)
committerMark Brown <broonie@kernel.org>
Thu, 17 Aug 2017 17:15:39 +0000 (18:15 +0100)
1  2 
sound/soc/codecs/Kconfig

diff --combined sound/soc/codecs/Kconfig
index 952c44dd5e90590cf64d012700c39d6595f5edc8,024ddc9938ed5c16c93bd745a86d8fe53c439a7f..aee9ef16dae62b91394fbcc56c7a22c9fda71b92
@@@ -71,7 -71,7 +71,7 @@@ config SND_SOC_ALL_CODEC
        select SND_SOC_DA732X if I2C
        select SND_SOC_DA9055 if I2C
        select SND_SOC_DIO2125
 -      select SND_SOC_DMIC
 +      select SND_SOC_DMIC if GPIOLIB
        select SND_SOC_ES8316 if I2C
        select SND_SOC_ES8328_SPI if SPI_MASTER
        select SND_SOC_ES8328_I2C if I2C
        select SND_SOC_PCM5102A
        select SND_SOC_PCM512x_I2C if I2C
        select SND_SOC_PCM512x_SPI if SPI_MASTER
+       select SND_SOC_RT274 if I2C
        select SND_SOC_RT286 if I2C
        select SND_SOC_RT298 if I2C
        select SND_SOC_RT5514 if I2C
@@@ -716,11 -717,17 +717,17 @@@ config SND_SOC_RL623
  
  config SND_SOC_RL6347A
        tristate
+       default y if SND_SOC_RT274=y
        default y if SND_SOC_RT286=y
        default y if SND_SOC_RT298=y
+       default m if SND_SOC_RT274=m
        default m if SND_SOC_RT286=m
        default m if SND_SOC_RT298=m
  
+ config SND_SOC_RT274
+       tristate
+       depends on I2C
  config SND_SOC_RT286
        tristate
        depends on I2C