From: hjc <hjc@rock-chips.com>
Date: Thu, 28 Feb 2013 08:48:18 +0000 (+0800)
Subject: rk3168m: add rk3168m defconfig
X-Git-Tag: firefly_0821_release~7502
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1ddc75b53eb0d58f85a1266adbb363d1b3bdaad3;p=firefly-linux-kernel-4.4.55.git

rk3168m: add rk3168m defconfig
---

diff --git a/arch/arm/configs/rk3168m_tb_defconfig b/arch/arm/configs/rk3168m_tb_defconfig
index a64eb1b77fda..0cefbfed8e98 100644
--- a/arch/arm/configs/rk3168m_tb_defconfig
+++ b/arch/arm/configs/rk3168m_tb_defconfig
@@ -22,6 +22,7 @@ CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_ARCH_RK30=y
 # CONFIG_DDR_TEST is not set
+CONFIG_RK_CLOCK_PROC=y
 CONFIG_WIFI_COMBO_MODULE_CONTROL_FUNC=y
 CONFIG_SOC_RK3168M=y
 CONFIG_FIQ_DEBUGGER=y
@@ -282,6 +283,7 @@ CONFIG_TEST_POWER=y
 CONFIG_MFD_TPS65910=y
 CONFIG_MFD_WM831X_I2C=y
 CONFIG_MFD_TPS65090=y
+CONFIG_MFD_RK610=y
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_TPS65910=y
 CONFIG_REGULATOR_WM831X=y
@@ -303,9 +305,16 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_BACKLIGHT_GENERIC is not set
 CONFIG_DISPLAY_SUPPORT=y
 CONFIG_LCD_B101EW05=y
+CONFIG_RK610_LVDS=y
+# CONFIG_RK610_TVOUT is not set
 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_HDMI_SOURCE_LCDC1=y
 CONFIG_RGA_RK30=y
 CONFIG_LOGO=y
 # CONFIG_LOGO_LINUX_MONO is not set
diff --git a/arch/arm/mach-rk30/board-rk3168m-tb.c b/arch/arm/mach-rk30/board-rk3168m-tb.c
index 1ea076f451dd..d3d9c1ac4a92 100755
--- a/arch/arm/mach-rk30/board-rk3168m-tb.c
+++ b/arch/arm/mach-rk30/board-rk3168m-tb.c
@@ -533,7 +533,14 @@ struct rk29fb_info lcdc0_screen_info = {
 
 #if defined(CONFIG_LCDC1_RK3066B) || defined(CONFIG_LCDC1_RK3188)
 struct rk29fb_info lcdc1_screen_info = {
-	#if defined(CONFIG_RK_HDMI)
+	.prop	   = PRMRY,		//primary display device
+	.io_init   = rk_fb_io_init,
+	.io_disable = rk_fb_io_disable,
+	.io_enable = rk_fb_io_enable,
+	.set_screen_info = set_lcd_info,
+
+
+	#if 0 // defined(CONFIG_RK_HDMI)
 	.prop		= EXTEND,	//extend display device
 	.lcd_info  = NULL,
 	.set_screen_info = hdmi_init_lcdc,
@@ -625,10 +632,38 @@ static struct platform_device device_lcdc1 = {
 #endif
 
 #if defined(CONFIG_MFD_RK610)
-#define RK610_RST_PIN 			RK30_PIN2_PC5
+#define RK610_RST_PIN 			RK30_PIN2_PD5
+#define RK610_TEST_PIN 			RK30_PIN2_PD6
+#define RK610_ENABLE_PIN 		RK30_PIN0_PC5
 static int rk610_power_on_init(void)
 {
 	int ret;
+	if(RK610_ENABLE_PIN != INVALID_GPIO)
+	{
+		ret = gpio_request(RK610_ENABLE_PIN, "rk610 reset");
+		if (ret)
+		{
+			printk(KERN_ERR "rk610_control_probe request gpio fail\n");
+		}
+		else 
+		{
+			gpio_direction_output(RK610_ENABLE_PIN, GPIO_HIGH);
+			msleep(100);
+		}
+	}
+	if(RK610_TEST_PIN != INVALID_GPIO)
+	{
+		ret = gpio_request(RK610_TEST_PIN, "rk610 reset");
+		if (ret)
+		{
+			printk(KERN_ERR "rk610_control_probe request gpio fail\n");
+		}
+		else 
+		{
+			gpio_direction_output(RK610_TEST_PIN, GPIO_LOW);
+			msleep(100);
+		}
+	}
 	if(RK610_RST_PIN != INVALID_GPIO)
 	{
 		ret = gpio_request(RK610_RST_PIN, "rk610 reset");
@@ -1375,37 +1410,6 @@ static struct i2c_board_info __initdata i2c0_info[] = {
         },
 #endif
 
-#ifdef CONFIG_MFD_RK610
-		{
-			.type			= "rk610_ctl",
-			.addr			= 0x40,
-			.flags			= 0,
-			.platform_data		= &rk610_ctl_pdata,
-		},
-#ifdef CONFIG_RK610_TVOUT
-		{
-			.type			= "rk610_tvout",
-			.addr			= 0x42,
-			.flags			= 0,
-		},
-#endif
-#ifdef CONFIG_HDMI_RK610
-		{
-			.type			= "rk610_hdmi",
-			.addr			= 0x46,
-			.flags			= 0,
-			.irq			= INVALID_GPIO,
-		},
-#endif
-#ifdef CONFIG_SND_SOC_RK610
-		{//RK610_CODEC addr  from 0x60 to 0x80 (0x60~0x80)
-			.type			= "rk610_i2c_codec",
-			.addr			= 0x60,
-			.flags			= 0,
-			.platform_data		= &rk610_codec_pdata,					
-		},
-#endif
-#endif
 
 };
 #endif
@@ -1831,6 +1835,38 @@ static struct i2c_board_info __initdata i2c3_info[] = {
 
 #ifdef CONFIG_I2C4_RK30
 static struct i2c_board_info __initdata i2c4_info[] = {
+#ifdef CONFIG_MFD_RK610
+		{
+			.type			= "rk610_ctl",
+			.addr			= 0x40,
+			.flags			= 0,
+			.platform_data		= &rk610_ctl_pdata,
+		},
+#ifdef CONFIG_RK610_TVOUT
+		{
+			.type			= "rk610_tvout",
+			.addr			= 0x42,
+			.flags			= 0,
+		},
+#endif
+#ifdef CONFIG_HDMI_RK610
+		{
+			.type			= "rk610_hdmi",
+			.addr			= 0x46,
+			.flags			= 0,
+			.irq			= INVALID_GPIO,
+		},
+#endif
+#ifdef CONFIG_SND_SOC_RK610
+		{//RK610_CODEC addr  from 0x60 to 0x80 (0x60~0x80)
+			.type			= "rk610_i2c_codec",
+			.addr			= 0x60,
+			.flags			= 0,
+			.platform_data		= &rk610_codec_pdata,					
+		},
+#endif
+#endif
+
 };
 #endif