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

Commit 87ce3215 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: Enable display for msm8953"

parents 6c35996d e25c1f0c

arch/arm64/boot/dts/qcom/msm8953-cdp.dtsi

+49 −1
Original line number Diff line number Diff line 
/*

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

 * Copyright (c) 2015-2018, 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
@@ -74,3 +74,51 @@ 


	status = "ok";

};



#include "msm8953-mdss-panels.dtsi"



&mdss_mdp {

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

};



&mdss_dsi {

	hw-config = "single_dsi";

};



&mdss_dsi0 {

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

	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>;

	qcom,platform-bklight-en-gpio = <&tlmm 59 0>;

};



&mdss_dsi1 {

	status = "disabled";

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

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

	pinctrl-0 = <&mdss_dsi_active &mdss_te_active>;

	pinctrl-1 = <&mdss_dsi_suspend &mdss_te_suspend>;



	qcom,pluggable;

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

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

	qcom,platform-bklight-en-gpio = <&tlmm 59 0>;

};



&dsi_truly_1080_vid {

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

	qcom,mdss-dsi-pan-enable-dynamic-fps;

	qcom,mdss-dsi-pan-fps-update = "dfps_immediate_porch_mode_vfp";

};



&dsi_truly_1080_cmd {

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

	qcom,ulps-enabled;

	qcom,partial-update-enabled;

	qcom,panel-roi-alignment = <2 2 4 2 1080 2>;

};

arch/arm64/boot/dts/qcom/msm8953-mtp.dtsi

+49 −1
Original line number Diff line number Diff line 
/*

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

 * Copyright (c) 2015-2018, 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
@@ -74,3 +74,51 @@ 


	status = "ok";

};



#include "msm8953-mdss-panels.dtsi"



&mdss_mdp {

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

};



&mdss_dsi {

	hw-config = "single_dsi";

};



&mdss_dsi0 {

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

	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>;

	qcom,platform-bklight-en-gpio = <&tlmm 59 0>;

};



&mdss_dsi1 {

	status = "disabled";

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

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

	pinctrl-0 = <&mdss_dsi_active &mdss_te_active>;

	pinctrl-1 = <&mdss_dsi_suspend &mdss_te_suspend>;



	qcom,pluggable;

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

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

	qcom,platform-bklight-en-gpio = <&tlmm 59 0>;

};



&dsi_truly_1080_vid {

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

	qcom,mdss-dsi-pan-enable-dynamic-fps;

	qcom,mdss-dsi-pan-fps-update = "dfps_immediate_porch_mode_vfp";

};



&dsi_truly_1080_cmd {

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

	qcom,ulps-enabled;

	qcom,partial-update-enabled;

	qcom,panel-roi-alignment = <2 2 4 2 1080 2>;

};

arch/arm64/boot/dts/qcom/msm8953-pmi8950.dtsi

+29 −0
Original line number Diff line number Diff line
@@ -37,3 +37,32 @@ 
	qcom,typec-psy-name = "typec";

};



&mdss_dsi0 {

	lab-supply = <&lab_regulator>;

	ibb-supply = <&ibb_regulator>;

};



&mdss_dsi1 {

	lab-supply = <&lab_regulator>;

	ibb-supply = <&ibb_regulator>;

};



&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>;

		};

};

arch/arm64/boot/dts/qcom/msm8953.dtsi

+18 −2
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ 
		dfps_data_mem: dfps_data_mem@90000000 {

			reg = <0 0x90000000 0 0x1000>;

			label = "dfps_data_mem";

			status = "disabled";

		};



		cont_splash_mem: splash_region@0x90001000 {
@@ -164,6 +165,8 @@ 
#include "msm8953-ion.dtsi"

#include "msm-arm-smmu-8953.dtsi"

#include "msm8953-gpu.dtsi"

#include "msm8953-mdss.dtsi"

#include "msm8953-mdss-pll.dtsi"



&soc {

	#address-cells = <1>;
@@ -651,6 +654,19 @@ 
		status = "disabled";

	};



	clock_gcc_mdss: qcom,gcc-mdss@1800000 {

		compatible = "qcom,gcc-mdss-8953";

		reg = <0x1800000 0x80000>;

		reg-names = "cc_base";

		clock-names = "pclk0_src", "pclk1_src",

			"byte0_src", "byte1_src";

		clocks = <&mdss_dsi0_pll clk_dsi0pll_pixel_clk_mux>,

			<&mdss_dsi1_pll clk_dsi1pll_pixel_clk_mux>,

			<&mdss_dsi0_pll clk_dsi0pll_byte_clk_mux>,

			<&mdss_dsi1_pll clk_dsi1pll_byte_clk_mux>;

		#clock-cells = <1>;

	};



	clock_gcc: qcom,gcc@1800000 {

		compatible = "qcom,gcc-8953";

		reg = <0x1800000 0x80000>,