From 9777e8d27ff829626b2298a1590f5416cb04c993 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E9=BB=84=E6=B6=9B?= Date: Thu, 26 Aug 2010 15:33:16 +0800 Subject: [PATCH] defconfig: set i2s type: Codec run in Master --- arch/arm/configs/rk2818_info_defconfig | 4 ++-- arch/arm/configs/rk2818_mid_defconfig | 4 ++-- arch/arm/configs/rk2818_phone_defconfig | 4 ++-- arch/arm/configs/rk2818_raho_defconfig | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm/configs/rk2818_info_defconfig b/arch/arm/configs/rk2818_info_defconfig index de4429d7447b..4d239fa1082c 100755 --- a/arch/arm/configs/rk2818_info_defconfig +++ b/arch/arm/configs/rk2818_info_defconfig @@ -1067,8 +1067,8 @@ CONFIG_SND_ROCKCHIP_SOC=y CONFIG_SND_ROCKCHIP_SOC_I2S=y # CONFIG_SND_ROCKCHIP_SOC_WM8988 is not set CONFIG_SND_ROCKCHIP_SOC_WM8994=y -# CONFIG_SND_CODEC_SOC_MASTER is not set -CONFIG_SND_CODEC_SOC_SLAVE=y +CONFIG_SND_CODEC_SOC_MASTER=y +# CONFIG_SND_CODEC_SOC_SLAVE is not set CONFIG_SND_SOC_I2C_AND_SPI=y # CONFIG_SND_SOC_ALL_CODECS is not set CONFIG_SND_SOC_WM8994=y diff --git a/arch/arm/configs/rk2818_mid_defconfig b/arch/arm/configs/rk2818_mid_defconfig index 25aae0d2442b..495ba97ebdba 100644 --- a/arch/arm/configs/rk2818_mid_defconfig +++ b/arch/arm/configs/rk2818_mid_defconfig @@ -1051,8 +1051,8 @@ CONFIG_SND_ROCKCHIP_SOC=y CONFIG_SND_ROCKCHIP_SOC_I2S=y # CONFIG_SND_ROCKCHIP_SOC_WM8988 is not set CONFIG_SND_ROCKCHIP_SOC_WM8994=y -# CONFIG_SND_CODEC_SOC_MASTER is not set -CONFIG_SND_CODEC_SOC_SLAVE=y +CONFIG_SND_CODEC_SOC_MASTER=y +# CONFIG_SND_CODEC_SOC_SLAVE is not set CONFIG_SND_SOC_I2C_AND_SPI=y # CONFIG_SND_SOC_ALL_CODECS is not set CONFIG_SND_SOC_WM8994=y diff --git a/arch/arm/configs/rk2818_phone_defconfig b/arch/arm/configs/rk2818_phone_defconfig index 6e061986913f..18f312c6fa57 100644 --- a/arch/arm/configs/rk2818_phone_defconfig +++ b/arch/arm/configs/rk2818_phone_defconfig @@ -1051,8 +1051,8 @@ CONFIG_SND_ROCKCHIP_SOC=y CONFIG_SND_ROCKCHIP_SOC_I2S=y # CONFIG_SND_ROCKCHIP_SOC_WM8988 is not set CONFIG_SND_ROCKCHIP_SOC_WM8994=y -# CONFIG_SND_CODEC_SOC_MASTER is not set -CONFIG_SND_CODEC_SOC_SLAVE=y +CONFIG_SND_CODEC_SOC_MASTER=y +# CONFIG_SND_CODEC_SOC_SLAVE is not set CONFIG_SND_SOC_I2C_AND_SPI=y # CONFIG_SND_SOC_ALL_CODECS is not set CONFIG_SND_SOC_WM8994=y diff --git a/arch/arm/configs/rk2818_raho_defconfig b/arch/arm/configs/rk2818_raho_defconfig index 8ac72ba21605..34656c4acdc6 100755 --- a/arch/arm/configs/rk2818_raho_defconfig +++ b/arch/arm/configs/rk2818_raho_defconfig @@ -1060,8 +1060,8 @@ CONFIG_SND_ROCKCHIP_SOC=y CONFIG_SND_ROCKCHIP_SOC_I2S=y # CONFIG_SND_ROCKCHIP_SOC_WM8988 is not set CONFIG_SND_ROCKCHIP_SOC_WM8994=y -# CONFIG_SND_CODEC_SOC_MASTER is not set -CONFIG_SND_CODEC_SOC_SLAVE=y +CONFIG_SND_CODEC_SOC_MASTER=y +# CONFIG_SND_CODEC_SOC_SLAVE is not set CONFIG_SND_SOC_I2C_AND_SPI=y # CONFIG_SND_SOC_ALL_CODECS is not set CONFIG_SND_SOC_WM8994=y -- 2.34.1