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 (executable)
new mode 100644 (file)
index c68072f..a84de6d
--- 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 469c9ca9fdedfd0c37d48e65ace457f98a5c5a9d..508fcba39894d7e8c05b56aea54c2f73f415ab14 100644 (file)
--- 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 41fc5f3c4fd5f156be599d3fdb59c07d2d2ef452..ecf7c29faea5ba159d1ee6739f70ae6c84c1cbcb 100644 (file)
--- 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