arm64: dts: qcom: msm8916-samsung-rossa: Move touchscreen to common device tree

Every Core Prime uses an Imagis IST3038 touchscreen that is connected to
&blsp_i2c5. Move it to the common device tree.

Signed-off-by: Raymond Hackley <raymondhackley@protonmail.com>
Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Link: https://lore.kernel.org/r/20251004123907.84270-1-raymondhackley@protonmail.com
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-rossa-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-samsung-rossa-common.dtsi
index e7f265e3c2ab87628d56571a38f3861f8d7d26ef..e33453c3e51e848fed078d950710304508fe4d4c 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-rossa-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-rossa-common.dtsi
@@ -5,7 +5,7 @@
 /* SM5504 MUIC instead of SM5502 */
 /delete-node/ &muic;
 
-/* Touchscreen varies depending on model variant */
+/* IST3038 instead of Zinitix BT541 */
 /delete-node/ &touchscreen;
 
 &blsp_i2c1 {
@@ -24,6 +24,26 @@
        };
 };
 
+&blsp_i2c5 {
+       touchscreen: touchscreen@50 {
+               compatible = "imagis,ist3038";
+               reg = <0x50>;
+
+               interrupts-extended = <&tlmm 13 IRQ_TYPE_EDGE_FALLING>;
+
+               touchscreen-size-x = <480>;
+               touchscreen-size-y = <800>;
+
+               vdd-supply = <&reg_vdd_tsp_a>;
+               vddio-supply = <&pm8916_l6>;
+
+               pinctrl-0 = <&tsp_int_default>;
+               pinctrl-names = "default";
+
+               linux,keycodes = <KEY_APPSELECT KEY_BACK>;
+       };
+};
+
 /* On rossa backlight is controlled with MIPI DCS commands */
 &clk_pwm {
        status = "disabled";

diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-rossa.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-rossa.dts
index 3413b0970c4abcb613e8f4dba64a805ac8737dd5..1981bb71f6a928def5b6e9d1ed5197af4fcd2194 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-rossa.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-rossa.dts
@@ -16,26 +16,6 @@
        constant-charge-voltage-max-microvolt = <4400000>;
 };
 
-&blsp_i2c5 {
-       touchscreen@50 {
-               compatible = "imagis,ist3038";
-               reg = <0x50>;
-
-               interrupts-extended = <&tlmm 13 IRQ_TYPE_EDGE_FALLING>;
-
-               touchscreen-size-x = <480>;
-               touchscreen-size-y = <800>;
-
-               vdd-supply = <&reg_vdd_tsp_a>;
-               vddio-supply = <&pm8916_l6>;
-
-               pinctrl-0 = <&tsp_int_default>;
-               pinctrl-names = "default";
-
-               linux,keycodes = <KEY_APPSELECT KEY_BACK>;
-       };
-};
-
 &mpss_mem {
        /* Firmware for rossa needs more space */
        reg = <0x0 0x86800000 0x0 0x5800000>;