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

Commit 8b126daf authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 6653fe72 on remote branch 

Change-Id: Iafa220f974b857d6929a5e34e8d2451f06b38453
parents a07a87f0 6653fe72

bindings/input/qpnp-power-on.txt

+2 −0
Original line number Diff line number Diff line
@@ -118,6 +118,8 @@ Optional properties: 
				power off trigger during system shutdown case.

- qcom,ps-hold-hard-reset-disable:	Boolean property to disable PS_HOLD

				power off trigger during system hard reset case.

- qcom,log-kpd-event:		Boolean property to enable logging of KPDPWR status

				during driver INIT and runtime when key is pressed.



Optional Sub-nodes:

- qcom,pon_1 ... qcom,pon_n:	These PON child nodes correspond to features

qcom/dsi-panel-arglass-seeya-dual-1080p-video.dtsi

+39 −23
Original line number Diff line number Diff line
@@ -21,39 +21,47 @@ 
	qcom,mdss-dsi-mdp-trigger = "none";

	qcom,mdss-dsi-reset-sequence = <1 20>, <0 20>, <1 50>;

	qcom,adjust-timer-wakeup-ms = <1>;

	qcom,mdss-dsi-panel-hdr-enabled;

	qcom,mdss-dsi-panel-count = <2>;

	qcom,mdss-dsi-panel-hdr-color-primaries = <14500 15500 32000

		17000 15500 30000 8000 3000>;

	qcom,mdss-dsi-panel-peak-brightness = <4200000>;

	qcom,mdss-dsi-panel-blackness-level = <3230>;



	qcom,mdss-dsi-display-timings {

		timing@0 {

			qcom,mdss-dsi-panel-width = <1920>;

			qcom,mdss-dsi-panel-height = <1080>;

			qcom,mdss-dsi-h-front-porch = <88>;

			qcom,mdss-dsi-h-back-porch = <148>;

			qcom,mdss-dsi-h-pulse-width = <44>;

			qcom,mdss-dsi-h-front-porch = <32>;

			qcom,mdss-dsi-h-back-porch = <32>;

			qcom,mdss-dsi-h-pulse-width = <4>;

			qcom,mdss-dsi-h-sync-skew = <0>;

			qcom,mdss-dsi-v-back-porch = <36>;

			qcom,mdss-dsi-v-front-porch = <5>;

			qcom,mdss-dsi-v-pulse-width = <5>;

			qcom,mdss-dsi-v-back-porch = <14>;

			qcom,mdss-dsi-v-front-porch = <16>;

			qcom,mdss-dsi-v-pulse-width = <2>;

			qcom,mdss-dsi-h-left-border = <0>;

			qcom,mdss-dsi-panel-framerate = <60>;

			qcom,mdss-dsi-panel-framerate = <90>;

			qcom,mdss-dsi-on-command = [

				//cmd1

				39 01 00 00 00 00 02 53 29

				39 01 00 00 00 00 03 51 FF 01

				39 01 00 00 00 00 02 03 00

				39 01 00 00 00 00 07 80 00 E0 E0 0E 00 31

				39 01 00 00 00 00 08 81 03 04 00 29 00 05 00

				39 01 00 00 00 00 08 82 03 04 00 29 00 05 01

				39 01 00 00 00 00 02 03 01

				39 01 00 00 00 00 07 80 01 E0 E0 0E 00 31

				39 01 00 00 00 00 08 81 03 04 00 10 00 10 00

				39 01 00 00 00 00 08 82 03 04 00 10 00 10 01

				39 01 00 00 00 00 02 35 00

				39 01 00 00 00 00 02 26 20

				/* CMD2 P1 */

				//pps

				39 01 00 00 00 00 11 70 00 00 00 89 20 80 04 38

				 07 80 00 1e 03 C0 03 C0

				39 01 00 00 00 00 02 65 10

				39 01 00 00 00 00 11 70 02 00 00 00 00 20 03 B4

					00 0D 00 0C 03 50 01 E9

				39 01 00 00 00 00 02 65 20

				39 01 00 00 00 00 0D 70 18 00 10 F0 03 0C 20 00

					06 0B 0B 33

				//  cmd2 p1

				39 01 00 00 00 00 03 F0 AA 11

				39 01 00 00 00 00 02 C0 00

				39 01 00 00 00 00 0C C2 03 FF 03 FF 03 FF 03 FF 82 00 00

				/* CMD2 P2 */

				39 01 00 00 00 00 09 C2 03 FF 03 FF 03 FF 03 FF

				//  cmd2 p2

				39 01 00 00 00 00 03 F0 AA 12

				39 01 00 00 00 00 03 BF 37 A9

				/* H mirror dsi1 */
@@ -61,7 +69,7 @@ 
				39 01 00 00 00 00 02 65 2F

				39 01 00 00 00 00 02 F2 01

				39 01 00 00 00 00 02 36 02

				/* V mirror dsi0 */

				/* v mirror dsi0 */

				39 01 00 04 00 00 03 FF 5A 80

				39 01 00 04 00 00 02 65 2F

				39 01 00 04 00 00 02 F2 01
@@ -73,20 +81,21 @@ 
				39 01 00 04 00 00 03 F0 AA 16

				39 01 00 04 00 00 07 B6 12 53 64 31 42 56

				39 01 00 04 00 00 03 B0 00 55

				/* CMD3 P0 */

				/* CMDs PP0 */

				39 01 00 00 00 00 03 FF 5A 80

				39 01 00 00 00 00 02 65 2F

				39 01 00 00 00 00 02 F2 01

				/* CMD3 P1 */

				//cmd3 p1

				39 01 00 00 00 00 03 FF 5A 81

				39 01 00 00 00 00 02 65 05

				39 01 00 00 00 00 02 F2 22

				39 01 00 00 00 00 02 65 0A

				39 01 00 00 00 00 02 F2 00

				39 01 00 00 00 00 02 65 16

				39 01 00 00 00 00 0F F9 01 5F 61 64 67 6A 6D 6F 75 7B 80 86 8B 91

				05 01 00 00 cb 00 02 11 00

				05 01 00 00 00 00 02 29 00

				39 01 00 00 00 00 0F F9 01 5F 61 64 67 6A 6D 6F

				 75 7B 80 86 8B 91

				05 01 00 00 14 00 01 11

				05 01 00 00 64 00 01 29

				39 01 00 00 00 00 03 F0 AA 11

			];

			qcom,mdss-dsi-off-command = [05 01 00 00 0a 00
@@ -94,6 +103,13 @@ 


			qcom,mdss-dsi-on-command-state = "dsi_lp_mode";

			qcom,mdss-dsi-off-command-state = "dsi_hs_mode";

			qcom,compression-mode = "dsc";

			qcom,mdss-dsc-slice-height = <30>;

			qcom,mdss-dsc-slice-width = <960>;

			qcom,mdss-dsc-slice-per-pkt = <1>;

			qcom,mdss-dsc-bit-per-component = <8>;

			qcom,mdss-dsc-bit-per-pixel = <8>;

			qcom,mdss-dsc-block-prediction-enable;

			};

		};

	};

qcom/khaje-pm7250b.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -87,3 +87,7 @@ 
		};

	};

};



&pm7250b_pon {

	qcom,log-kpd-event;

};

qcom/khaje-sde.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
				 "div_clk",

				"iface_clk", "core_clk", "vsync_clk",

				"lut_clk", "rot_clk";

		clock-rate = <0 0 0 0 0 300000000 19200000 300000000 200000000>;

		clock-rate = <0 0 0 0 0 383000000 19200000 383000000 200000000>;

		clock-max-rate = <0 0 0 0 0 560000000 19200000 560000000

							 560000000>;

qcom/khaje.dtsi

+23 −14
Original line number Diff line number Diff line
@@ -3969,21 +3969,30 @@ tpdm_turing_llm: tpdm@8861000 { 


			qcom,speed-bin = <0>;



			qcom,initial-pwrlevel = <5>;

			qcom,ca-target-pwrlevel = <4>;

			qcom,initial-pwrlevel = <6>;

			qcom,ca-target-pwrlevel = <5>;



			/* TURBO_L1 */

			qcom,gpu-pwrlevel@0 {

				reg = <0>;

				qcom,gpu-freq = <1114800000>;

				qcom,gpu-freq = <1260000000>;

				qcom,bus-freq = <7>;

				qcom,bus-min = <7>;

				qcom,bus-max = <7>;

			};



			/* TURBO */

			/* TURBO_L1 */

			qcom,gpu-pwrlevel@1 {

				reg = <1>;

				qcom,gpu-freq = <1114800000>;

				qcom,bus-freq = <7>;

				qcom,bus-min = <7>;

				qcom,bus-max = <7>;

			};



			/* TURBO */

			qcom,gpu-pwrlevel@2 {

				reg = <2>;

				qcom,gpu-freq = <1025000000>;

				qcom,bus-freq = <6>;

				qcom,bus-min = <5>;
@@ -3991,8 +4000,8 @@ tpdm_turing_llm: tpdm@8861000 { 
			};



			/* NOM */

			qcom,gpu-pwrlevel@2 {

				reg = <2>;

			qcom,gpu-pwrlevel@3 {

				reg = <3>;

				qcom,gpu-freq = <785000000>;

				qcom,bus-freq = <5>;

				qcom,bus-min = <4>;
@@ -4000,8 +4009,8 @@ tpdm_turing_llm: tpdm@8861000 { 
			};



			/* SVS_L1 */

			qcom,gpu-pwrlevel@3 {

				reg = <3>;

			qcom,gpu-pwrlevel@4 {

				reg = <4>;

				qcom,gpu-freq = <600000000>;

				qcom,bus-freq = <4>;

				qcom,bus-min = <3>;
@@ -4009,8 +4018,8 @@ tpdm_turing_llm: tpdm@8861000 { 
			};



			/* SVS */

			qcom,gpu-pwrlevel@4 {

				reg = <4>;

			qcom,gpu-pwrlevel@5 {

				reg = <5>;

				qcom,gpu-freq = <465000000>;

				qcom,bus-freq = <3>;

				qcom,bus-min = <2>;
@@ -4018,8 +4027,8 @@ tpdm_turing_llm: tpdm@8861000 { 
			};



			/* LOW SVS */

			qcom,gpu-pwrlevel@5 {

				reg = <5>;

			qcom,gpu-pwrlevel@6 {

				reg = <6>;

				qcom,gpu-freq = <320000000>;

				qcom,bus-freq = <2>;

				qcom,bus-min = <1>;
@@ -4027,8 +4036,8 @@ tpdm_turing_llm: tpdm@8861000 { 
			};



			/* XO */

			qcom,gpu-pwrlevel@6 {

				reg = <6>;

			qcom,gpu-pwrlevel@7 {

				reg = <7>;

				qcom,gpu-freq = <0>;

				qcom,bus-freq = <0>;

				qcom,bus-min = <0>;