Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b04ecdf1 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: add display support for QM215 QRD device"

parents 9fc9808a 59f2963b
Loading
Loading
Loading
Loading
+66 −9
Original line number Diff line number Diff line
@@ -77,19 +77,10 @@
		/delete-property/ qcom,wcnss-adc_tm;
	};

	/delete-node/ qcom,gcc-mdss@1800000;

	/delete-node/ qcom,csid@1b30000;
	/delete-node/ qcom,csid@1b30400;
	/delete-node/ qcom,csid@1b30800;

	/delete-node/ qcom,mdss_mdp@1a00000;
	/delete-node/ qcom,mdss_dsi@0;
	/delete-node/ qcom,mdss_wb_panel;
	/delete-node/ qcom,mdss_rotator;
	/delete-node/ qcom,mdss_dsi_pll@1a94a00;
	/delete-node/ qcom,mdss_dsi_pll@1a96a00;

	/* mem_acc */
	/delete-node/ regulator@01946004;
	/* apc vreg */
@@ -107,3 +98,69 @@
		/delete-node/ msm8x16_wcd_codec@f000;
	};
};

&pm8916_gpios {
	disp_vdda_en_default: disp_vdda_en_default {
		pins = "gpio3";
		function = "normal";
		power-source = <0>;
		drive-strength = <8>;
		output-high;
	};
};

&pm8916_mpps {
	backlight_mpp {
		backlight_pwm_en_default: backlight_pwm_en_default {
			pins = "mpp4";
			function = "digital";
			qcom,dtest = <1>;
			power-source = <0>;
			output-low;
		};
	};
};

&soc {
	disp_vdda_eldo1: gpio-regulator@0 {
		compatible = "regulator-fixed";
		reg = <0x00 0x00>;
		regulator-name = "disp_vdda_eldo1";
		regulator-min-microvolt = <1200000>;
		regulator-max-microvolt = <1200000>;
		regulator-enable-ramp-delay = <135>;
		enable-active-high;
		gpio = <&pm8916_gpios 3 0>;
		pinctrl-names = "default";
		pinctrl-0 = <&disp_vdda_en_default>;
		vin-supply = <&pm8916_s3>;
	};
};

&mdss_dsi0_pll {
	vddio-supply = <&pm8916_l6>;
};

&mdss_dsi0 {
	/delete-property/ vdd-supply;
	vddio-supply = <&pm8916_l6>;
};

&mdss_dsi {
	vdda-supply = <&disp_vdda_eldo1>;
	vddio-supply = <&pm8916_l6>;

	qcom,phy-supply-entries {
		#address-cells = <1>;
		#size-cells = <0>;

		qcom,phy-supply-entry@0 {
			reg = <0>;
			qcom,supply-name = "vddio";
			qcom,supply-min-voltage = <1744000>;
			qcom,supply-max-voltage = <1904000>;
			qcom,supply-enable-load = <100000>;
			qcom,supply-disable-load = <100>;
		};
	};
};
+90 −0
Original line number Diff line number Diff line
@@ -56,3 +56,93 @@
		#include "vbms-batterydata-mlp356477-2800mah.dtsi"
	};
};

&mdss_dsi_active {
	mux {
		pins = "gpio61", "gpio93", "gpio94";
		function = "gpio";
	};

	config {
		pins = "gpio61", "gpio93", "gpio94";
		drive-strength = <8>; /* 8 mA */
		bias-disable = <0>; /* no pull */
		output-high;
	};
};

&mdss_dsi_suspend {
	mux {
		pins = "gpio61", "gpio93", "gpio94";
		function = "gpio";
	};

	config {
		pins = "gpio61", "gpio93", "gpio94";
		drive-strength = <2>; /* 2 mA */
		bias-pull-down; /* pull down */
	};
};

#include "msm8937-mdss-panels.dtsi"

&mdss_mdp {
	qcom,mdss-pref-prim-intf = "dsi";
};

&dsi_panel_pwr_supply {
	#address-cells = <1>;
	#size-cells = <0>;

	qcom,panel-supply-entry@0 {
		reg = <1>;
		qcom,supply-name = "vddio";
		qcom,supply-min-voltage = <1744000>;
		qcom,supply-max-voltage = <1904000>;
		qcom,supply-enable-load = <100000>;
		qcom,supply-disable-load = <100>;
	};
	/delete-node/ qcom,panel-supply-entry@1;
	/delete-node/ qcom,panel-supply-entry@2;
	/delete-node/ qcom,panel-supply-entry@3;
};

&mdss_dsi {
	hw-config = "single_dsi";
};

&mdss_dsi0 {
	qcom,dsi-pref-prim-pan = <&dsi_hx8399c_hd_vid>;
	pinctrl-names = "mdss_default", "mdss_sleep";
	pinctrl-0 = <&mdss_dsi_active &mdss_te_active
		&backlight_pwm_en_default>;
	pinctrl-1 = <&mdss_dsi_suspend &mdss_te_suspend>;

	qcom,platform-te-gpio = <&tlmm 24 0>;
	qcom,platform-reset-gpio = <&tlmm 61 0>;
	qcom,platform-bklight-en-gpio = <&tlmm 93 0>;
	qcom,platform-enable-gpio = <&tlmm 94 0>;
};

&dsi_hx8399c_hd_vid {
	qcom,mdss-dsi-panel-timings =
		[e7 1c 12 00 42 42 18 20 17 03 04 00];
	qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;
	qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_pwm";
	qcom,mdss-dsi-bl-pmic-pwm-frequency = <100>;
	qcom,mdss-dsi-bl-pmic-bank-select = <0>;
	qcom,mdss-dsi-pwm-gpio = <&pm8916_mpps 4 0>;
	qcom,esd-check-enabled;
	qcom,mdss-dsi-panel-status-check-mode = "reg_read";
	qcom,mdss-dsi-panel-status-command = [06 01 00 01 00 00 01 0a];
	qcom,mdss-dsi-panel-status-command-state = "dsi_lp_mode";
	qcom,mdss-dsi-panel-status-value = <0x9d 0x9d 0x9d 0x9d>;
	qcom,mdss-dsi-panel-on-check-value = <0x9d 0x9d 0x9d 0x9d>;
	qcom,mdss-dsi-panel-status-read-length = <4>;
	qcom,mdss-dsi-panel-max-error-count = <3>;
	qcom,mdss-dsi-min-refresh-rate = <48>;
	qcom,mdss-dsi-max-refresh-rate = <60>;
	qcom,mdss-dsi-pan-enable-dynamic-fps;
	qcom,mdss-dsi-pan-fps-update =
		"dfps_immediate_porch_mode_vfp";
};