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

Commit 1478509c authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 3023f369 on remote branch 

Change-Id: I21038452124831e590ef7cc6e796ceeae40397c9
parents b6f086e6 3023f369

bindings/display/msm/sde-dp.txt

+1 −0
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ DP Controller: Required properties: 
- qcom,dp-aux-switch:		Phandle for the driver used to program the AUX switch for Display Port orientation.

- qcom,dp-hpd-gpio:		HPD gpio for direct DP connector without USB PHY or AUX switch.

- qcom,dp-gpio-aux-switch:      Gpio DP AUX switch chipset support.

- qcom,no_tps4_support:		To restrict TPS4 pattern support in link training for Display port.

- qcom,<type>-supply-entries:		A node that lists the elements of the supply used by the a particular "type" of DSI module. The module "types"

					can be "core", "ctrl", and "phy". Within the same type,

					there can be more than one instance of this binding,

bindings/leds/leds-qpnp-flash-v2.txt

+3 −0
Original line number Diff line number Diff line
@@ -28,6 +28,9 @@ Optional properties: 
- qcom,ramp-down-step	: Integer property to specify flash current ramp down

			  time step. Unit is in nS. Allowed values are: 200, 400, 800, 1600,

			  3200, 6400, 12800, 25600.

- qcom,torch-realtime-brightness-control : Boolean property which enables torch realtime brightness control

				  which gives option to change brightness from torch node when it is

				  already enabled from switch node.

- qcom,short-circuit-det	: Boolean property which enables short circuit fault detection.

- qcom,open-circuit-det		: Boolean property which enables open circuit fault detection.

- qcom,vph-droop-det		: Boolean property which enables VPH droop detection.

qcom/khaje-atp-overlay.dts

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
/ {

	model = "Qualcomm Technologies, Inc. Khaje ATP";

	compatible = "qcom,khaje-atp", "qcom,khaje", "qcom,atp";

	qcom,msm-id = <518 0x10000>;

	qcom,msm-id = <518 0x10000>, <586 0x10000>;

	qcom,board-id = <33 0>;

	qcom,pmic-id = <0x2D 0x2E 0x0 0x0>;

};

qcom/khaje-idp-nopmi-overlay.dts

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
/ {

	model = "Qualcomm Technologies, Inc. KHAJE IDP nopmi";

	compatible = "qcom,khaje-idp", "qcom,khaje", "qcom,idp";

	qcom,msm-id = <518 0x10000>;

	qcom,msm-id = <518 0x10000>, <586 0x10000>;

	qcom,board-id = <0x10022 0>;

	qcom,pmic-id = <0x2D 0x0 0x0 0x0>;

};

qcom/khaje-idp-overlay.dts

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
/ {

	model = "Qualcomm Technologies, Inc. Khaje IDP";

	compatible = "qcom,khaje-idp", "qcom,khaje", "qcom,idp";

	qcom,msm-id = <518 0x10000>;

	qcom,msm-id = <518 0x10000>, <586 0x10000>;

	qcom,board-id = <0x10022 0>;

	qcom,pmic-id = <0x2D 0x2E 0x0 0x0>;

};