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

Commit 7f3d6bc0 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: include sa6155 display devicetree"

parents 30a0ea9d 123b22b4

qcom/sa6155-pmic.dtsi

+14 −0
Original line number Diff line number Diff line
@@ -47,3 +47,17 @@ 


#include "sa6155-regulator.dtsi"

#include "pm6155.dtsi"



&mdss_dsi0 {

	vdda-1p2-supply = <&pm6155_1_l11>;

};



&sde_dp {

	vdda-1p2-supply = <&pm6155_1_l11>;

	vdda-0p9-supply = <&pm6155_1_l5>;

};



&mdss_dsi_phy0 {

	vdda-0p9-supply = <&pm6155_1_l5>;

};

qcom/sa6155.dtsi

+5 −0
Original line number Diff line number Diff line 
#include "sm6150.dtsi"

#include "sa6155-pmic.dtsi"

#include "display/sa6155-display.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SA6155";
@@ -399,3 +400,7 @@ 
		};

	};

};



&mdss_dsi0_pll {

	/delete-property/ qcom,dsi-pll-ssc-en;

};

qcom/sa6155p-adp-air-overlay.dts

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
/plugin/;



#include "sa6155-adp-air.dtsi"

#include "display/sa6155-display-shd.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SA6155P ADP-AIR";

qcom/sa6155p-adp-star-overlay.dts

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
/plugin/;



#include "sa6155-adp-star.dtsi"

#include "display/sa6155-display-shd.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SA6155P ADP-STAR";

qcom/sa6155p-v2-adp-air-overlay.dts

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
/plugin/;



#include "sa6155-adp-air.dtsi"

#include "display/sa6155-display-shd.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SA6155P ADP-AIR V2";