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

Commit 04a02b12 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: Read the bridge chip name and instance id from DTSI"

parents 7bd485cc 227fcb07

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

+3 −0
Original line number Diff line number Diff line
@@ -455,6 +455,8 @@ Optional properites: 
					instead of standard dcs type 0x0A.

- qcom,dba-panel:	Indicates whether the current panel is used as a display bridge

					to a non-DSI interface.

- qcom,bridge-name:			A string to indicate the name of the bridge chip connected to DSI. qcom,bridge-name

					is required if qcom,dba-panel is defined for the panel.

- qcom,adjust-timer-wakeup-ms:		An integer value to indicate the timer delay(in ms) to accommodate

					s/w delay while configuring the event timer wakeup logic.
@@ -671,6 +673,7 @@ Example: 


		qcom,config-select = <&dsi_sim_vid_config0>;

		qcom,dba-panel;

		qcom,bridge-name = "adv7533";



		dsi_sim_vid_config0: config0 {

			qcom,lm-split = <360 360>;

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

+3 −0
Original line number Diff line number Diff line
@@ -132,6 +132,8 @@ Optional properties: 
					- "primary"

					- "secondary"

					- "tertiary"

- qcom,bridge-index:			Instance id of the bridge chip connected to DSI. qcom,bridge-index is

					required if a bridge chip panel is used.



Example:

	mdss_dsi: qcom,mdss_dsi@0 {
@@ -247,5 +249,6 @@ Example: 
			qcom,dsi-irq-line;

			qcom,lane-map = "lane_map_3012";

			qcom,display-id = "primary";

			qcom,bridge-index = <00>;

	        };

	};

arch/arm/boot/dts/qcom/dsi-adv7533-1080p.dtsi

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

/* Copyright (c) 2015-2016, 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
@@ -70,5 +70,6 @@ 
			1d 1a 03 05 01 03 04 a0

			1d 1a 03 05 01 03 04 a0];

		qcom,dba-panel;

		qcom,bridge-name = "adv7533";

	};

};

arch/arm/boot/dts/qcom/dsi-adv7533-720p.dtsi

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

/* Copyright (c) 2015-2016, 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
@@ -69,5 +69,6 @@ dsi_adv7533_720p: qcom,mdss_dsi_adv7533_720p { 
			1c 19 02 03 01 03 04 a0

			1c 08 02 03 01 03 04 a0];

		qcom,dba-panel;

		qcom,bridge-name = "adv7533";

	};

};

arch/arm/boot/dts/qcom/msm8937-cdp.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -274,6 +274,7 @@ 
	pinctrl-names = "mdss_default", "mdss_sleep";

	pinctrl-0 = <&mdss_dsi_active &mdss_te_active>;

	pinctrl-1 = <&mdss_dsi_suspend &mdss_te_suspend>;

	qcom,bridge-index = <0>;



	qcom,pluggable;

	qcom,platform-te-gpio = <&tlmm 24 0>;