From addaac5ef13cfec466682094b217eeb243239005 Mon Sep 17 00:00:00 2001 From: xhc Date: Thu, 18 Jul 2013 12:57:01 +0800 Subject: [PATCH] rk616: Set rk616 config i2s on DMA event mode to static mode --- arch/arm/configs/rk3168_rk616_86v_defconfig | 3 +-- arch/arm/configs/rk3188_jettaplus_defconfig | 4 ++-- arch/arm/configs/rk3188_rk618_defconfig | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) mode change 100755 => 100644 arch/arm/configs/rk3168_rk616_86v_defconfig 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 -- 2.34.1