rk3168m: defconfig codec rk610

diff --git a/arch/arm/configs/rk3168m_tb_defconfig b/arch/arm/configs/rk3168m_tb_defconfig
index 0cefbfed8e98ee04edc4cd8e1bb2d2043c5093fc..1b47caeb1245fc9cc60054a35918991ffefe8c16 100644 (file)
--- a/arch/arm/configs/rk3168m_tb_defconfig
+++ b/arch/arm/configs/rk3168m_tb_defconfig
@@ -304,7 +304,7 @@ CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_BACKLIGHT_GENERIC is not set
 CONFIG_DISPLAY_SUPPORT=y
-CONFIG_LCD_B101EW05=y
+CONFIG_LCD_RK3168M_B101EW05=y
 CONFIG_RK610_LVDS=y
 # CONFIG_RK610_TVOUT is not set
 CONFIG_FB_ROCKCHIP=y
@@ -329,7 +329,7 @@ CONFIG_SND_SOC=y
 CONFIG_SND_RK29_SOC=y
 CONFIG_SND_RK29_SOC_I2S_2CH=y
 CONFIG_SND_I2S_DMA_EVENT_STATIC=y
-CONFIG_SND_RK29_SOC_RT5631=y
+CONFIG_SND_RK29_SOC_RK610=y
 CONFIG_SND_RK29_CODEC_SOC_SLAVE=y
 CONFIG_HID_A4TECH=y
 CONFIG_HID_ACRUX=y

diff --git a/arch/arm/mach-rk30/board-rk3168m-tb.c b/arch/arm/mach-rk30/board-rk3168m-tb.c
index d3d9c1ac4a92fd6a2829c1e8f3c7a30ae9937da4..741055301d30be10dd794f1ac573a6da59ad2ef5 100755 (executable)
--- a/arch/arm/mach-rk30/board-rk3168m-tb.c
+++ b/arch/arm/mach-rk30/board-rk3168m-tb.c
@@ -83,7 +83,7 @@
 
 #if defined(CONFIG_TOUCHSCREEN_GT8XX)
 #define TOUCH_RESET_PIN  RK30_PIN0_PB6
-#define TOUCH_PWR_PIN    RK30_PIN0_PC5   // need to fly line by hardware engineer
+#define TOUCH_PWR_PIN    INVALID_GPIO//RK30_PIN0_PC5   // need to fly line by hardware engineer
 static int goodix_init_platform_hw(void)
 {
        int ret;
@@ -700,7 +700,7 @@ static int rk610_codec_io_init(void)
 }
 
 static struct rk610_codec_platform_data rk610_codec_pdata = {
-       .spk_ctl_io = RK30_PIN4_PC6,
+       .spk_ctl_io = RK30_PIN2_PD7,
        .io_init = rk610_codec_io_init,
 };
 #endif
@@ -2029,7 +2029,7 @@ static void __init machine_rk30_board_init(void)
 #if defined(CONFIG_WIFI_CONTROL_FUNC)
        rk29sdk_wifi_bt_gpio_control_init();
 #elif defined(CONFIG_WIFI_COMBO_MODULE_CONTROL_FUNC)
-    //rk29sdk_wifi_combo_module_gpio_init();
+    rk29sdk_wifi_combo_module_gpio_init();
 #endif
 
 #if defined(CONFIG_MT6620)