From 51dca9cc17c15ddb9127f33133dd693858e04bba Mon Sep 17 00:00:00 2001
From: zhangjun <zhangjun@rock-chips.com>
Date: Sun, 22 Sep 2013 16:06:24 +0800
Subject: [PATCH] Codec:add CX20701 support in rk3188 android computer board

---
 arch/arm/configs/rk3188_ac_defconfig   | 9 ++++-----
 arch/arm/mach-rk3188/board-rk3188-ac.c | 7 +++++++
 sound/soc/codecs/cx2070x.c             | 5 +++++
 3 files changed, 16 insertions(+), 5 deletions(-)
 mode change 100644 => 100755 arch/arm/mach-rk3188/board-rk3188-ac.c

diff --git a/arch/arm/configs/rk3188_ac_defconfig b/arch/arm/configs/rk3188_ac_defconfig
index 91316067c1a2..6a0f614f3763 100644
--- a/arch/arm/configs/rk3188_ac_defconfig
+++ b/arch/arm/configs/rk3188_ac_defconfig
@@ -24,7 +24,7 @@ CONFIG_ARCH_RK3188=y
 # CONFIG_DDR_TEST is not set
 CONFIG_RK_CLOCK_PROC=y
 CONFIG_RK_USB_UART=y
-CONFIG_MACH_RK3188_DS1006H=y
+CONFIG_MACH_RK3188_AC=y
 CONFIG_FIQ_DEBUGGER=y
 CONFIG_FIQ_DEBUGGER_NO_SLEEP=y
 CONFIG_FIQ_DEBUGGER_CONSOLE=y
@@ -300,13 +300,12 @@ CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_BACKLIGHT_GENERIC is not set
 CONFIG_DISPLAY_SUPPORT=y
-CONFIG_LCD_DS1006H=y
-# CONFIG_RK610_TVOUT is not set
 CONFIG_FB_ROCKCHIP=y
 CONFIG_DUAL_LCDC_DUAL_DISP_IN_KERNEL=y
 CONFIG_LCDC_RK3188=y
 CONFIG_LCDC0_RK3188=y
 CONFIG_LCDC1_RK3188=y
+CONFIG_LCD_DS1006H=y
 CONFIG_RK_HDMI=y
 CONFIG_HDMI_CAT66121=y
 CONFIG_RK_HDMI_CTL_CODEC=y
@@ -322,9 +321,9 @@ CONFIG_SND=y
 # CONFIG_SND_ARM is not set
 CONFIG_SND_SOC=y
 CONFIG_SND_RK29_SOC=y
-CONFIG_SND_I2S_USE_33V=y
 CONFIG_SND_I2S_DMA_EVENT_STATIC=y
-CONFIG_SND_RK29_SOC_RT5631=y
+CONFIG_SND_RK_SOC_HDMI_I2S=y
+CONFIG_SND_RK29_SOC_CX2070X=y
 CONFIG_SND_RK29_CODEC_SOC_SLAVE=y
 CONFIG_UHID=y
 CONFIG_HID_A4TECH=y
diff --git a/arch/arm/mach-rk3188/board-rk3188-ac.c b/arch/arm/mach-rk3188/board-rk3188-ac.c
old mode 100644
new mode 100755
index 705c9eee2d5a..8e680cd76347
--- a/arch/arm/mach-rk3188/board-rk3188-ac.c
+++ b/arch/arm/mach-rk3188/board-rk3188-ac.c
@@ -1384,6 +1384,13 @@ static struct i2c_board_info __initdata i2c0_info[] = {
 		.flags         = 0,
 	},
 #endif
+#if defined (CONFIG_SND_SOC_CX2070X)
+        {
+                .type                   = "cx2070x",
+                .addr                   = 0x14,
+                .flags                  = 0,
+        },
+#endif
 };
 #endif
 
diff --git a/sound/soc/codecs/cx2070x.c b/sound/soc/codecs/cx2070x.c
index 6c4e8401c46b..050db4438fb2 100644
--- a/sound/soc/codecs/cx2070x.c
+++ b/sound/soc/codecs/cx2070x.c
@@ -281,6 +281,11 @@ static struct snd_soc_jack_gpio hs_jack_gpios[] = {
 
 #endif //CONFIG_SND_CX2070X_GPIO_JACKSENSE
 
+void codec_set_spk(bool on)
+{	
+}
+EXPORT_SYMBOL(codec_set_spk);
+
 #if defined(CONFIG_SND_CX2070X_LOAD_FW)
 int I2cWrite( struct snd_soc_codec *codec, unsigned char ChipAddr, unsigned long cbBuf, unsigned char* pBuf);
 int I2cWriteThenRead( struct snd_soc_codec *codec, unsigned char ChipAddr, unsigned long cbBuf,
-- 
2.34.1