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

Commit 822e092c authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: mdss: Update wr mem fields with correct names"

parents e4c0b963 e3a38e3f

Documentation/devicetree/bindings/fb/mdss-dsi-panel.txt

+4 −10
Original line number Diff line number Diff line
@@ -159,15 +159,9 @@ Optional properties: 
					1 = TE through TE gpio pin. (default)

- qcom,mdss-dsi-te-dcs-command:		Inserts the dcs command.

					1 = default value.

- qcom,mdss-dsi-te-v-sync-rd-ptr-irq-line:	Configures the scan line number that the dsi

					pixel transfer will start on. Rasing this number

					will result in delaying the start of the pixel

					transfer.

- qcom,mdss-dsi-wr-mem-start:		DCS command for write_memory_start.

					0x2c = default value.

- qcom,mdss-dsi-te-v-sync-continue-lines:	Represents the difference in number of lines

					between estimated read pointer and write pointer

					to allow the updating of all the lines except

					the first line of the frame.

- qcom,mdss-dsi-wr-mem-continue:	DCS command for write_memory_continue.

					0x3c = default value.

- qcom,mdss-dsi-h-sync-pulse:		Specifies the pulse mode option for the panel.

					0 = Don't send hsa/he following vs/ve packet(default)
@@ -341,8 +335,8 @@ Example: 
		qcom,mdss-dsi-te-check-enable;

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

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

		qcom,mdss-dsi-te-v-sync-continue-lines = <0x3c>;

		qcom,mdss-dsi-te-v-sync-rd-ptr-irq-line = <0x2c>;

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

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

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

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

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

arch/arm/boot/dts/qcom/dsi-panel-generic-720p-cmd.dtsi

+3 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2013, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2014, 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
@@ -59,8 +59,8 @@ 
		qcom,mdss-dsi-lane-2-state;

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

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

		qcom,mdss-dsi-te-v-sync-rd-ptr-irq-line = <0x2c>;

		qcom,mdss-dsi-te-v-sync-continues-lines = <0x3c>;

		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;

arch/arm/boot/dts/qcom/dsi-panel-jdi-dualmipi0-cmd.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -55,8 +55,8 @@ 
		qcom,mdss-dsi-dma-trigger = "trigger_sw";

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

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

		qcom,mdss-dsi-te-v-sync-rd-ptr-irq-line = <0x2c>;

		qcom,mdss-dsi-te-v-sync-continues-lines = <0x3c>;

		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;

arch/arm/boot/dts/qcom/dsi-panel-jdi-dualmipi1-cmd.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -55,8 +55,8 @@ 
		qcom,mdss-dsi-dma-trigger = "trigger_sw";

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

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

		qcom,mdss-dsi-te-v-sync-rd-ptr-irq-line = <0x2c>;

		qcom,mdss-dsi-te-v-sync-continues-lines = <0x3c>;

		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;

arch/arm/boot/dts/qcom/dsi-panel-nt35590-720p-cmd.dtsi

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2013, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2014, 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
@@ -517,7 +517,7 @@ 
		qcom,mdss-dsi-lane-2-state;

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

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

		qcom,mdss-dsi-te-v-sync-rd-ptr-irq-line = <0x2c>;

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

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

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

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