TP: sdk support goodix

diff --git a/arch/arm/boot/dts/rk312x-sdk.dtsi b/arch/arm/boot/dts/rk312x-sdk.dtsi
index b580aa5c4606d5ea7859171ff842c2ba8e7c818e..18cc9b67c6e04e6b325fa49b53f339dbb66ecc42 100755 (executable)
--- 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 4646e3cda5c18c4c9dc5dff75e01b62ba502f735..8aa6c851950a39b6151275f41dc4e0c30348515a 100755 (executable)
--- 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);\r
                        goto err;\r
                }\r
-               disable_irq(ts->irq);\r
+               //disable_irq(ts->irq);\r
        }\r
        printk("goodix_ts_init: probe successfully!\n");\r
        return 0;\r