From: strongtz <strongtz@yeah.net>
Date: 星期天, 28 Jun 2020 05:02:18 +0000 (+0800)
Subject: Update device tree
X-Git-Tag: v0.1.2~6
X-Git-Url: https://git.renegade-project.org/?a=commitdiff_plain;h=2e270fbf81f394fc634c39266123f13c84e0f6c3;p=edk2-sdm845.git

Update device tree
---

diff --git a/sdm845Pkg/FdtBlob/sdm845-xiaomi-polaris.dtb b/sdm845Pkg/FdtBlob/sdm845-xiaomi-polaris.dtb
index 2e19422..bc8d5dc 100644
Binary files a/sdm845Pkg/FdtBlob/sdm845-xiaomi-polaris.dtb and b/sdm845Pkg/FdtBlob/sdm845-xiaomi-polaris.dtb differ
diff --git a/sdm845Pkg/FdtBlob/sdm845-xiaomi-polaris.dts b/sdm845Pkg/FdtBlob/sdm845-xiaomi-polaris.dts
index 8eaf37c..a723537 100644
--- a/sdm845Pkg/FdtBlob/sdm845-xiaomi-polaris.dts
+++ b/sdm845Pkg/FdtBlob/sdm845-xiaomi-polaris.dts
@@ -409,17 +409,24 @@
 /* touchscreen */
 &i2c14 {
 	status = "okay";
+	pinctrl-names = "default", "sleep";
+	pinctrl-0 = <&qupv3_se14_i2c_active>;
+	pinctrl-1 = <&qupv3_se14_i2c_sleep>;
 	clock-frequency = <400000>;
 
-	rmi4-i2c-dev@20 {
+	touchscreen: synaptics-dsi-i2c@20 {
 		compatible = "syna,rmi4-i2c";
 		reg = <0x20>;
 		#address-cells = <1>;
 		#size-cells = <0>;
-		interrupt-parent = <&tlmm>;
-		interrupts = <125 8200>;
+		interrupts-extended = <&tlmm 125 0x2008>;
+		pinctrl-names = "pmx_ts_active", "pmx_ts_suspend";
+		pinctrl-0 = <&ts_active>;
+		pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>;
 		vdd-supply = <&vreg_l14a_1p8>;
 		vio-supply = <&vreg_tp_vddio>;
+		syna,reset-delay-ms = <200>;
+		syna,startup-delay-ms = <200>;
 
 		rmi4-f01@1 {
 			reg = <0x1>;
@@ -433,6 +440,7 @@
 			syna,clip-x-high = <1080>;
 			syna,clip-y-low = <0>;
 			syna,clip-y-high = <2160>;
+			syna,rezero-wait-ms = <200>;
 		};
 	};
 };
@@ -467,6 +475,71 @@
 
 &tlmm {
 	gpio-reserved-ranges = <0 4>, <81 4>;
+
+	qupv3_se14_i2c_active: qupv3-se14-i2c-active {
+		pinmux {
+			pins = "gpio33", "gpio34";
+			function = "qup14";
+		};
+
+		pinconf {
+			pins = "gpio33", "gpio34";
+			bias-disable;
+			drive-strength = <2>;
+		};
+	};
+
+	qupv3_se14_i2c_sleep: qupv3-se14-i2c-sleep {
+		pinmux {
+			pins = "gpio33", "gpio34";
+			function = "gpio";
+		};
+
+		pinconf {
+			pins = "gpio33", "gpio34";
+			bias-pull-up;
+			drive-strength = <2>;
+		};
+	};
+
+	ts_active: ts-active {
+		pinmux {
+			pins = "gpio99", "gpio125";
+			function = "gpio";
+		};
+
+		pinconf {
+			pins = "gpio99", "gpio125";
+			bias-pull-up;
+			drive-strength = <16>;
+		};
+	};
+
+	ts_int_suspend: ts-int-suspend {
+		pinmux {
+			pins = "gpio125";
+			function = "gpio";
+		};
+
+		pinconf {
+			pins = "gpio125";
+			bias-disable;
+			drive-strength = <2>;
+		};
+	};
+
+	ts_reset_suspend: ts-reset-suspend {
+		pinmux {
+			pins = "gpio99";
+			function = "gpio";
+		};
+
+		pinconf {
+			pins = "gpio99";
+			bias-disable;
+			drive-strength = <0x2>;
+		};
+	};
 };
 
 &uart6 {
@@ -483,6 +556,38 @@
 };
 
 
+/* Uncomment these when smmu is working */
+
+// &usb_1 {
+// 	status = "okay";
+// };
+
+// &usb_1_dwc3 {
+// 	dr_mode = "peripheral";
+// };
+
+// &usb_1_hsphy {
+// 	status = "okay";
+
+// 	vdd-supply = <&vreg_l1a_0p875>;
+// 	vdda-pll-supply = <&vreg_l12a_1p8>;
+// 	vdda-phy-dpdm-supply = <&vreg_l24a_3p075>;
+
+// 	qcom,imp-res-offset-value = <8>;
+// 	qcom,hstx-trim-value = <QUSB2_V2_HSTX_TRIM_21_6_MA>;
+// 	qcom,preemphasis-level = <QUSB2_V2_PREEMPHASIS_5_PERCENT>;
+// 	qcom,preemphasis-width = <QUSB2_V2_PREEMPHASIS_WIDTH_HALF_BIT>;
+// };
+
+// &usb_1_qmpphy {
+// 	status = "okay";
+
+// 	vdda-phy-supply = <&vreg_l26a_1p2>;
+// 	vdda-pll-supply = <&vreg_l1a_0p875>;
+// };
+
+
+
 &ufs_mem_hc {
 	status = "okay";
 	reset-gpios = <&tlmm 150 GPIO_ACTIVE_LOW>;
@@ -504,10 +609,10 @@
 	bias-disable;
 };
 
-&qup_i2c14_default {
-	drive-strength = <2>;
-	bias-disable;
-};
+// &qup_i2c14_default {
+// 	drive-strength = <2>;
+// 	bias-disable;
+// };
 
 &qup_uart6_default {
 	pinmux {