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

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

Merge "ARM: dts: msm: Add shared display name"

parents 4d4578e0 3a8a0576

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

+5 −0
Original line number Diff line number Diff line
@@ -247,6 +247,7 @@ 
		 compatible = "qcom,shared-display";

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

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

		 qcom,shared-display-name = "shared-disp-0";

		 qcom,display-type = "primary";

		 qcom,shared-display-src-mode {

			 qcom,mode-h-active = <1920>;
@@ -264,6 +265,7 @@ 
		 compatible = "qcom,shared-display";

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

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

		 qcom,shared-display-name = "shared-disp-1";

		 qcom,shared-display-src-mode {

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

			 qcom,mode-v-active = <1080>;
@@ -280,6 +282,7 @@ 
		 compatible = "qcom,shared-display";

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

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

		 qcom,shared-display-name = "shared-disp-2";

		 qcom,shared-display-src-mode {

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

			 qcom,mode-v-active = <1080>;
@@ -315,6 +318,7 @@ 
		 compatible = "qcom,shared-display";

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

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

		 qcom,shared-display-name = "shared-disp-3";

		 qcom,shared-display-src-mode {

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

			 qcom,mode-v-active = <1080>;
@@ -331,6 +335,7 @@ 
		 compatible = "qcom,shared-display";

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

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

		 qcom,shared-display-name = "shared-disp-4";

		 qcom,shared-display-src-mode {

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

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

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

+5 −0
Original line number Diff line number Diff line
@@ -332,6 +332,7 @@ 
		 compatible = "qcom,shared-display";

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

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

		 qcom,shared-display-name = "shared-disp-0";

		 qcom,display-type = "primary";

		 qcom,shared-display-src-mode {

			 qcom,mode-h-active = <1920>;
@@ -349,6 +350,7 @@ 
		 compatible = "qcom,shared-display";

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

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

		 qcom,shared-display-name = "shared-disp-1";

		 qcom,shared-display-src-mode {

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

			 qcom,mode-v-active = <1080>;
@@ -365,6 +367,7 @@ 
		 compatible = "qcom,shared-display";

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

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

		 qcom,shared-display-name = "shared-disp-2";

		 qcom,shared-display-src-mode {

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

			 qcom,mode-v-active = <1080>;
@@ -400,6 +403,7 @@ 
		 compatible = "qcom,shared-display";

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

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

		 qcom,shared-display-name = "shared-disp-3";

		 qcom,shared-display-src-mode {

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

			 qcom,mode-v-active = <1080>;
@@ -416,6 +420,7 @@ 
		 compatible = "qcom,shared-display";

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

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

		 qcom,shared-display-name = "shared-disp-4";

		 qcom,shared-display-src-mode {

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

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

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

+5 −0
Original line number Diff line number Diff line
@@ -319,6 +319,7 @@ 
		 compatible = "qcom,shared-display";

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

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

		 qcom,shared-display-name = "shared-disp-0";

		 qcom,display-type = "primary";

		 qcom,shared-display-src-mode {

			 qcom,mode-h-active = <1920>;
@@ -336,6 +337,7 @@ 
		 compatible = "qcom,shared-display";

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

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

		 qcom,shared-display-name = "shared-disp-1";

		 qcom,shared-display-src-mode {

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

			 qcom,mode-v-active = <1080>;
@@ -352,6 +354,7 @@ 
		 compatible = "qcom,shared-display";

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

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

		 qcom,shared-display-name = "shared-disp-2";

		 qcom,shared-display-src-mode {

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

			 qcom,mode-v-active = <1080>;
@@ -387,6 +390,7 @@ 
		 compatible = "qcom,shared-display";

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

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

		 qcom,shared-display-name = "shared-disp-3";

		 qcom,shared-display-src-mode {

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

			 qcom,mode-v-active = <1080>;
@@ -403,6 +407,7 @@ 
		 compatible = "qcom,shared-display";

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

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

		 qcom,shared-display-name = "shared-disp-4";

		 qcom,shared-display-src-mode {

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

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