From: xhc <xhc@rock-chips.com>
Date: Thu, 18 Jul 2013 04:57:01 +0000 (+0800)
Subject: rk616: Set rk616 config i2s on DMA event mode to static mode
X-Git-Tag: firefly_0821_release~6879
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=addaac5ef13cfec466682094b217eeb243239005;p=firefly-linux-kernel-4.4.55.git

rk616: Set rk616 config i2s on DMA event mode to static mode
---

diff --git a/arch/arm/configs/rk3168_rk616_86v_defconfig b/arch/arm/configs/rk3168_rk616_86v_defconfig
old mode 100755
new mode 100644
index c68072f1f9d3..a84de6daab9e
--- a/arch/arm/configs/rk3168_rk616_86v_defconfig
+++ b/arch/arm/configs/rk3168_rk616_86v_defconfig
@@ -279,7 +279,6 @@ CONFIG_WATCHDOG=y
 CONFIG_MFD_TPS65910=y
 CONFIG_MFD_WM831X_I2C=y
 CONFIG_MFD_RK616=y
-CONFIG_RK616_USE_MCLK_12M=y
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_TPS65910=y
 CONFIG_REGULATOR_WM831X=y
@@ -323,7 +322,7 @@ 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_I2S_DMA_EVENT_STATIC=y
 CONFIG_SND_RK_SOC_HDMI_SPDIF=y
 CONFIG_SND_RK_SOC_RK616=y
 CONFIG_SND_RK29_CODEC_SOC_SLAVE=y
diff --git a/arch/arm/configs/rk3188_jettaplus_defconfig b/arch/arm/configs/rk3188_jettaplus_defconfig
index 469c9ca9fded..508fcba39894 100644
--- a/arch/arm/configs/rk3188_jettaplus_defconfig
+++ b/arch/arm/configs/rk3188_jettaplus_defconfig
@@ -326,8 +326,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_HDMI_I2S=y
+CONFIG_SND_I2S_DMA_EVENT_STATIC=y
+CONFIG_SND_RK_SOC_HDMI_SPDIF=y
 CONFIG_SND_RK_SOC_RK616=y
 CONFIG_SND_RK29_CODEC_SOC_SLAVE=y
 CONFIG_UHID=y
diff --git a/arch/arm/configs/rk3188_rk618_defconfig b/arch/arm/configs/rk3188_rk618_defconfig
index 41fc5f3c4fd5..ecf7c29faea5 100644
--- a/arch/arm/configs/rk3188_rk618_defconfig
+++ b/arch/arm/configs/rk3188_rk618_defconfig
@@ -306,8 +306,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_HDMI_I2S=y
+CONFIG_SND_I2S_DMA_EVENT_STATIC=y
+CONFIG_SND_RK_SOC_HDMI_SPDIF=y
 CONFIG_SND_RK_SOC_RK616=y
 CONFIG_SND_RK29_CODEC_SOC_SLAVE=y
 CONFIG_UHID=y