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

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

Merge "ARM: dts: msm: move shd, shp, msm-lease to component framework"

parents 0c2047c4 3f02f2ca

arch/arm64/boot/dts/qcom/sa6155-display.dtsi

+4 −2
Original line number Original line Diff line number Diff line
@@ -292,7 +292,7 @@ 
		 };

		 };

	 };

	 };





	 qcom,sde-shared-plane {

	sde_shp: qcom,sde-shared-plane {

		 compatible = "qcom,sde-shared-plane";

		 compatible = "qcom,sde-shared-plane";

		 qcom,add-planes {

		 qcom,add-planes {

			 plane@0 {

			 plane@0 {
@@ -335,6 +335,8 @@ 
&mdss_mdp {

&mdss_mdp {

	qcom,sde-reg-dma-version = <0>;

	qcom,sde-reg-dma-version = <0>;

	qcom,sde-crtc-num-pref = <5>;

	qcom,sde-crtc-num-pref = <5>;

	connectors = <&sde_rscc &dsi_dp1 &sde_wb &sde_dp>;

	connectors = <&sde_rscc &dsi_dp1 &sde_wb &sde_dp

			&sde_sh0 &sde_sh1 &sde_sh2 &sde_shp

			&sde_card1 &sde_card2 &sde_card3>;

};

};

arch/arm64/boot/dts/qcom/sa8155-adp-star-display.dtsi

+4 −2
Original line number Original line Diff line number Diff line
@@ -376,7 +376,7 @@ 
		 };

		 };

	 };

	 };





	 qcom,sde-shared-plane {

	sde_shp: qcom,sde-shared-plane {

		 compatible = "qcom,sde-shared-plane";

		 compatible = "qcom,sde-shared-plane";

		 qcom,add-planes {

		 qcom,add-planes {

			 plane@0 {

			 plane@0 {
@@ -422,5 +422,7 @@ 




&mdss_mdp {

&mdss_mdp {

	qcom,sde-reg-dma-version = <0>;

	qcom,sde-reg-dma-version = <0>;

	connectors = <&sde_rscc &dsi_dp1 &dsi_dp2 &sde_dp &sde_wb>;

	connectors = <&sde_rscc &dsi_dp1 &dsi_dp2 &sde_dp &sde_wb

			&sde_sh0 &sde_sh1 &sde_sh2 &sde_shp

			&sde_card1 &sde_card2 &sde_card3>;

};
 
};

arch/arm64/boot/dts/qcom/sa8195p-adp-star-display.dtsi

+4 −2
Original line number Original line Diff line number Diff line
@@ -363,7 +363,7 @@ 
		 };

		 };

	 };

	 };





	 qcom,sde-shared-plane {

	sde_shp: qcom,sde-shared-plane {

		 compatible = "qcom,sde-shared-plane";

		 compatible = "qcom,sde-shared-plane";

		 qcom,add-planes {

		 qcom,add-planes {

			 plane@0 {

			 plane@0 {
@@ -415,5 +415,7 @@ 
				"none", "none";

				"none", "none";

	qcom,sde-mixer-display-pref = "primary", "none", "none",

	qcom,sde-mixer-display-pref = "primary", "none", "none",

				"none", "none", "none";

				"none", "none", "none";

	connectors = <&dsi_dp1 &dsi_dp2 &sde_dp &sde_wb>;

	connectors = <&dsi_dp1 &dsi_dp2 &sde_dp &sde_wb

			&sde_sh0 &sde_sh1 &sde_sh2 &sde_shp

			&sde_card1 &sde_card2 &sde_card3>;

};
 
};