arm64: dts: qcom: msm8994-kitakami: Add Synaptics RMI touchscreen

All Kitakami phones use Synaptics RMI4 touchscreens
attached to the same i2c bus. Configure and enable it.

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

diff --git a/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami-karin.dts b/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami-karin.dts
index 743a2a0765526adc57716c1daf18fc361899a0e8..4dcf42eafb3a18bfd3430f602887140565b4aa8d 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami-karin.dts
+++ b/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami-karin.dts
@@ -41,3 +41,5 @@
 };
 
 /delete-node/ &pm8994_l32;
+/* Z4 tablets use a different touchscreen. */
+/delete-node/ &touchscreen;

diff --git a/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami.dtsi b/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami.dtsi
index e31c31c2b936c2c8cc72fd35e46aa76c4ae5830f..33af174b78abcf6c19e94a39b8900e920e8150f3 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami.dtsi
@@ -147,7 +147,34 @@
 &blsp_i2c6 {
        status = "okay";
 
-       /* Synaptics touchscreen */
+       touchscreen: rmi4-i2c-dev@2c {
+               compatible = "syna,rmi4-i2c";
+               reg = <0x2c>;
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               interrupt-parent = <&tlmm>;
+               interrupts = <42 IRQ_TYPE_EDGE_FALLING>;
+
+               pinctrl-names = "default";
+               pinctrl-0 = <&ts_int_active &ts_reset_active>;
+
+               vdd-supply = <&pm8994_l22>;
+               vio-supply = <&pm8994_s4>;
+
+               syna,reset-delay-ms = <220>;
+               syna,startup-delay-ms = <220>;
+
+               rmi4-f01@1 {
+                       reg = <0x01>;
+                       syna,nosleep-mode = <1>;
+               };
+
+               rmi4-f11@11 {
+                       reg = <0x11>;
+                       syna,sensor-type = <1>;
+               };
+       };
 };
 
 &blsp1_uart2 {
@@ -433,3 +460,19 @@
         * vqmmc-supply = <&pm8994_s4>;
         */
 };
+
+&tlmm {
+       ts_int_active: ts-int-active {
+               pins = "gpio42";
+               drive-strength = <2>;
+               bias-disable;
+               input-enable;
+       };
+
+       ts_reset_active: ts-reset-active {
+               pins = "gpio109";
+               drive-strength = <2>;
+               bias-disable;
+               output-low;
+       };
+};