Merge remote-tracking branch 'origin/develop-3.0-rk2928' into develop-3.0

[firefly-linux-kernel-4.4.55.git] / sound / soc / rk29 / Kconfig

diff --git a/sound/soc/rk29/Kconfig b/sound/soc/rk29/Kconfig
index 1596ca660a73691b6515b22ba42170589c4697ec..6cde119146645ecc7eedf709fca7b4bb03940b94 100755 (executable)
--- a/sound/soc/rk29/Kconfig
+++ b/sound/soc/rk29/Kconfig
@@ -1,5 +1,5 @@
 config SND_RK29_SOC
-       tristate "SoC Audio for the rockchip RK29/RK30/RK31 System-on-Chip"
+       tristate "SoC Audio for the Rockchip System-on-Chip"
        depends on PLAT_RK && SND_SOC
        help
          Say Y or M if you want to add support for codecs attached to
@@ -73,6 +73,14 @@ config SND_RK29_SOC_RT5621
        help
          Say Y if you want to add support for SoC audio on rockchip
          with the rt5621.
+config SND_RK29_SOC_RT5623
+       tristate "SoC I2S Audio support for rockchip - rt5623"
+       depends on SND_RK29_SOC
+       select SND_RK29_SOC_I2S
+       select SND_SOC_RT5623
+       help
+         Say Y if you want to add support for SoC audio on rockchip
+         with the rt5623.
 config SND_RK29_SOC_RT5631
        tristate "SoC I2S Audio support for rockchip - RT5631"
        depends on SND_RK29_SOC
@@ -107,6 +115,15 @@ choice
          if your codec output hardware connect is spk from spkout, choose it
 endchoice
 
+config SND_RK29_SOC_RT3261
+       tristate "SoC I2S Audio support for rockchip - RT3261"
+       depends on SND_RK29_SOC
+       select SND_RK29_SOC_I2S
+       select SND_SOC_RT3261
+       help
+         Say Y if you want to add support for SoC audio on rockchip
+         with the RT3261.
+
 config SND_RK29_SOC_WM8994
        tristate "SoC I2S Audio support for rockchip - WM8994"
        depends on SND_RK29_SOC && MFD_WM8994
@@ -178,8 +195,8 @@ config SND_RK_SOC_RK2928
        help
          Say Y if you want to add support for SoC audio on rockchip
          with the RK2928 internal codec.
-         
-if SND_RK29_SOC_WM8988 || SND_RK29_SOC_RK1000 || SND_RK29_SOC_WM8994 || SND_RK29_SOC_WM8900 || SND_RK29_SOC_RT5621 || SND_RK29_SOC_RT5631 || SND_RK29_SOC_RT5625 || SND_RK29_SOC_CS42L52 || SND_RK29_SOC_AIC3111 || SND_RK29_SOC_HDMI || SND_RK29_SOC_RK610 || SND_RK29_SOC_AIC3262 || SND_RK_SOC_RK2928
+
+if SND_RK29_SOC_WM8988 || SND_RK29_SOC_RK1000 || SND_RK29_SOC_WM8994 || SND_RK29_SOC_WM8900 || SND_RK29_SOC_RT5621 || SND_RK29_SOC_RT5631 || SND_RK29_SOC_RT5625 || SND_RK29_SOC_RT3261 || SND_RK29_SOC_CS42L52 || SND_RK29_SOC_AIC3111 || SND_RK29_SOC_HDMI || SND_RK29_SOC_RK610 || SND_RK29_SOC_AIC3262 || SND_RK_SOC_RK2928
 choice
   bool "Set i2s type"
   default SND_RK29_CODEC_SOC_SLAVE