Merge "[Bugfix][bug-view-1970,1971,1972,1975]Revert alsa related changes" into INTEST_PM_SDK6.1_BASE
diff --git a/ap/os/linux/linux-3.4.x/sound/soc/sanechips/Kconfig b/ap/os/linux/linux-3.4.x/sound/soc/sanechips/Kconfig
index baafde6..b481212 100644
--- a/ap/os/linux/linux-3.4.x/sound/soc/sanechips/Kconfig
+++ b/ap/os/linux/linux-3.4.x/sound/soc/sanechips/Kconfig
@@ -1,7 +1,10 @@
config SND_SOC_SANECHIPS
tristate "ASoC support for Sanechips zx297520v3"
depends on ARCH_ZX297520V3 || ARCH_ZX297520V2
+ select SND_SOC_ZX297520V3 if ARCH_ZX297520V3
select SND_SOC_ZX297520V2 if ARCH_ZX297520V2
+ select SND_SOC_ZX_I2S
+ select SND_SOC_ZX_PCM
config SND_SOC_ZX297520V3_TI3100
tristate "SoC I2S Audio support for ZX297520V3 - TI3100"
diff --git a/ap/project/zx297520v3/prj_vehicle_dc_ref/config/normal/config.linux b/ap/project/zx297520v3/prj_vehicle_dc_ref/config/normal/config.linux
index d720205..1babc5b 100755
--- a/ap/project/zx297520v3/prj_vehicle_dc_ref/config/normal/config.linux
+++ b/ap/project/zx297520v3/prj_vehicle_dc_ref/config/normal/config.linux
@@ -1374,9 +1374,9 @@
# CONFIG_SND_SOC_ZX297520V3_NAU8810 is not set
CONFIG_SND_SOC_ZX297520V3_DUMMY=y
CONFIG_SND_SOC_ZX_VOICE=y
-# CONFIG_SND_SOC_ZX297520V3 is not set
-# CONFIG_SND_SOC_ZX_I2S is not set
-# CONFIG_SND_SOC_ZX_PCM is not
+CONFIG_SND_SOC_ZX297520V3=y
+CONFIG_SND_SOC_ZX_I2S=y
+CONFIG_SND_SOC_ZX_PCM=y
CONFIG_SND_EXTRA_CTRL=y
CONFIG_SND_SOC_DUMMY=y
# CONFIG_HID_SUPPORT is not set