Merge "ARM: dts: msm: Add display support for msm8953 QRD"

/*

 * Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.

 * Copyright (c) 2015-2017,2019 The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

#include "msm8953-qrd.dtsi"

&spmi_bus {

	qcom,pmi8950@3 {

		labibb: qpnp-labibb-regulator {

			ibb_regulator: qcom,ibb@dc00 {

				/delete-property/

					qcom,qpnp-ibb-use-default-voltage;

				qcom,qpnp-ibb-init-lcd-voltage = <5700000>;

			};

			lab_regulator: qcom,lab@de00 {

				/delete-property/

					qcom,qpnp-lab-use-default-voltage;

				qcom,qpnp-lab-init-lcd-voltage = <5700000>;

			};

		};

	};

};

#include "msm8953-mdss-panels.dtsi"

&tlmm {

	pmx_mdss {

		mdss_dsi_active: mdss_dsi_active {

			mux {

				pins = "gpio61";

			};

			config {

				pins = "gpio61";

			};

		};

		mdss_dsi_suspend: mdss_dsi_suspend {

			mux {

				pins = "gpio61";

			};

			config {

				pins = "gpio61";

			};

		};

	};

};

&dsi_panel_pwr_supply {

		qcom,panel-supply-entry@2 {

		reg = <2>;

		qcom,supply-name = "lab";

		qcom,supply-min-voltage = <4600000>;

		qcom,supply-max-voltage = <6000000>;

		qcom,supply-enable-load = <100000>;

		qcom,supply-disable-load = <100>;

	};

	qcom,panel-supply-entry@3 {

		reg = <3>;

		qcom,supply-name = "ibb";

		qcom,supply-min-voltage = <4600000>;

		qcom,supply-max-voltage = <6000000>;

		qcom,supply-enable-load = <100000>;

		qcom,supply-disable-load = <100>;

		qcom,supply-post-on-sleep = <10>;

	};

};

&mdss_mdp {

	qcom,mdss-pref-prim-intf = "dsi";

};

&mdss_dsi {

	hw-config = "single_dsi";

};

&mdss_dsi0 {

	lab-supply = <&lab_regulator>;

	ibb-supply = <&ibb_regulator>;

	/delete-property/ vdd-supply;

	qcom,dsi-pref-prim-pan = <&dsi_r69006_1080p_cmd>;

	pinctrl-names = "mdss_default", "mdss_sleep";

	pinctrl-0 = <&mdss_dsi_active &mdss_te_active>;

	pinctrl-1 = <&mdss_dsi_suspend &mdss_te_suspend>;

	qcom,platform-te-gpio = <&tlmm 24 0>;

	qcom,platform-reset-gpio = <&tlmm 61 0>;

};

&mdss_dsi1 {

	status = "disabled";

};

&labibb {

	status = "ok";

	qpnp,qpnp-labibb-mode = "lcd";

};

&dsi_r69006_1080p_cmd {

	qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;

	qcom,esd-check-enabled;

};

&dsi_r69006_1080p_video {

	qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;

};