arm64: dts: qcom: sdm630-nile: Add Synaptics touchscreen.

Delete the node on Ganges devices, as they use a different one.

Signed-off-by: Konrad Dybcio <konrad.dybcio@somainline.org>
Link: https://lore.kernel.org/r/20210728222542.54269-35-konrad.dybcio@somainline.org
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

diff --git a/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-ganges-kirin.dts b/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-ganges-kirin.dts
index aea949265a2d0ccf671324f655b59cf0e817e456..a4e1fb8ca52d8d9b88a6d6c217a07b817dc422ed 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-ganges-kirin.dts
+++ b/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-ganges-kirin.dts
@@ -20,4 +20,6 @@
        };
 };
 
+/* Ganges devices feature a Novatek touchscreen instead. */
+/delete-node/ &touchscreen;
 /delete-node/ &vreg_l18a_1v8;

diff --git a/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi b/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi
index 7d33a75dca915765dc2e047677a427f179177297..73be3d68742f5166274aff49becec2a79440f6ec 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm630-sony-xperia-nile.dtsi
@@ -161,7 +161,29 @@
 &blsp_i2c1 {
        status = "okay";
 
-       /* Synaptics touchscreen */
+       touchscreen: synaptics-rmi4-i2c@70 {
+               compatible = "syna,rmi4-i2c";
+               reg = <0x70>;
+               #address-cells = <1>;
+               #size-cells = <0>;
+               interrupts-extended = <&tlmm 45 0x2008>;
+
+               pinctrl-names = "default";
+               pinctrl-0 = <&ts_int_active &ts_lcd_id_active>;
+
+               syna,reset-delay-ms = <200>;
+               syna,startup-delay-ms = <220>;
+
+               rmi4-f01@1 {
+                       reg = <0x01>;
+                       syna,nosleep-mode = <1>;
+               };
+
+               rmi4-f11@11 {
+                       reg = <0x11>;
+                       syna,sensor-type = <1>;
+               };
+       };
 };
 
 &blsp_i2c2 {
@@ -540,6 +562,18 @@
 &tlmm {
        gpio-reserved-ranges = <8 4>;
 
+       ts_int_active: ts-int-active {
+               pins = "gpio45";
+               drive-strength = <8>;
+               bias-pull-up;
+       };
+
+       ts_lcd_id_active: ts-lcd-id-active {
+               pins = "gpio56";
+               drive-strength = <8>;
+               bias-disable;
+       };
+
        imx300_vana_default: imx300-vana-default {
                pins = "gpio50";
                function = "gpio";