arm64/dts: Support goodix panel for proto-1.0

 - Use focaltech driver for dev-1.0 (Lbox)
 - Use goodix driver for proto-1.0 and newer

Bug: 214118475
Bug: 214018056
Test: Check touch works properly
Change-Id: Ifb41eacdfafdb8b6e620e57eb4ec29448837c9c6
Signed-off-by: Wendly Li <wendlyli@google.com>

5 files changed, 63 insertions, 8 deletions

diff --git a/dts/gs201-lynx-common.dtsi b/dts/gs201-lynx-common.dtsi
index cd8982a..56b58d8 100644
--- a/dts/gs201-lynx-common.dtsi
+++ b/dts/gs201-lynx-common.dtsi
@@ -25,7 +25,6 @@
 #include "gs201-lynx-camera.dtsi"
 #include "gs201-lynx-display.dtsi"
 #include "gs201-lynx-pmic.dtsi"
-#include "gs201-lynx-touch.dtsi"
 #include "gs201-lynx-thermal.dtsi"
 #include "gs201-lynx-audio.dtsi"
 #include "gs201-lynx-usb.dtsi"
diff --git a/dts/gs201-lynx-dev1_0.dts b/dts/gs201-lynx-dev1_0.dts
index 79f7dc0..ebef7c7 100644
--- a/dts/gs201-lynx-dev1_0.dts
+++ b/dts/gs201-lynx-dev1_0.dts
@@ -9,6 +9,7 @@
 /plugin/;
 
 #include "gs201-lynx-common.dtsi"
+#include "gs201-lynx-touch-dev1_0.dtsi"
 
 / {
 	board_id = <0x30501>;
diff --git a/dts/gs201-lynx-proto1_0.dts b/dts/gs201-lynx-proto1_0.dts
index fc7e28e..b0522c5 100644
--- a/dts/gs201-lynx-proto1_0.dts
+++ b/dts/gs201-lynx-proto1_0.dts
@@ -9,6 +9,7 @@
 /plugin/;
 
 #include "gs201-lynx-common.dtsi"
+#include "gs201-lynx-touch.dtsi"
 
 / {
 	board_id = <0x30502>;
diff --git a/dts/gs201-lynx-touch-dev1_0.dtsi b/dts/gs201-lynx-touch-dev1_0.dtsi
new file mode 100644
index 0000000..01876ae
--- /dev/null
+++ b/dts/gs201-lynx-touch-dev1_0.dtsi
@@ -0,0 +1,42 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Google L10 touch device tree source
+ *
+ * Copyright 2022 Google Inc.
+ *
+ */
+
+#include <dt-bindings/pinctrl/samsung.h>
+
+/*
+ * Touch is connected to spi_0, pins:
+ *   CLK=GPP20[0], MOSI=GPP20[1], MISO=GPP20[2], CS=GPP20[3]
+ * TS_RESET_L = C26 = XAPC_USI11_RTSN_DI = GPP23[2] = <&gpp23 2 0>
+ * TS_INT_L = AT22 = XEINT_8 = GPA7[0] = <&gpa7 0 0>
+ *
+ * DVDD = PP1800_L25M_TSP_DVDD = ??? = VLDO25M = "PP1800_L25M_TSP"?
+ * AVDD = PP3300_L26M_TS_AVDD  = ??? = VLDO26M = "PP3300_L26M_TSP"?
+ *
+ * AP2AOC: XHSI1_GPIO2 - GPH1[0] -> XAOC_GPIO13 - gpio_in[87]
+ * AOC2AP: XAOC_GPIO8 - gpio_in[74] -> XEINT_19 - GPA8[7]
+ */
+
+&spitouch {
+	status = "ok";
+	compatible = "focaltech,ts";
+
+	spi-max-frequency = <10000000>;
+
+	focaltech,irq-gpio = <&gpa7 0 0>;
+	focaltech,reset-gpio = <&gpp23 2 0>;
+	focaltech,max-touch-number = <10>;
+	focaltech,display-coords = <0 0 1079 2399>;
+	focaltech,panel_map = <&sdc_s6e3fc3_p10 0>;
+
+	controller-data {
+		cs-gpio = <&gpp20 3 0>;
+		samsung,spi-feedback-delay = <0>;
+		samsung,spi-chip-select-mode = <1>;
+		cs-clock-delay = <1>;
+	};
+};
diff --git a/dts/gs201-lynx-touch.dtsi b/dts/gs201-lynx-touch.dtsi
index 3272555..c9c2b51 100644
--- a/dts/gs201-lynx-touch.dtsi
+++ b/dts/gs201-lynx-touch.dtsi
@@ -2,11 +2,20 @@
 /*
  * Google L10 touch device tree source
  *
- * Copyright 2021 Google Inc.
+ * Copyright 2022 Google Inc.
  *
  */
 
 #include <dt-bindings/pinctrl/samsung.h>
+#include <dt-bindings/regulator/samsung,s2mpg-regulator.h>
+
+&m_ldo25_reg {
+	/delete-property/ regulator-always-on;
+};
+
+&m_ldo26_reg {
+	/delete-property/ regulator-always-on;
+};
 
 /*
  * Touch is connected to spi_0, pins:
@@ -23,15 +32,18 @@
 
 &spitouch {
 	status = "ok";
-	compatible = "focaltech,ts";
+	compatible = "goodix,nottingham";
 
 	spi-max-frequency = <10000000>;
 
-	focaltech,irq-gpio = <&gpa7 0 0>;
-	focaltech,reset-gpio = <&gpp23 2 0>;
-	focaltech,max-touch-number = <10>;
-	focaltech,display-coords = <0 0 1079 2399>;
-	focaltech,panel_map = <&sdc_s6e3fc3_p10 0>;
+	goodix,irq-gpio = <&gpa7 0 0>;
+	goodix,reset-gpio = <&gpp23 2 0>;
+	goodix,avdd-name = "avdd";
+	goodix,iovdd-name = "vdd";
+	goodix,irq-flags = <2>; /* 1:trigger rising, 2:trigger falling;*/
+	goodix,panel-max-x = <1080>;
+	goodix,panel-max-y = <2400>;
+	goodix,panel-max-w = <255>;
 
 	controller-data {
 		cs-gpio = <&gpp20 3 0>;