Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm

[deliverable/linux.git] / sound / soc / rockchip / Kconfig

diff --git a/sound/soc/rockchip/Kconfig b/sound/soc/rockchip/Kconfig
index e18182699d83537205725a03f93507b1e88ed7f7..58bae8e2cf5ff7b9d1922feceaa0ac7347483561 100644 (file)
--- a/sound/soc/rockchip/Kconfig
+++ b/sound/soc/rockchip/Kconfig
@@ -14,3 +14,22 @@ config SND_SOC_ROCKCHIP_I2S
          Say Y or M if you want to add support for I2S driver for
          Rockchip I2S device. The device supports upto maximum of
          8 channels each for play and record.
+
+config SND_SOC_ROCKCHIP_MAX98090
+       tristate "ASoC support for Rockchip boards using a MAX98090 codec"
+       depends on SND_SOC_ROCKCHIP && I2C && GPIOLIB
+       select SND_SOC_ROCKCHIP_I2S
+       select SND_SOC_MAX98090
+       select SND_SOC_TS3A227E
+       help
+         Say Y or M here if you want to add support for SoC audio on Rockchip
+         boards using the MAX98090 codec, such as Veyron.
+
+config SND_SOC_ROCKCHIP_RT5645
+       tristate "ASoC support for Rockchip boards using a RT5645/RT5650 codec"
+       depends on SND_SOC_ROCKCHIP && I2C && GPIOLIB
+       select SND_SOC_ROCKCHIP_I2S
+       select SND_SOC_RT5645
+       help
+         Say Y or M here if you want to add support for SoC audio on Rockchip
+         boards using the RT5645/RT5650 codec, such as Veyron.