From: wuhao <wuhao@wuhao@rock-chips.com>
Date: Wed, 5 Jun 2013 10:53:22 +0000 (+0800)
Subject: rk3168m: rk3168m: input i2s while hdmi display
X-Git-Tag: firefly_0821_release~7004
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=86fd652161c32a96da7aaa8d4472904c59f6f431;p=firefly-linux-kernel-4.4.55.git

rk3168m: rk3168m: input i2s while hdmi display
---

diff --git a/arch/arm/configs/rk3168m_tb_defconfig b/arch/arm/configs/rk3168m_tb_defconfig
index 944d466cae10..9e64d950b02b 100644
--- a/arch/arm/configs/rk3168m_tb_defconfig
+++ b/arch/arm/configs/rk3168m_tb_defconfig
@@ -23,7 +23,6 @@ CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_ARCH_RK30=y
 # CONFIG_DDR_TEST is not set
 CONFIG_SOC_RK3168M=y
-CONFIG_MACH_RK3168M_TB=y
 CONFIG_FIQ_DEBUGGER=y
 CONFIG_FIQ_DEBUGGER_NO_SLEEP=y
 CONFIG_FIQ_DEBUGGER_CONSOLE=y
@@ -326,8 +325,8 @@ CONFIG_SND=y
 # CONFIG_SND_ARM is not set
 CONFIG_SND_SOC=y
 CONFIG_SND_RK29_SOC=y
-CONFIG_SND_I2S_DMA_EVENT_DYNAMIC=y
-CONFIG_SND_RK_SOC_SPDIF=y
+CONFIG_SND_I2S_USE_33V=y
+CONFIG_SND_I2S_DMA_EVENT_STATIC=y
 CONFIG_SND_RK29_SOC_RK616=y
 CONFIG_SND_RK29_CODEC_SOC_SLAVE=y
 CONFIG_UHID=y