Merge branch 'CR_3167_gt911_ts_515_changhuang.liang' into 'vf2-515-de…

…vel' CR_3167_gt911_ts_515_changhuang.liang Revert "riscv: defconfig: Enable GT9xx" See merge request sbc/linux!65
starfive-tech · Feb 20, 2023 · 4639179 · 4639179
2 parents a4e8f1a + c6d90b4
commit 4639179
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 1,985 deletions.
diff --git a/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2.dtsi b/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2.dtsi
@@ -424,14 +424,11 @@
 		};
 	};
 
-	gt9xx: gt9xx@14 {
-		compatible = "goodix,gt9xx";
+	touchscreen@14 {
+		compatible = "goodix,gt911";
 		reg = <0x14>;
-		touch-gpio = <&gpio 30 IRQ_TYPE_LEVEL_LOW>;
-		reset-gpio = <&gpio 31 GPIO_ACTIVE_HIGH>;
-		max-x = <800>;
-		max-y = <1280>;
-		tp-size = <9112>;
+		irq-gpios = <&gpio 30 GPIO_ACTIVE_HIGH>;
+		reset-gpios = <&gpio 31 GPIO_ACTIVE_HIGH>;
 	};
 };
 

diff --git a/arch/riscv/boot/dts/starfive/jh7110.dtsi b/arch/riscv/boot/dts/starfive/jh7110.dtsi
@@ -10,8 +10,8 @@
 #include <dt-bindings/clock/starfive-jh7110-clkgen.h>
 #include <dt-bindings/clock/starfive-jh7110-vout.h>
 #include <dt-bindings/clock/starfive-jh7110-isp.h>
-#include <dt-bindings/power/jh7110-power.h>
 #include <dt-bindings/interrupt-controller/irq.h>
+#include <dt-bindings/power/jh7110-power.h>
 
 / {
 	compatible = "starfive,jh7110";

diff --git a/arch/riscv/configs/starfive_visionfive2_defconfig b/arch/riscv/configs/starfive_visionfive2_defconfig
@@ -156,7 +156,7 @@ CONFIG_INPUT_EVDEV=y
 # CONFIG_INPUT_KEYBOARD is not set
 # CONFIG_INPUT_MOUSE is not set
 CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_GT9XX=y
+CONFIG_TOUCHSCREEN_GOODIX=y
 CONFIG_TOUCHSCREEN_TINKER_FT5406=y
 CONFIG_SERIO_LIBPS2=y
 CONFIG_SERIAL_8250=y

diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
@@ -400,19 +400,6 @@ config TOUCHSCREEN_GOODIX
 	  To compile this driver as a module, choose M here: the
 	  module will be called goodix.
 
-config TOUCHSCREEN_GT9XX
-	tristate "Goodix touch screen gt9xx support for rockchip based platform"
-	depends on I2C
-	help
-	  Say Y here if you have a touchscreen interface using the
-	  two goodix gt9xx, and your board-specific initialization
-	  code includes that in its table of IIC devices.
-
-	  If unsure, say N.
-
-	  To compile this driver as a module, choose M here: the
-	  module will be called gt9xx.
-
 config TOUCHSCREEN_HIDEEP
 	tristate "HiDeep Touch IC"
 	depends on I2C

diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile
@@ -45,7 +45,6 @@ obj-$(CONFIG_TOUCHSCREEN_EGALAX_SERIAL)	+= egalax_ts_serial.o
 obj-$(CONFIG_TOUCHSCREEN_EXC3000)	+= exc3000.o
 obj-$(CONFIG_TOUCHSCREEN_FUJITSU)	+= fujitsu_ts.o
 obj-$(CONFIG_TOUCHSCREEN_GOODIX)	+= goodix.o
-obj-$(CONFIG_TOUCHSCREEN_GT9XX)	+= gt9xx.o
 obj-$(CONFIG_TOUCHSCREEN_HIDEEP)	+= hideep.o
 obj-$(CONFIG_TOUCHSCREEN_ILI210X)	+= ili210x.o
 obj-$(CONFIG_TOUCHSCREEN_ILITEK)	+= ilitek_ts_i2c.o

diff --git a/drivers/input/touchscreen/goodix.c b/drivers/input/touchscreen/goodix.c
@@ -444,12 +444,12 @@ static irqreturn_t goodix_ts_irq_handler(int irq, void *dev_id)
 
 static void goodix_free_irq(struct goodix_ts_data *ts)
 {
-	devm_free_irq(&ts->client->dev, ts->client->irq, ts);
+	devm_free_irq(&ts->client->dev, gpiod_to_irq(ts->gpiod_int), ts);
 }
 
 static int goodix_request_irq(struct goodix_ts_data *ts)
 {
-	return devm_request_threaded_irq(&ts->client->dev, ts->client->irq,
+	return devm_request_threaded_irq(&ts->client->dev, gpiod_to_irq(ts->gpiod_int),
 					 NULL, goodix_ts_irq_handler,
 					 ts->irq_flags, ts->client->name, ts);
 }