From: lw <lw@rock-chips.com>
Date: Wed, 7 Mar 2012 06:26:39 +0000 (+0800)
Subject: rk30:modify goodix touch screen initialize
X-Git-Tag: firefly_0821_release~9595^2~85
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5f3f34791dbb02994fe01be00cffbe899cd51fec;p=firefly-linux-kernel-4.4.55.git

rk30:modify goodix touch screen initialize
---

diff --git a/arch/arm/mach-rk30/board-rk30-sdk.c b/arch/arm/mach-rk30/board-rk30-sdk.c
index c28a73f87299..fb043c2f1c32 100755
--- a/arch/arm/mach-rk30/board-rk30-sdk.c
+++ b/arch/arm/mach-rk30/board-rk30-sdk.c
@@ -59,26 +59,33 @@ int goodix_init_platform_hw(void)
 {
 	int ret;
 	printk("goodix_init_platform_hw\n");
-	ret = gpio_request(TOUCH_PWR_PIN, "goodix power pin");
-	if(ret != 0){
-		gpio_free(TOUCH_PWR_PIN);
-		printk("goodix power error\n");
-		return -EIO;
+	if(TOUCH_PWR_PIN != INVALID_GPIO)
+	{
+		ret = gpio_request(TOUCH_PWR_PIN, "goodix power pin");
+		if(ret != 0){
+			gpio_free(TOUCH_PWR_PIN);
+			printk("goodix power error\n");
+			return -EIO;
+		}
+		gpio_direction_output(TOUCH_PWR_PIN, 0);
+		gpio_set_value(TOUCH_PWR_PIN,GPIO_LOW);
+		msleep(100);
 	}
-	gpio_direction_output(TOUCH_PWR_PIN, 0);
-	gpio_set_value(TOUCH_PWR_PIN,GPIO_LOW);
-	msleep(100);
-	ret = gpio_request(TOUCH_RESET_PIN, "goodix reset pin");
-	if(ret != 0){
-		gpio_free(TOUCH_RESET_PIN);
-		printk("goodix gpio_request error\n");
-		return -EIO;
+	
+	if(TOUCH_RESET_PIN != INVALID_GPIO)
+	{
+		ret = gpio_request(TOUCH_RESET_PIN, "goodix reset pin");
+		if(ret != 0){
+			gpio_free(TOUCH_RESET_PIN);
+			printk("goodix gpio_request error\n");
+			return -EIO;
+		}
+		gpio_direction_output(TOUCH_RESET_PIN, 0);
+		gpio_set_value(TOUCH_RESET_PIN,GPIO_LOW);
+		msleep(10);
+		gpio_set_value(TOUCH_RESET_PIN,GPIO_HIGH);
+		msleep(500);
 	}
-	gpio_direction_output(TOUCH_RESET_PIN, 0);
-	gpio_set_value(TOUCH_RESET_PIN,GPIO_LOW);
-	msleep(10);
-	gpio_set_value(TOUCH_RESET_PIN,GPIO_HIGH);
-	msleep(500);
 	return 0;
 }