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

Commit 101d8245 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 87df2108 on remote branch 

Change-Id: I2715ec2fc40a3b21bd587383ce509a6049d69ff8
parents 19e4a438 87df2108

bindings/media/video/msm-camera-flash.txt

+17 −0
Original line number Diff line number Diff line
@@ -130,3 +130,20 @@ led_flash_rear: qcom,camera-flash@0 { 
		qcom,max-current = <1500>;

		qcom,max-duration = <1200>;

	};



Example:



flash0: qcom,camera-flash {

                cell-index = <0>;

                compatible = "qcom,qm215-gpio-flash";

                qcom,flash-type = <2>;

                gpios = <&tlmm 34 0>;

                        <&tlmm 33 0>;

                qcom,gpio-req-tbl-num = <0 1>;

                qcom,gpio-req-tbl-flags = <1 0>;

                qcom,gpio-flash-en = <0>;

                qcom,gpio-flash-now = <1>;

                qcom,gpio-req-tbl-label = "CAM_FLASH",

                        "CAM_TORCH";

                status = "ok";

        };

bindings/pci/pci-msm.txt

+4 −0
Original line number Diff line number Diff line
@@ -172,6 +172,10 @@ Main node 
	Definition: Should contain:

		- "pcie_<num>_core_reset"	Core reset

		- "pcie_<num>_phy_reset"	PHY reset

	Following resets are optional and required only if driver must perform

	link recovery post linkdown:

		- "pcie_<num>_link_down_reset"		Core linkdown reset

		- "pcie_<num>_phy_nocsr_com_phy_reset"	PHY no-csr reset



- qcom,smmu-sid-base:

	Usage: optional

bindings/pil/subsys-pil-slate.txt

0 → 100644
+28 −0
Original line number Diff line number Diff line 
* Slate Subsystem Peripheral Image Loader



subsys-pil-slate is a slate peripheral image loader (PIL) driver. It is

used for loading the firmware images of the slate subsystems into memory

and preparing the subsystem's processor to execute code. It's also

responsible for shutting down the processor when it's not needed.



Required properties:

- compatible:	      Must be "qcom,pil-slate"

- qcom,firmware-name: Base name of the firmware image.



Optional properties:

- qcom,slate2ap-status-gpio: GPIO used by the slate to indicate status to

			     the apps.

- qcom,ap2slate-status-gpio: GPIO used by the apps to indicate its status

			     to slate.





Example:

	qcom,slate {

		    compatible = "qcom,pil-slate";

		    qcom,firmware-name = "slate-wear";

		    /* GPIO inputs from blackghost */

		    qcom,slate2ap-status-gpio = <&msm_gpio 97 0>;

                    /* GPIO output to blackghost */

                    qcom,ap2slate-status-gpio = <&msm_gpio 17 0>;

	};

bindings/power/supply/qcom/qpnp-smb5.txt

+6 −0
Original line number Diff line number Diff line
@@ -397,6 +397,12 @@ Charger specific properties: 
		for PPS adapter in CV mode.

		If left unspecified, the default value is 4000mA.



- qcom,jeita-arb-enable

  Usage:      optional

  Value type: bool

  Definition: Boolean flag which indicates if JETIA ARB handling when

		Vjeita > Vbatt is enabled.



=============================================

Second Level Nodes - SMB5 Charger Peripherals

=============================================

bindings/spi/qcom,spi-geni-qcom.txt

+3 −0
Original line number Diff line number Diff line
@@ -37,6 +37,9 @@ Optional properties: 
  Note: Use this property to introduce cs_clk_delay only for minicore QUPs with

	inter words delay as 0 and CS toggle as 0. For other cases, use the

	conventional method of using spi_cs_clk_dly register.

- qcom,use-fixed-timeout : Set this flag to use 250ms fixed timeout value. This

                        will improve overall SPI KPI value but not preferred

                        for large transfer.



SPI slave nodes must be children of the SPI master node and can contain

the following properties.