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

Commit fbfcf596 authored by Jeyaprakash Soundrapandian's avatar Jeyaprakash Soundrapandian Committed by Gerrit - the friendly Code Review server
Browse files

Merge "DOWNSTREAM commit '0482853e' AU360... 

Merge "DOWNSTREAM commit '0482853e' AU360 10/16" into dev/msm-4.14-camx
parents ab616014 74da7e1e

Documentation/devicetree/bindings/arm/msm/heap-sharing.txt

+22 −1
Original line number Diff line number Diff line
@@ -29,7 +29,13 @@ Optional properties for child nodes: 


- qcom,allocate-boot-time:	Indicates whether clients needs boot time memory allocation.



Example:

- qcom,allocate-on-request:	Indicates memory allocation happens only upon client request



Note: qcom,allocate-boot-time and qcom,allocate-on-request are mutually exclusive rite now.



- qcom,guard-band:	Indicates addition of a guard band memory allocation in addition to the client's memory region.



Example 1:



qcom,memshare {

	compatible = "qcom,memshare";
@@ -42,3 +48,18 @@ qcom,memshare { 
		label = "modem";

	};

};



Example 2:



qcom,memshare {

	compatible = "qcom,memshare";



	qcom,client_3 {

		compatible = "qcom,memshare-peripheral";

		qcom,peripheral-size = <0x500000>;

		qcom,client-id = <1>;

		qcom,allocate-on-request;

		qcom,guard-band;

		label = "modem";

	};

};
 
 No newline at end of file

Documentation/devicetree/bindings/arm/msm/msm.txt

+3 −0
Original line number Diff line number Diff line
@@ -178,3 +178,6 @@ compatible = "qcom,sdxprairie-cdp" 
compatible = "qcom,sdmmagpie-rumi"

compatible = "qcom,sdmmagpie-idp"

compatible = "qcom,sdmmagpie-qrd"

compatible = "qcom,sdmmagpiep-idp"

compatible = "qcom,sdmmagpiep"

compatible = "qcom,sdmmagpiep-qrd"

Documentation/devicetree/bindings/arm/msm/wil6210.txt

+2 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ Required properties: 
Optional properties:

- qcom,sleep-clk-en: GPIO for sleep clock used for low power modes by 11ad card

- qcom,wigig-en: Enable GPIO connected to 11ad card

- qcom,wigig-dc: Enable DC to DC GPIO connected to 11ad card

- qcom,use-ext-supply: Boolean flag to indicate if 11ad SIP uses external power supply

- vdd-supply: phandle to 11ad VDD regulator node

- vddio-supply: phandle to 11ad VDDIO regulator node
@@ -45,6 +46,7 @@ Example: 
		qcom,smmu-mapping = <0x20000000 0xe0000000>;

		qcom,pcie-parent = <&pcie1>;

		qcom,wigig-en = <&tlmm 94 0>;

		qcom,wigig-dc = <&tlmm 81 0>;

		qcom,msm-bus,name = "wil6210";

		qcom,msm-bus,num-cases = <2>;

		qcom,msm-bus,num-paths = <1>;

Documentation/devicetree/bindings/batterydata/batterydata.txt

+6 −1
Original line number Diff line number Diff line
@@ -82,10 +82,15 @@ Profile data node optional properties: 
			If yes, the low and high thresholds defined in

			"qcom,step-chg-ranges" tuples should be assigned as

			SoC values in percentage.

- qcom,ocv-based-step-chg: A bool property to indicate if the battery will

			perform OCV (Open Circuit Voltage) based step charging.

			If yes, the low and high thresholds defined in

			"qcom,step-chg-ranges" tuples should be assigned as

			OCV values in microvolts.

- qcom,step-chg-ranges: Array of tuples in which a tuple describes a range

			data of step charging setting.

			A range contains following 3 integer elements:

			[0]: the low threshold of battery votlage in uV

			[0]: the low threshold of battery voltage in uV

			     or SoC (State of Charge) in percentage when

			     SoC based step charge is used;

			[1]: the high threshold of battery voltage in uV

Documentation/devicetree/bindings/cnss/cnss-wlan.txt

+4 −0
Original line number Diff line number Diff line
@@ -35,6 +35,10 @@ Optional properties: 
  - vdd-wlan-xtal-aon-supply: phandle to the LDO-4 regulator. This is needed

                              on platforms where XTAL regulator depends on

                              always on regulator in VDDmin.

  - vdd-wlan-ctrl1-supply: phandle to the DBU1 - 1.8V for QCA6595 or 3.3V for

                           QCA6174 on auto platform.

  - vdd-wlan-ctrl2-supply: phandle to the DBU4 - 2.2V for QCA6595 or 3.85V for

                           QCA6696 on auto platform.

  - vdd-wlan-core-supply: phandle to the 1.3V CORE regulator for QCA6174

  - vdd-wlan-sp2t-supply: phandle to the 2.7V SP2T regulator for QCA6174

  - qcom,smmu-s1-enable: Boolean property to decide whether to enable SMMU