Move to new xiaomi-touch driver

Change-Id: Ie2e3430dbba8003739561a0843a19bdfda7cdcf0
2026-01-27 14:44:08 +00:00 · 2024-12-28 22:46:40 +01:00
parent 56b3e28521
commit 0e9cfa7c2b
20 changed files with 48 additions and 63 deletions
--- a/qcom/cupid-sm8450.dtsi
+++ b/qcom/cupid-sm8450.dtsi
@@ -15,12 +15,6 @@
 		status = "ok";
 	};

-	xiaomi_touch {
-		compatible = "xiaomi-touch";
-		status = "ok";
-		touch,name = "xiaomi-touch";
-	};
-
 	md_testing_mode {
 		compatible = "modem,md-testing-mode";
 		status-gpio = <&tlmm 83 0x00>,
--- a/qcom/display/display/cupid-sde-display-mtp.dtsi
+++ b/qcom/display/display/cupid-sde-display-mtp.dtsi
@@ -295,6 +295,10 @@
 		panel = <&dsi_l3_42_02_0a_dsc_cmd
 			&dsi_r66451_amoled_video>;
 	};
+	xiaomi-touch  {
+		panel-primary = <&dsi_l3_42_02_0a_dsc_cmd
+			&dsi_r66451_amoled_video>;
+	};
 };

 &spmi_bus {
--- a/qcom/display/display/diting-sde-display-mtp.dtsi
+++ b/qcom/display/display/diting-sde-display-mtp.dtsi
@@ -171,4 +171,9 @@
 			&dsi_l12_36_02_0b_dsc_cmd
 			&dsi_r66451_amoled_video>;
 	};
+	xiaomi-touch  {
+		panel-primary = <&dsi_l12_42_02_0a_dsc_cmd
+			&dsi_l12_36_02_0b_dsc_cmd
+			&dsi_r66451_amoled_video>;
+	};
 };
--- a/qcom/display/display/marble-sde-display-mtp.dtsi
+++ b/qcom/display/display/marble-sde-display-mtp.dtsi
@@ -176,6 +176,11 @@
 		panel = <&dsi_m16t_36_02_0a_dsc_vid &dsi_m16t_36_0d_0b_dsc_vid
 		&dsi_r66451_amoled_video>;
 	};
+	xiaomi-touch  {
+		panel-primary = <&dsi_m16t_36_02_0a_dsc_vid
+			&dsi_m16t_36_0d_0b_dsc_vid
+			&dsi_r66451_amoled_video>;
+	};
 };

 &spmi_bus {
--- a/qcom/display/display/mayfly-sde-display-mtp.dtsi
+++ b/qcom/display/display/mayfly-sde-display-mtp.dtsi
@@ -129,6 +129,10 @@
 		panel = <&dsi_l3s_42_02_0a_dsc_cmd
 			&dsi_r66451_amoled_video>;
 	};
+	xiaomi-touch  {
+		panel-primary = <&dsi_l3s_42_02_0a_dsc_cmd
+			&dsi_r66451_amoled_video>;
+	};
 };

 &spmi_bus {
--- a/qcom/display/display/mondrian-sde-display-mtp.dtsi
+++ b/qcom/display/display/mondrian-sde-display-mtp.dtsi
@@ -130,4 +130,8 @@
 		panel = <&dsi_m11a_42_02_0a_dsc_cmd
 			&dsi_r66451_amoled_video>;
 	};
+	xiaomi-touch  {
+		panel-primary = <&dsi_m11a_42_02_0a_dsc_cmd
+			&dsi_r66451_amoled_video>;
+	};
 };
--- a/qcom/display/display/thor-sde-display-cape-mtp.dtsi
+++ b/qcom/display/display/thor-sde-display-cape-mtp.dtsi
@@ -225,6 +225,10 @@
 		panel = <&dsi_l1_38_0c_0a_dsc_cmd
 			&dsi_r66451_amoled_video>;
 	};
+	xiaomi-touch  {
+		panel-primary = <&dsi_l1_38_0c_0a_dsc_cmd
+			&dsi_r66451_amoled_video>;
+	};
 };

 &spmi_bus {
--- a/qcom/display/display/unicorn-sde-display-mtp.dtsi
+++ b/qcom/display/display/unicorn-sde-display-mtp.dtsi
@@ -262,6 +262,11 @@
 		panel = <&dsi_l2s_38_0c_0a_dsc_cmd &dsi_l2s_42_02_0b_dsc_cmd
 			&dsi_r66451_amoled_video>;
 	};
+	xiaomi-touch  {
+		panel-primary = <&dsi_l2s_38_0c_0a_dsc_cmd
+			&dsi_l2s_42_02_0b_dsc_cmd
+			&dsi_r66451_amoled_video>;
+	};
 };

 &spmi_bus {
--- a/qcom/display/display/zeus-sde-display-mtp.dtsi
+++ b/qcom/display/display/zeus-sde-display-mtp.dtsi
@@ -353,6 +353,10 @@
 		panel = <&dsi_l2_38_0c_0a_dsc_cmd
 			&dsi_r66451_amoled_video>;
 	};
+	xiaomi-touch  {
+		panel-primary = <&dsi_l2_38_0c_0a_dsc_cmd
+			&dsi_r66451_amoled_video>;
+	};
 };

 &spmi_bus {
--- a/qcom/display/display/ziyi-sde-display-idp.dtsi
+++ b/qcom/display/display/ziyi-sde-display-idp.dtsi
@@ -460,6 +460,12 @@
 			&dsi_l9s_42_02_0a_mp_amoled_dsc_cmd
 			&dsi_r66451_amoled_video>;
 	};
+	xiaomi-touch  {
+		panel-primary = <&dsi_l9s_42_02_0a_mp_amoled_dsc_cmd
+			&dsi_l9s_36_02_0b_mp_amoled_dsc_cmd
+			&dsi_l9s_42_02_0a_mp_amoled_dsc_cmd
+			&dsi_r66451_amoled_video>;
+	};
 };

 &sde_dsi1 {
--- a/qcom/display/display/zizhan-sde-display-cape-mtp.dtsi
+++ b/qcom/display/display/zizhan-sde-display-cape-mtp.dtsi
@@ -302,6 +302,13 @@
 		panel_sec = <&dsi_l18_38_0c_0a_sec_dsc_cmd
 				&dsi_r66451_amoled_video>;
        };
+
+	xiaomi-touch  {
+		panel-primary = <&dsi_l18_38_0c_0a_prim_dsc_cmd
+			&dsi_r66451_amoled_video>;
+		panel-secondary = <&dsi_l18_38_0c_0a_sec_dsc_cmd
+			&dsi_r66451_amoled_video>;
+	};
 };

 &spmi_bus {
--- a/qcom/diting-sm8475.dtsi
+++ b/qcom/diting-sm8475.dtsi
@@ -5,12 +5,6 @@
 #include "diting-pinctrl.dtsi"
 #include "xiaomi-sm8475-common.dtsi"
 &soc {
-	xiaomi_touch {
-		compatible = "xiaomi-touch";
-		status = "ok";
-		touch,name = "xiaomi-touch";
-	};
-
        thermal_message: thermal-message {
                board-sensor = "VIRTUAL-SENSOR0";
        };
--- a/qcom/marble-sm7475.dtsi
+++ b/qcom/marble-sm7475.dtsi
@@ -40,12 +40,6 @@
 };

 &soc {
-	xiaomi_touch {
-		compatible = "xiaomi-touch";
-		status = "ok";
-		touch,name = "xiaomi-touch";
-	};
-
 	fingerprint_fpc {
 		status = "ok";
 		compatible = "fpc,fpc1020";
--- a/qcom/mayfly-sm8475.dtsi
+++ b/qcom/mayfly-sm8475.dtsi
@@ -4,13 +4,6 @@
 */
 #include "mayfly-pinctrl.dtsi"
 #include "xiaomi-sm8475-common.dtsi"
-&soc {
-	xiaomi_touch {
-		compatible = "xiaomi-touch";
-		status = "ok";
-		touch,name = "xiaomi-touch";
-	};
-};

 &tlmm {
 	mi_ts_active: mi_ts_active {
--- a/qcom/mondrian-sm8475.dtsi
+++ b/qcom/mondrian-sm8475.dtsi
@@ -6,12 +6,6 @@
 #include "mondrian-pinctrl.dtsi"
 #include "xiaomi-sm8475-common.dtsi"
 &soc {
-	xiaomi_touch {
-		compatible = "xiaomi-touch";
-		status = "ok";
-		touch,name = "xiaomi-touch";
-	};
-
        thermal_message: thermal-message {
                board-sensor = "VIRTUAL-SENSOR";
        };
--- a/qcom/thor-sm8475.dtsi
+++ b/qcom/thor-sm8475.dtsi
@@ -82,12 +82,6 @@
 };

 &soc {
-	xiaomi_touch {
-		compatible = "xiaomi-touch";
-		status = "ok";
-		touch,name = "xiaomi-touch";
-	};
-
    fingerprint_goodix {
         compatible = "goodix,fingerprint";
         vdda-supply = <&L11C>;
--- a/qcom/unicorn-sm8475.dtsi
+++ b/qcom/unicorn-sm8475.dtsi
@@ -244,12 +244,6 @@
 		enable-active-high;
 		gpio = <&tlmm 97 0>;
 	};
-
-	xiaomi_touch {
-		compatible = "xiaomi-touch";
-		status = "ok";
-		touch,name = "xiaomi-touch";
-	};
 };

 &tlmm {
--- a/qcom/zeus-sm8450.dtsi
+++ b/qcom/zeus-sm8450.dtsi
@@ -13,12 +13,6 @@
 		gpio = <&tlmm 97 0>;
 	};

-	xiaomi_touch {
-		compatible = "xiaomi-touch";
-		status = "ok";
-		touch,name = "xiaomi-touch";
-	};
-
 	fingerprint_goodix {
 		compatible = "goodix,fingerprint";
 		vdda-supply = <&L11C>;
--- a/qcom/ziyi-sm7450.dtsi
+++ b/qcom/ziyi-sm7450.dtsi
@@ -354,14 +354,6 @@
    };
 };

-&soc {
-    xiaomi_touch {
-        compatible = "xiaomi-touch";
-        status = "ok";
-        touch,name = "xiaomi-touch";
-    };
-};
-
 &qupv3_se0_spi {
    status = "ok";
    qcom,rt;
--- a/qcom/zizhan-sm8475.dtsi
+++ b/qcom/zizhan-sm8475.dtsi
@@ -366,12 +366,6 @@
 	bcl-ibat {
 		enable-ibatset-16ms;
 	};
-
-	xiaomi_touch {
-		compatible = "xiaomi-touch";
-		status = "ok";
-		touch,name = "xiaomi-touch";
-	};
 };

 &S1C {