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

Commit 6d6c11f9 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 msm8917"

parents 6d3e6113 6d5ccc54

arch/arm64/boot/dts/qcom/msm8917-mdss-pll.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -13,6 +13,6 @@ 
#include "msm8937-mdss-pll.dtsi"



&mdss_dsi0_pll {

	vddio-supply = <&pm8917_l6>;

	vddio-supply = <&pm8937_l6>;

};

/delete-node/ &mdss_dsi1_pll;

arch/arm64/boot/dts/qcom/msm8917-mdss.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -13,8 +13,8 @@ 
#include "msm8937-mdss.dtsi"



&mdss_dsi {

	vdda-supply = <&pm8917_l2>;

	vddio-supply = <&pm8917_l6>;

	vdda-supply = <&pm8937_l2>;

	vddio-supply = <&pm8937_l6>;



	ranges = <0x1a94000 0x1a94000 0x300

		0x1a94400 0x1a94400 0x280
@@ -34,8 +34,8 @@ 
};



&mdss_dsi0 {

	vdd-supply = <&pm8917_l17>;

	vddio-supply = <&pm8917_l6>;

	vdd-supply = <&pm8937_l17>;

	vddio-supply = <&pm8937_l6>;

};



/delete-node/ &mdss_dsi1;

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

+35 −0
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ 
 * GNU General Public License for more details.

 */



#include "msm8917-pinctrl.dtsi"



&blsp1_uart2 {

	status = "ok";

	pinctrl-names = "default";
@@ -65,3 +67,36 @@ 


	status = "ok";

};



#include "msm8937-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_720_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 60 0>;

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

};



&dsi_truly_720_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_720_cmd {

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

	qcom,ulps-enabled;

	qcom,partial-update-enabled;

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

};

arch/arm64/boot/dts/qcom/msm8917-pmi8950-mtp.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -74,3 +74,8 @@ 
&ibb_regulator {

	qcom,qpnp-ibb-discharge-resistor = <32>;

};



&mdss_dsi0 {

	lab-supply = <&lab_regulator>;

	ibb-supply = <&ibb_regulator>;

};

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

+10 −0
Original line number Diff line number Diff line
@@ -162,6 +162,8 @@ 
#include "msm8917-ion.dtsi"

#include "msm8917-smp2p.dtsi"

#include "msm8917-bus.dtsi"

#include "msm8917-mdss.dtsi"

#include "msm8917-mdss-pll.dtsi"



&soc {

	#address-cells = <1>;
@@ -427,6 +429,14 @@ 
		#clock-cells = <1>;

	};



	clock_gcc_mdss: qcom,gcc-mdss@1800000 {

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

		clocks = <&mdss_dsi0_pll clk_dsi_pll0_pixel_clk_src>,

		<&mdss_dsi0_pll clk_dsi_pll0_byte_clk_src>;

		clock-names = "pclk0_src", "byte0_src";

		#clock-cells = <1>;

	};



	clock_cpu: qcom,cpu-clock-8939@b111050 {

		compatible = "qcom,cpu-clock-8917";

		reg = <0xb011050 0x8>,