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

Commit 310b8521 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 4b34bd70 on remote branch 

Change-Id: I3d89a5d75c8a764e914b3de32288bfccb3fbfbd6
parents dea7eade 4b34bd70

Documentation/devicetree/bindings/qdsp/msm-fastrpc.txt

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ Optional properties: 
- qcom,fastrpc-glink:	Flag to use glink instead of smd for IPC

- qcom,fastrpc-vmid-heap-shared:  Flag for Dynamic heap feature, to

                                  share HLOS memory buffer to ADSP

- qcom,secure-domains:  FastRPC secure domain configuration



Optional subnodes:

- qcom,msm_fastrpc_compute_cb :	Child nodes representing the compute context

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 4

SUBLEVEL = 146

SUBLEVEL = 148

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/arm/boot/dts/imx6sx.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -1250,7 +1250,7 @@ 
				  /* non-prefetchable memory */

				  0x82000000 0 0x08000000 0x08000000 0 0x00f00000>;

			num-lanes = <1>;

			interrupts = <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>;

			interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&clks IMX6SX_CLK_PCIE_REF_125M>,

				 <&clks IMX6SX_CLK_PCIE_AXI>,

				 <&clks IMX6SX_CLK_LVDS1_OUT>,

arch/arm/boot/dts/qcom/dsi-panel-sharp-dualdsi-wqhd-cmd.dtsi

0 → 100644
+102 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



&mdss_mdp {

	dsi_dual_sharp_wqhd_cmd: qcom,mdss_dsi_sharp_wqhd_cmd {

		qcom,mdss-dsi-panel-name =

				"Dual Sharp WQHD cmd mode dsi panel";

		qcom,mdss-dsi-panel-type = "dsi_cmd_mode";

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

		qcom,mdss-dsi-virtual-channel-id = <0>;

		qcom,mdss-dsi-stream = <0>;

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

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

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

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

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

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

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

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

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

		qcom,mdss-dsi-bpp = <24>;

		qcom,mdss-dsi-border-color = <0>;

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

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

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

		qcom,mdss-dsi-traffic-mode = "burst_mode";

		qcom,mdss-dsi-bllp-eof-power-mode;

		qcom,mdss-dsi-bllp-power-mode;

		qcom,mdss-dsi-lane-0-state;

		qcom,mdss-dsi-lane-1-state;

		qcom,mdss-dsi-lane-2-state;

		qcom,mdss-dsi-lane-3-state;

		qcom,mdss-dsi-panel-timings = [d9 6a 48 00 b0 b0 52 6c 57 03 04

			00];

		qcom,mdss-dsi-t-clk-post = <0xc>;

		qcom,mdss-dsi-t-clk-pre = <0x28>;

		qcom,mdss-dsi-dma-trigger = "trigger_sw";

		qcom,mdss-dsi-mdp-trigger = "none";

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

		qcom,mdss-dsi-te-pin-select = <1>;

		qcom,mdss-dsi-wr-mem-start = <0x2c>;

		qcom,mdss-dsi-wr-mem-continue = <0x3c>;

		qcom,mdss-dsi-te-dcs-command = <1>;

		qcom,mdss-dsi-te-check-enable;

		qcom,mdss-dsi-te-using-te-pin;

		qcom,ulps-enabled;

		qcom,dcs-cmd-by-left;

		qcom,mdss-dsi-tx-eot-append;

		qcom,mdss-pan-physical-width-dimension = <68>;

		qcom,mdss-pan-physical-height-dimension = <121>;



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

		qcom,mdss-dsi-on-command = [

			39 01 00 00 00 00 11 91 09 20 00 20 02 00 03 1c 04 21 00

			0f 03 19 01 97

			39 01 00 00 00 00 03 92 10 f0

			15 01 00 00 00 00 02 90 03

			15 01 00 00 00 00 02 03 01

			39 01 00 00 00 00 06 f0 55 aa 52 08 04

			15 01 00 00 00 00 02 c0 03

			39 01 00 00 00 00 06 f0 55 aa 52 08 07

			15 01 00 00 00 00 02 ef 01

			39 01 00 00 00 00 06 f0 55 aa 52 08 00

			15 01 00 00 00 00 02 b4 01

			15 01 00 00 00 00 02 35 00

			39 01 00 00 00 00 06 f0 55 aa 52 08 01

			39 01 00 00 00 00 05 ff aa 55 a5 80

			15 01 00 00 00 00 02 6f 01

			15 01 00 00 00 00 02 f3 10

			39 01 00 00 00 00 05 ff aa 55 a5 00

			15 01 00 00 00 00 02 90 01

			15 01 00 00 00 00 02 03 00

			15 01 00 00 00 00 02 58 01

			15 01 00 00 00 00 02 c9 00

			15 01 00 00 00 00 02 c0 15

			05 01 00 00 78 00 01 11 /* sleep out + delay 120ms */

			05 01 00 00 78 00 01 29 /* display on + delay 120ms */

			];



		qcom,mdss-dsi-off-command = [05 01 00 00 78 00 02 28 00

				 05 01 00 00 78 00 02 10 00];



		qcom,config-select = <&dsi_dual_sharp_wqhd_cmd_config0>;



		dsi_dual_sharp_wqhd_cmd_config0: config0 {

			qcom,split-mode = "dualctl-split";

		};



		dsi_dual_sharp_wqhd_cmd_config1: config1 {

			qcom,split-mode = "pingpong-split";

		};

	};

};

arch/arm/boot/dts/qcom/dsi-panel-sharp-dualdsi-wqhd-video.dtsi

0 → 100644
+95 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



&mdss_mdp {

	dsi_dual_sharp_wqhd_video: qcom,mdss_dsi_sharp_wqhd_video {

		qcom,mdss-dsi-panel-name =

				"Dual Sharp wqhd video mode dsi panel";

		qcom,mdss-dsi-panel-type = "dsi_video_mode";

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

		qcom,mdss-dsi-virtual-channel-id = <0>;

		qcom,mdss-dsi-stream = <0>;

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

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

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

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

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

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

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

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

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

		qcom,mdss-dsi-bpp = <24>;

		qcom,mdss-dsi-border-color = <0>;

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

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

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

		qcom,mdss-dsi-traffic-mode = "burst_mode";

		qcom,mdss-dsi-bllp-eof-power-mode;

		qcom,mdss-dsi-bllp-power-mode;

		qcom,mdss-dsi-lane-0-state;

		qcom,mdss-dsi-lane-1-state;

		qcom,mdss-dsi-lane-2-state;

		qcom,mdss-dsi-lane-3-state;

		qcom,mdss-dsi-panel-timings = [00 2e 08 0a 12 18 08 0b 09 03 04

			00];

		qcom,mdss-dsi-t-clk-post = <0xc>;

		qcom,mdss-dsi-t-clk-pre = <0x21>;

		qcom,mdss-dsi-dma-trigger = "trigger_sw";

		qcom,mdss-dsi-mdp-trigger = "none";

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

		qcom,mdss-dsi-tx-eot-append;

		qcom,mdss-pan-physical-width-dimension = <68>;

		qcom,mdss-pan-physical-height-dimension = <121>;



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

		qcom,mdss-dsi-on-command = [

			39 01 00 00 00 00 11 91 09 20 00 20 02 00 03 1c 04 21 00

			0f 03 19 01 97

			39 01 00 00 00 00 03 92 10 f0

			15 01 00 00 00 00 02 90 03

			15 01 00 00 00 00 02 03 01

			39 01 00 00 00 00 06 f0 55 aa 52 08 04

			15 01 00 00 00 00 02 c0 03

			39 01 00 00 00 00 06 f0 55 aa 52 08 07

			15 01 00 00 00 00 02 ef 01

			39 01 00 00 00 00 06 f0 55 aa 52 08 00

			15 01 00 00 00 00 02 b4 10

			15 01 00 00 00 00 02 35 00

			39 01 00 00 00 00 06 f0 55 aa 52 08 01

			39 01 00 00 00 00 05 ff aa 55 a5 80

			15 01 00 00 00 00 02 6f 01

			15 01 00 00 00 00 02 f3 10

			39 01 00 00 00 00 05 ff aa 55 a5 00

			15 01 00 00 00 00 02 90 01

			15 01 00 00 00 00 02 03 00

			15 01 00 00 00 00 02 58 01

			15 01 00 00 00 00 02 c9 00

			15 01 00 00 00 00 02 c0 15

			05 01 00 00 78 00 01 11 /* sleep out + delay 120ms */

			05 01 00 00 78 00 01 29 /* display on + delay 120ms */

			];



		qcom,mdss-dsi-off-command = [05 01 00 00 78 00 02 28 00

				 05 01 00 00 78 00 02 10 00];





		qcom,config-select = <&dsi_dual_sharp_wqhd_video_config0>;



		dsi_dual_sharp_wqhd_video_config0: config0 {

			qcom,split-mode = "dualctl-split";

		};



		dsi_dual_sharp_wqhd_video_config1: config1 {

			qcom,split-mode = "pingpong-split";

		};

	};

};