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

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

Merge "ARM: dts: msm: Enable dynamic splash on sa6155"

parents ac25a8ec 681445df

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

+84 −2
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 
&sde_dp {

	qcom,ext-disp = <&ext_disp>;

	qcom,dp-hpd-gpio = <&ioexp 8 0>;



	qcom,mst-fixed-topology-ports = <1 2>;

	pinctrl-names = "mdss_dp_active", "mdss_dp_sleep";

	pinctrl-0 = <&dp_hpd_cfg_pins>;

	pinctrl-1 = <&dp_hpd_cfg_pins>;
@@ -163,7 +163,7 @@ 
	dsi_anx_7625_1: qcom,dsi-display@17 {

		label = "dsi_anx_7625_1";

		qcom,dsi-display-active;

		qcom,display-type = "primary";

		qcom,display-label = "primary";



		qcom,dsi-ctrl-num = <0>;

		qcom,dsi-phy-num = <0>;
@@ -217,6 +217,86 @@ 
	qcom,rmnet-ipa {

		status="disabled";

	};



	sde_sh_base0: qcom,shared-display-base@0 {

		      qcom,shared-display-base-intf = <1>;

		      qcom,shared-display-base-mode {

			      qcom,mode-h-active = <1920>;

			      qcom,mode-h-front-porch = <88>;

			      qcom,mode-h-pulse-width = <44>;

			      qcom,mode-h-back-porch = <148>;

			      qcom,mode-h-active-high;

			      qcom,mode-v-active = <1080>;

			      qcom,mode-v-front-porch = <4>;

			      qcom,mode-v-pulse-width = <5>;

			      qcom,mode-v-back-porch = <36>;

			      qcom,mode-v-active-high;

			      qcom,mode-refresh-rate = <60>;

			      qcom,mode-clock-in-khz = <148500>;

		      };

	      };





	sde_sh0: qcom,shared-display@0 {

		 compatible = "qcom,shared-display";

		 qcom,shared-display-base = <&sde_sh_base0>;

		 qcom,blend-stage-range = <0 7>;

		 qcom,display-type = "primary";

		 qcom,shared-display-src-mode {

			 qcom,mode-h-active = <1920>;

			 qcom,mode-v-active = <1080>;

		 };

		 qcom,shared-display-dst-mode {

			 qcom,mode-x-offset = <0>;

			 qcom,mode-y-offset = <0>;

			 qcom,mode-width = <1920>;

			 qcom,mode-height = <1080>;

		 };

	 };



	sde_sh1: qcom,shared-display@1 {

		 compatible = "qcom,shared-display";

		 qcom,shared-display-base = <&sde_sh_base0>;

		 qcom,blend-stage-range = <7 1>;

		 qcom,shared-display-src-mode {

			 qcom,mode-h-active = <1920>;

			 qcom,mode-v-active = <1080>;

		 };

		 qcom,shared-display-dst-mode {

			 qcom,mode-x-offset = <0>;

			 qcom,mode-y-offset = <0>;

			 qcom,mode-width = <1920>;

			 qcom,mode-height = <1080>;

		 };

	 };



	 qcom,sde-shared-plane {

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

		 qcom,add-planes {

			 plane@0 {

				 qcom,plane-name = "plane-4-splash";

				 qcom,plane-parent = "plane-4";

				 qcom,plane-init-active;

				 qcom,plane-seamless-mode = "shared";

			 };

		 };

	 };



	sde_card1: qcom,sde-kms-lease@0 {

		   compatible = "qcom,sde-kms-lease";

		   qcom,dev-name = "msm_drm";

		   qcom,lease-connectors = "DSI-2","DP-1","DP-2","DP-3";

		   qcom,lease-planes = "plane-0","plane-1","plane-2","plane-3",

					"plane-4", "plane-5", "plane-6",

					"plane-7","plane-8","plane-9";

	   };

	sde_card2: qcom,sde-kms-lease@1 {

		   compatible = "qcom,sde-kms-lease";

		   qcom,dev-name = "msm_drm2";

		   qcom,lease-connectors = "DSI-3";

		   qcom,lease-planes = "plane-4-splash";

	   };



};



&mdss_dsi_phy0 {
@@ -224,6 +304,8 @@ 
};



&mdss_mdp {

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

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

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

};