arm64: dts: qcom: sdm845-oneplus: Update compatbible and add DDIC supplies

Update the compatible to reflect combination of DDIC and panel.

Original compatible describing only the DDIC used, but omit describing
the panel used (Samsung AMS641RW), which we have no way to detect.

There are two additional supplies used by the panel, both are GPIO
controlled and are left enabled by the bootloader for continuous splash.

Previously these were (incorrectly) modelled as pinctrl. Describe them
properly so that the panel can control them.

Fixes: 288ef8a42612 ("arm64: dts: sdm845: add oneplus6/6t devices")
Signed-off-by: Casey Connolly <casey.connolly@linaro.org>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Co-developed-by: David Heidelberg <david@ixit.cz>
Signed-off-by: David Heidelberg <david@ixit.cz>
Link: https://lore.kernel.org/r/20251103-s6e3fc2x01-v6-1-d4eb4abaefa4@ixit.cz
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
index fd7fdc1f0749380c2a1630473839005f17aba63b..d619b710c63fe1998e2ad47d93622a9be89bf20d 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
@@ -150,6 +150,34 @@
                enable-active-high;
                regulator-boot-on;
        };
+
+       panel_vci_3v3: panel-vci-3v3-regulator {
+               compatible = "regulator-fixed";
+               regulator-name = "LCD_VCI_3V";
+
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+
+               gpio = <&tlmm 26 GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+               pinctrl-0 = <&panel_vci_default>;
+               pinctrl-names = "default";
+               regulator-boot-on;
+       };
+
+       panel_vddi_poc_1p8: panel-vddi-poc-regulator {
+               compatible = "regulator-fixed";
+               regulator-name = "VDDI_POC";
+
+               regulator-min-microvolt = <1800000>;
+               regulator-max-microvolt = <1800000>;
+
+               gpio = <&tlmm 25 GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+               pinctrl-0 = <&panel_poc_default>;
+               pinctrl-names = "default";
+               regulator-boot-on;
+       };
 };
 
 &adsp_pas {
@@ -416,6 +444,8 @@
                reg = <0>;
 
                vddio-supply = <&vreg_l14a_1p88>;
+               vci-supply = <&panel_vci_3v3>;
+               poc-supply = <&panel_vddi_poc_1p8>;
 
                reset-gpios = <&tlmm 6 GPIO_ACTIVE_LOW>;
 
@@ -790,6 +820,20 @@
                bias-disable;
        };
 
+       panel_vci_default: vci-state {
+               pins = "gpio26";
+               function = "gpio";
+               drive-strength = <8>;
+               bias-disable;
+       };
+
+       panel_poc_default: poc-state {
+               pins = "gpio25";
+               function = "gpio";
+               drive-strength = <8>;
+               bias-disable;
+       };
+
        alert_slider_default: alert-slider-default-state {
                pins = "gpio126", "gpio52", "gpio24";
                function = "gpio";
@@ -805,7 +849,7 @@
        };
 
        panel_reset_pins: panel-reset-state {
-               pins = "gpio6", "gpio25", "gpio26";
+               pins = "gpio6";
                function = "gpio";
                drive-strength = <8>;
                bias-disable;

diff --git a/arch/arm64/boot/dts/qcom/sdm845-oneplus-fajita.dts b/arch/arm64/boot/dts/qcom/sdm845-oneplus-fajita.dts
index 7e75decfda052b9639f2c0ecdac5a71196fc702f..d6cd873aef0de2b401b6bfe124a22c267dbb60db 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm845-oneplus-fajita.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-oneplus-fajita.dts
@@ -32,7 +32,7 @@
 &display_panel {
        status = "okay";
 
-       compatible = "samsung,s6e3fc2x01";
+       compatible = "samsung,s6e3fc2x01-ams641rw", "samsung,s6e3fc2x01";
 };
 
 &i2c4 {