PENDING: arm64: dts: qcom: shikra-cqs-evk: Enable display and add ili7807s panel

Documentation/devicetree/bindings/display/panel/dlc,dlc0697.yaml → Documentation/devicetree/bindings/display/panel/ilitek,ili7807s.yaml

@@ -1,10 +1,10 @@
 # SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
 %YAML 1.2
 ---
-$id: http://devicetree.org/schemas/display/panel/dlc,dlc0697.yaml#
+$id: http://devicetree.org/schemas/display/panel/ilitek,ili7807s.yaml#
 $schema: http://devicetree.org/meta-schemas/core.yaml#
 
-title: DLC DLC0697 1080x1920 video-mode DSI panel
+title: Ilitek ILI7807S-based DSI panels
 
 maintainers:
   - Arpit Saini <arpit.saini@oss.qualcomm.com>
@@ -14,32 +14,36 @@ allOf:
 
 properties:
   compatible:
-    const: dlc,dlc0697
+    items:
+      - enum:
+          - dlc,dlc0697
+      - const: ilitek,ili7807s
 
   reg:
     maxItems: 1
     description: DSI virtual channel
 
-  reset-gpios: true
-
-  enable-gpios: true
-
-  vddio-supply:
+  vddi-supply:
     description: I/O voltage supply (1.8V)
 
-  bias-supply:
-    description: LCD bias supply (3.3V), typically a GPIO-controlled fixed regulator
+  avdd-supply:
+    description: Positive LCD bias supply (AVDD), typically +5.5V
+      (range 4.5V to 6.3V)
 
-  port: true
+  avee-supply:
+    description: Negative LCD bias supply (AVEE), typically -5.5V
+      (range -6.3V to -4.5V)
 
 required:
   - compatible
   - reg
   - reset-gpios
-  - vddio-supply
+  - vddi-supply
+  - avdd-supply
+  - avee-supply
   - port
 
-additionalProperties: false
+unevaluatedProperties: false
 
 examples:
   - |
@@ -50,11 +54,13 @@ examples:
         #size-cells = <0>;
 
         panel@0 {
-            compatible = "dlc,dlc0697";
+            compatible = "dlc,dlc0697", "ilitek,ili7807s";
             reg = <0>;
 
-            reset-gpios = <&tlmm 41 GPIO_ACTIVE_LOW>;
-            vddio-supply = <&vreg_l15>;
+            reset-gpios = <&tlmm 3 GPIO_ACTIVE_LOW>;
+            vddi-supply = <&pm4125_l15>;
+            avdd-supply = <&avdd>;
+            avee-supply = <&avee>;
 
             port {
                 panel_in: endpoint {
@@ -63,4 +69,3 @@ examples:
             };
         };
     };
-...

MAINTAINERS

@@ -8027,13 +8027,6 @@ S:	Maintained
 F:	Documentation/devicetree/bindings/display/bridge/chipone,icn6211.yaml
 F:	drivers/gpu/drm/bridge/chipone-icn6211.c
 
-DRM DRIVER FOR DLC DLC0697 DSI PANEL
-M:	Arpit Saini <arpit.saini@oss.qualcomm.com>
-S:	Maintained
-T:	git https://gitlab.freedesktop.org/drm/misc/kernel.git
-F:	Documentation/devicetree/bindings/display/panel/dlc,dlc0697.yaml
-F:	drivers/gpu/drm/panel/panel-dlc0697.c
-
 DRM DRIVER FOR EBBG FT8719 PANEL
 M:	Joel Selvaraj <jo@jsfamily.in>
 S:	Maintained

arch/arm64/boot/dts/qcom/shikra-cqm-evk.dts

@@ -28,18 +28,6 @@
 		stdout-path = "serial0:115200n8";
 	};
 
-	lcd_bias: regulator-lcd-bias {
-		compatible = "regulator-fixed";
-		regulator-name = "lcd_bias";
-		regulator-min-microvolt = <3300000>;
-		regulator-max-microvolt = <3300000>;
-		vin-supply = <&pm4125_l17>;
-		gpio = <&tlmm 151 GPIO_ACTIVE_HIGH>;
-		enable-active-high;
-		pinctrl-0 = <&lcd_bias_en>;
-		pinctrl-names = "default";
-	};
-
 	mi2s_tdm_sen: mi2s-tdm-sen-qaif-aif {
 		qcom,qaif-aif-bits-per-lane = <2>;
 		qcom,qaif-aif-ctrl-data-oe = <1>;
@@ -151,6 +139,39 @@
 		};
 	};
 
+	lcd_bias: regulator-lcd-bias {
+		compatible = "regulator-fixed";
+		regulator-name = "lcd_bias";
+		vin-supply = <&vph_pwr>;
+		gpio = <&tlmm 151 GPIO_ACTIVE_HIGH>;
+		enable-active-high;
+		pinctrl-0 = <&lcd_bias_en>;
+		pinctrl-names = "default";
+	};
+
+	vph_pwr: vph-pwr-regulator {
+		compatible = "regulator-fixed";
+		regulator-name = "vph_pwr";
+		regulator-always-on;
+		regulator-boot-on;
+	};
+
+	vreg_disp_n: regulator-vreg-disp-n {
+		compatible = "regulator-fixed";
+		regulator-name = "vreg_disp_n";
+		regulator-min-microvolt = <5500000>;
+		regulator-max-microvolt = <5500000>;
+		vin-supply = <&lcd_bias>;
+	};
+
+	vreg_disp_p: regulator-vreg-disp-p {
+		compatible = "regulator-fixed";
+		regulator-name = "vreg_disp_p";
+		regulator-min-microvolt = <5500000>;
+		regulator-max-microvolt = <5500000>;
+		vin-supply = <&lcd_bias>;
+	};
+
 	wcn3988-pmu {
 		compatible = "qcom,wcn3988-pmu";
 
@@ -338,29 +359,23 @@
 	status = "okay";
 };
 
-&pm4125_l5 {
-	/* DSI VDDA - must be at NOM voltage for PHY PLL lock */
-	regulator-min-microvolt = <1232000>;
-	regulator-max-microvolt = <1232000>;
-	regulator-allow-set-load;
-};
-
 &mdss_dsi0 {
 	vdda-supply = <&pm4125_l5>;
+
 	status = "okay";
 
 	panel@0 {
-		compatible = "dlc,dlc0697";
+		compatible = "dlc,dlc0697", "ilitek,ili7807s";
 		reg = <0>;
 
 		reset-gpios = <&tlmm 3 GPIO_ACTIVE_LOW>;
-		enable-gpios = <&tlmm 91 GPIO_ACTIVE_HIGH>;
 
-		vddio-supply = <&pm4125_l15>;
-		bias-supply = <&lcd_bias>;
+		vddi-supply = <&pm4125_l15>;
+		avdd-supply = <&vreg_disp_p>;
+		avee-supply = <&vreg_disp_n>;
 
-		pinctrl-0 = <&panel_rst_n &panel_te_pin>;
-		pinctrl-1 = <&panel_rst_n_suspend>;
+		pinctrl-0 = <&panel_rst_n &panel_te_pin &panel_bl_en>;
+		pinctrl-1 = <&panel_rst_n_suspend &panel_bl_en_suspend>;
 		pinctrl-names = "default", "sleep";
 
 		port {
@@ -501,6 +516,13 @@
 	status = "okay";
 };
 
+&pm4125_l5 {
+	/* DSI VDDA - must be at NOM voltage for PHY PLL lock */
+	regulator-min-microvolt = <1232000>;
+	regulator-max-microvolt = <1232000>;
+	regulator-allow-set-load;
+};
+
 &remoteproc_cdsp {
 	firmware-name = "qcom/shikra/cdsp.mbn";
 
@@ -692,6 +714,22 @@
 		bias-disable;
 	};
 
+	panel_bl_en: panel-bl-en-state {
+		pins = "gpio91";
+		function = "gpio";
+		drive-strength = <2>;
+		bias-disable;
+		output-high;
+	};
+
+	panel_bl_en_suspend: panel-bl-en-suspend-state {
+		pins = "gpio91";
+		function = "gpio";
+		drive-strength = <2>;
+		bias-pull-down;
+		output-low;
+	};
+
 	panel_rst_n: panel-rst-n-state {
 		pins = "gpio3";
 		function = "gpio";

arch/arm64/boot/dts/qcom/shikra-cqs-evk.dts

@@ -84,18 +84,6 @@
 		};
 	};
 
-	lcd_bias: regulator-lcd-bias {
-		compatible = "regulator-fixed";
-		regulator-name = "lcd_bias";
-		regulator-min-microvolt = <3300000>;
-		regulator-max-microvolt = <3300000>;
-		vin-supply = <&pm4125_l17>;
-		gpio = <&tlmm 151 GPIO_ACTIVE_HIGH>;
-		enable-active-high;
-		pinctrl-0 = <&lcd_bias_en>;
-		pinctrl-names = "default";
-	};
-
 	vreg_0p9: regulator-0v9 {
 		compatible = "regulator-fixed";
 		regulator-name = "VREG_0P9";
@@ -116,6 +104,39 @@
 		regulator-boot-on;
 	};
 
+	lcd_bias: regulator-lcd-bias {
+		compatible = "regulator-fixed";
+		regulator-name = "lcd_bias";
+		vin-supply = <&vph_pwr>;
+		gpio = <&tlmm 151 GPIO_ACTIVE_HIGH>;
+		enable-active-high;
+		pinctrl-0 = <&lcd_bias_en>;
+		pinctrl-names = "default";
+	};
+
+	vph_pwr: vph-pwr-regulator {
+		compatible = "regulator-fixed";
+		regulator-name = "vph_pwr";
+		regulator-always-on;
+		regulator-boot-on;
+	};
+
+	vreg_disp_n: regulator-vreg-disp-n {
+		compatible = "regulator-fixed";
+		regulator-name = "vreg_disp_n";
+		regulator-min-microvolt = <5500000>;
+		regulator-max-microvolt = <5500000>;
+		vin-supply = <&lcd_bias>;
+	};
+
+	vreg_disp_p: regulator-vreg-disp-p {
+		compatible = "regulator-fixed";
+		regulator-name = "vreg_disp_p";
+		regulator-min-microvolt = <5500000>;
+		regulator-max-microvolt = <5500000>;
+		vin-supply = <&lcd_bias>;
+	};
+
 	wcn3988-pmu {
 		compatible = "qcom,wcn3988-pmu";
 
@@ -306,20 +327,21 @@
 
 &mdss_dsi0 {
 	vdda-supply = <&pm4125_l5>;
+
 	status = "okay";
 
 	panel@0 {
-		compatible = "dlc,dlc0697";
+		compatible = "dlc,dlc0697", "ilitek,ili7807s";
 		reg = <0>;
 
 		reset-gpios = <&tlmm 3 GPIO_ACTIVE_LOW>;
-		enable-gpios = <&tlmm 91 GPIO_ACTIVE_HIGH>;
 
-		vddio-supply = <&pm4125_l15>;
-		bias-supply = <&lcd_bias>;
+		vddi-supply = <&pm4125_l15>;
+		avdd-supply = <&vreg_disp_p>;
+		avee-supply = <&vreg_disp_n>;
 
-		pinctrl-0 = <&panel_rst_n &panel_te_pin>;
-		pinctrl-1 = <&panel_rst_n_suspend>;
+		pinctrl-0 = <&panel_rst_n &panel_te_pin &panel_bl_en>;
+		pinctrl-1 = <&panel_rst_n_suspend &panel_bl_en_suspend>;
 		pinctrl-names = "default", "sleep";
 
 		port {
@@ -451,13 +473,6 @@
 	remote-endpoint = <&usb_1_dwc3_hs>;
 };
 
-&pm4125_l5 {
-	/* DSI VDDA - must be at NOM voltage for PHY PLL lock */
-	regulator-min-microvolt = <1232000>;
-	regulator-max-microvolt = <1232000>;
-	regulator-allow-set-load;
-};
-
 &pm4125_ss_in {
 	remote-endpoint = <&usb_qmpphy_out>;
 };
@@ -473,6 +488,13 @@
 	};
 };
 
+&pm4125_l5 {
+	/* DSI VDDA - must be at NOM voltage for PHY PLL lock */
+	regulator-min-microvolt = <1232000>;
+	regulator-max-microvolt = <1232000>;
+	regulator-allow-set-load;
+};
+
 &remoteproc_cdsp {
 	firmware-name = "qcom/shikra/cdsp.mbn";
 
@@ -671,20 +693,29 @@
 		bias-disable;
 	};
 
-	wsa885x_i2c_spkr_sd_n: wsa885x-i2c-spkr-sd-n-active-state {
-		pins = "gpio2";
-		function = "gpio";
-		drive-strength = <8>;
-		input-disable;
-		output-enable;
-	};
 	lcd_bias_en: lcd-bias-en-state {
 		pins = "gpio151";
 		function = "gpio";
 		drive-strength = <2>;
 		bias-disable;
 	};
 
+	panel_bl_en: panel-bl-en-state {
+		pins = "gpio91";
+		function = "gpio";
+		drive-strength = <2>;
+		bias-disable;
+		output-high;
+	};
+
+	panel_bl_en_suspend: panel-bl-en-suspend-state {
+		pins = "gpio91";
+		function = "gpio";
+		drive-strength = <2>;
+		bias-pull-down;
+		output-low;
+	};
+
 	panel_rst_n: panel-rst-n-state {
 		pins = "gpio3";
 		function = "gpio";
@@ -706,6 +737,14 @@
 		bias-pull-down;
 	};
 
+	wsa885x_i2c_spkr_sd_n: wsa885x-i2c-spkr-sd-n-active-state {
+		pins = "gpio2";
+		function = "gpio";
+		drive-strength = <8>;
+		input-disable;
+		output-enable;
+	};
+
 	pcie_default_state: pcie-default-state {
 		clkreq-pins {
 			pins = "gpio117";