From d8bc9d0432d6f4bad346c6011cacb5621c1e10f9 Mon Sep 17 00:00:00 2001
From: MarvelMathesh <123v.mathesh@gmail.com>
Date: Thu, 11 Apr 2024 23:44:10 +0530
Subject: [PATCH 1/2] Add support for 10or G (G) Adhere to the officially
 rebranded name.

Adjust memory allocation for the pstore logs.

Use the touchscreen-compatible support to associate the
Goodix GT917D touchscreen with panels Ilitek ili7807 and
Focaltech ft5406 with panel Himax hx8399c.
---
 README.md                                      |  1 +
 ...53-tenor-holland.dts => msm8953-10or-G.dts} | 18 ++++++++++--------
 dts/rules.mk                                   |  2 +-
 3 files changed, 12 insertions(+), 9 deletions(-)
 rename dts/{msm8953-tenor-holland.dts => msm8953-10or-G.dts} (51%)

diff --git a/README.md b/README.md
index d144b04e8..d6d83a9d1 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,7 @@ and then loaded by lk2nd.
 - SDM632
 
 ### Supported devices
+- 10or G (G)
 - Motorola Moto G4 Play (harpia)
 - Motorola Moto G5 Plus (potter)
 - Samsung Galaxy A3 (2015) - SM-A300FU
diff --git a/dts/msm8953-tenor-holland.dts b/dts/msm8953-10or-G.dts
similarity index 51%
rename from dts/msm8953-tenor-holland.dts
rename to dts/msm8953-10or-G.dts
index 051cceefa..0e2e410b6 100644
--- a/dts/msm8953-tenor-holland.dts
+++ b/dts/msm8953-10or-G.dts
@@ -10,24 +10,26 @@
 	qcom,board-id= <0x2000b 0x0>;
 	qcom,pmic-id = <0x10016 0x10011 0x00 0x00>;
 
-	model = "10Or G";
-	compatible = "tenor,g", "qcom,msm8953", "lk2nd,device";
-	lk2nd,pstore = <0x9ff00000 0x100000>;
+	model = "10or G";
+	compatible = "10or,G", "qcom,msm8953", "lk2nd,device";
+	lk2nd,pstore = <0x9ff00000 0x300000>;
 	
 	panel {
-		
-			compatible = "tenor,g-panel";
+			compatible = "10or,G-panel";
 
 			qcom,mdss_dsi_hx8399c_auo_53_1080p_video {
-				compatible = "tenor,hx8399c_auo";
+				compatible = "10or,hx8399c_auo";
+				touchscreen-compatible = "edt,edt-ft5406";
 			};
 
 			qcom,mdss_dsi_ili7807d_djn_53_1080p_video {
-				compatible = "tenor,ili7807d_djn";
+				compatible = "10or,ili7807d_djn";
+				touchscreen-compatible = "goodix,gt917d";
 			};
 
 			qcom,mdss_dsi_ili7807d_djn_auo_53_1080p_video {
-				compatible = "tenor,ili7807d_djn_auo";
+				compatible = "10or,ili7807d_djn_auo";
+				touchscreen-compatible = "goodix,gt917d";
 			};
 
 		};
diff --git a/dts/rules.mk b/dts/rules.mk
index 4c4d330b0..597e21e76 100644
--- a/dts/rules.mk
+++ b/dts/rules.mk
@@ -7,11 +7,11 @@ DTBS += \
 endif
 ifeq ($(PROJECT), msm8953-secondary)
 DTBS += \
+	$(LOCAL_DIR)/msm8953-10or-G.dtb \
 	$(LOCAL_DIR)/msm8953-huawei-milan.dtb \
 	$(LOCAL_DIR)/msm8953-lenovo-kuntao.dtb \
 	$(LOCAL_DIR)/msm8953-meizu-m1721.dtb \
 	$(LOCAL_DIR)/msm8953-motorola-potter.dtb \
-	$(LOCAL_DIR)/msm8953-tenor-holland.dtb \
 	$(LOCAL_DIR)/msm8953-xiaomi-common.dtb \
 	$(LOCAL_DIR)/msm8953-xiaomi-daisy.dtb \
 	$(LOCAL_DIR)/msm8953-xiaomi-markw.dtb \

From 24ed727bc5c7b6a6e9e51f61d87011419822a527 Mon Sep 17 00:00:00 2001
From: MarvelMathesh <76835656+MarvelMathesh@users.noreply.github.com>
Date: Sat, 18 May 2024 00:29:30 +0530
Subject: [PATCH 2/2] Device specific
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Barnabás Czémán <barni2000@users.noreply.github.com>
---
 dts/{msm8953-10or-G.dts => msm8953-10or-g.dts} | 18 +++++++++---------
 dts/rules.mk                                   |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)
 rename dts/{msm8953-10or-G.dts => msm8953-10or-g.dts} (53%)

diff --git a/dts/msm8953-10or-G.dts b/dts/msm8953-10or-g.dts
similarity index 53%
rename from dts/msm8953-10or-G.dts
rename to dts/msm8953-10or-g.dts
index 0e2e410b6..bf2c92c63 100644
--- a/dts/msm8953-10or-G.dts
+++ b/dts/msm8953-10or-g.dts
@@ -11,25 +11,25 @@
 	qcom,pmic-id = <0x10016 0x10011 0x00 0x00>;
 
 	model = "10or G";
-	compatible = "10or,G", "qcom,msm8953", "lk2nd,device";
-	lk2nd,pstore = <0x9ff00000 0x300000>;
+	compatible = "10or,g", "qcom,msm8953", "lk2nd,device";
+	lk2nd,pstore = <0x9ff00000 0x100000>;
 	
 	panel {
-			compatible = "10or,G-panel";
+			compatible = "10or,g-panel";
 
 			qcom,mdss_dsi_hx8399c_auo_53_1080p_video {
-				compatible = "10or,hx8399c_auo";
-				touchscreen-compatible = "edt,edt-ft5406";
+				compatible = "10or,g-hx8399c-auo";
+				// touchscreen-compatible = "edt,edt-ft5406";
 			};
 
 			qcom,mdss_dsi_ili7807d_djn_53_1080p_video {
-				compatible = "10or,ili7807d_djn";
-				touchscreen-compatible = "goodix,gt917d";
+				compatible = "10or,g-ili7807d-djn";
+				// touchscreen-compatible = "goodix,gt917d";
 			};
 
 			qcom,mdss_dsi_ili7807d_djn_auo_53_1080p_video {
-				compatible = "10or,ili7807d_djn_auo";
-				touchscreen-compatible = "goodix,gt917d";
+				compatible = "10or,g-ili7807d-djn-auo";
+				// touchscreen-compatible = "goodix,gt917d";
 			};
 
 		};
diff --git a/dts/rules.mk b/dts/rules.mk
index 597e21e76..2239da1a5 100644
--- a/dts/rules.mk
+++ b/dts/rules.mk
@@ -7,7 +7,7 @@ DTBS += \
 endif
 ifeq ($(PROJECT), msm8953-secondary)
 DTBS += \
-	$(LOCAL_DIR)/msm8953-10or-G.dtb \
+	$(LOCAL_DIR)/msm8953-10or-g.dtb \
 	$(LOCAL_DIR)/msm8953-huawei-milan.dtb \
 	$(LOCAL_DIR)/msm8953-lenovo-kuntao.dtb \
 	$(LOCAL_DIR)/msm8953-meizu-m1721.dtb \