From: xjh <xujh@rock-chips.com>
Date: Tue, 5 Aug 2014 09:21:04 +0000 (+0800)
Subject: TP: sdk support goodix
X-Git-Tag: firefly_0821_release~4916^2~55
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fa1743b3da75a304110c4fbe7c66b066a6063289;p=firefly-linux-kernel-4.4.55.git

TP: sdk support goodix
---

diff --git a/arch/arm/boot/dts/rk312x-sdk.dtsi b/arch/arm/boot/dts/rk312x-sdk.dtsi
index b580aa5c4606..18cc9b67c6e0 100755
--- a/arch/arm/boot/dts/rk312x-sdk.dtsi
+++ b/arch/arm/boot/dts/rk312x-sdk.dtsi
@@ -131,6 +131,16 @@
 };
 &i2c2 {
 	status = "okay";
+	ts@55 {
+		compatible = "goodix,gt8xx";
+		reg = <0x55>;
+		touch-gpio = <&gpio1 GPIO_B0 IRQ_TYPE_LEVEL_LOW>;
+		reset-gpio = <&gpio2 GPIO_C1 GPIO_ACTIVE_LOW>;
+		//power-gpio = <&gpio0 GPIO_C5 GPIO_ACTIVE_LOW>;
+		max-x = <1280>;
+		max-y = <800>;
+	};
+	/*
 	ts@01 {
 		compatible = "ct,vtl_ts";
 		reg = <0x01>;
@@ -139,6 +149,7 @@
 		irq_gpio_number = <&gpio1 GPIO_B0 IRQ_TYPE_LEVEL_LOW>;
 		rst_gpio_number = <&gpio2 GPIO_C1 GPIO_ACTIVE_HIGH>;
 	};
+	*/
 };
 
 &fb {
diff --git a/drivers/input/touchscreen/rk29_i2c_goodix.c b/drivers/input/touchscreen/rk29_i2c_goodix.c
index 4646e3cda5c1..8aa6c851950a 100755
--- a/drivers/input/touchscreen/rk29_i2c_goodix.c
+++ b/drivers/input/touchscreen/rk29_i2c_goodix.c
@@ -801,7 +801,7 @@ static int rk_ts_probe(struct i2c_client *client, const struct i2c_device_id *id
 			printk(KERN_ALERT "Cannot allocate ts INT!ERRNO:%d\n", ret);
 			goto err;
 		}
-		disable_irq(ts->irq);
+		//disable_irq(ts->irq);
 	}
 	printk("goodix_ts_init: probe successfully!\n");
 	return 0;