From: wuhao <wuhao@wuhao@rock-chips.com>
Date: Wed, 23 Jan 2013 02:09:53 +0000 (+0800)
Subject: rk3168 ds1006: config hdmi support
X-Git-Tag: firefly_0821_release~7846
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=880c9f656ccd8f7b97ed2fb0a834b834d2d45418;p=firefly-linux-kernel-4.4.55.git

rk3168 ds1006: config hdmi support
---

diff --git a/arch/arm/configs/rk3168_ds1006h_defconfig b/arch/arm/configs/rk3168_ds1006h_defconfig
index 623ca7fb5771..d580667c2502 100644
--- a/arch/arm/configs/rk3168_ds1006h_defconfig
+++ b/arch/arm/configs/rk3168_ds1006h_defconfig
@@ -296,7 +296,6 @@ CONFIG_VIDEO_RK29_CAMMEM_ION=y
 CONFIG_ION=y
 CONFIG_ION_ROCKCHIP=y
 CONFIG_FB=y
-CONFIG_FB_MODE_HELPERS=y
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 # CONFIG_LCD_CLASS_DEVICE is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
@@ -305,9 +304,13 @@ CONFIG_DISPLAY_SUPPORT=y
 CONFIG_LCD_DS1006H=y
 CONFIG_RK610_LVDS=y
 CONFIG_FB_ROCKCHIP=y
+CONFIG_ONE_LCDC_DUAL_OUTPUT_INF=y
 CONFIG_LCDC_RK3066B=y
 # CONFIG_LCDC0_RK3066B is not set
 CONFIG_LCDC1_RK3066B=y
+CONFIG_RK_HDMI=y
+CONFIG_HDMI_RK610=y
+CONFIG_RK_HDMI_CTL_CODEC=y
 CONFIG_RGA_RK30=y
 CONFIG_LOGO=y
 # CONFIG_LOGO_LINUX_MONO is not set
diff --git a/drivers/video/rockchip/hdmi/chips/rk610/rk610_hdmi.h b/drivers/video/rockchip/hdmi/chips/rk610/rk610_hdmi.h
index 746283e7a8ee..1dca4a38344e 100755
--- a/drivers/video/rockchip/hdmi/chips/rk610/rk610_hdmi.h
+++ b/drivers/video/rockchip/hdmi/chips/rk610/rk610_hdmi.h
@@ -2,7 +2,11 @@
 #define __RK610_HDMI_H__
 #include "../../rk_hdmi.h"
 
+#if defined(CONFIG_MACH_RK3168_DS1006H)
+#define HDMI_SOURCE_DEFAULT HDMI_SOURCE_LCDC1
+#else
 #define HDMI_SOURCE_DEFAULT HDMI_SOURCE_LCDC0
+#endif
 //#define HDMI_USE_IRQ
 
 struct rk610_hdmi_pdata {