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

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

Merge "DOWNSTREAM: AU274: Merge commit... 

Merge "DOWNSTREAM: AU274: Merge commit '1c4c840c' into Topic - 07/19" into dev/msm-4.14-camx
parents 974b59e0 350722ab

Documentation/devicetree/bindings/media/video/msm-vidc.txt

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ Venus 
Required properties:

- compatible : one of:

	- "qcom,msm-vidc"

	- "qcom,sm6150-vidc" : Invokes driver specific data for SM6150.

        - "qcom,sm8150-vidc" : Invokes driver specific data for SM8150.

        - "qcom,sm6150-vidc" : Invokes driver specific data for SM6150.

        - "qcom,sdm845-vidc" : Invokes driver specific data for SDM845.

Documentation/devicetree/bindings/net/dsa/b53.txt

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ Required properties: 
      "brcm,bcm53128"

      "brcm,bcm5365"

      "brcm,bcm5395"

      "brcm,bcm5389"

      "brcm,bcm5397"

      "brcm,bcm5398"

Documentation/devicetree/bindings/power/reset/msm-poweroff.txt

+4 −0
Original line number Diff line number Diff line
@@ -9,6 +9,10 @@ Required Properties: 
-compatible: "qcom,pshold"

-reg: Specifies the physical address of the ps-hold register



Optional Properties:

-qcom,force-warm-reboot: Issue a warm reboot, even for the traditional cases

				where hard reboot is issued.



Example:



	restart@fc4ab000 {

Documentation/devicetree/bindings/power/supply/qcom/smb1351-charger.txt

+6 −1
Original line number Diff line number Diff line
@@ -28,7 +28,10 @@ Optional Properties: 
- qcom,disable-apsd		This is a bool property which disables automatic

				power source detection (APSD). If this is set

				charger detection is done by DCIN UV irq.

- qcom,charging-disabled	This is a bool property which disables charging.

- qcom,charging-disabled	This is a bool property which disables charging

				by suspending usb.

- qcom,batt-charging-disabled	This is a bool property which disables battery

				charging.

- qcom,using-pmic-therm		This property indicates thermal pin connected to pmic or smb.

- qcom,bms-psy-name		This is a string and it points to the bms

				power supply name.
@@ -73,6 +76,8 @@ Optional Properties: 
				used for charge current sensing.

- qcom,stacked-batfet:		Boolean flag. Specifies if parallel charger has stacked BATFET

				cofiguration.

- qcom,otg-enable:		Boolean value which enables OTG(On-The-Go)

				functionality.



Example for standalone charger:

Documentation/devicetree/bindings/qdsp/msm-fastrpc.txt

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ Optional properties: 
- qcom,fastrpc-legacy-remote-heap	:	Bool indicating hypervisor is not supported.

- qcom,fastrpc-adsp-audio-pdr:  Flag to enable ADSP Audio PDR

- qcom,secure-domains:  FastRPC secure domain configuration

- qcom,fastrpc-adsp-sensors-pdr: Flag to enable Sensors PDR



Optional subnodes:

- qcom,msm_fastrpc_compute_cb :	Child nodes representing the compute context
@@ -38,6 +39,7 @@ Example: 
		qcom,fastrpc-rpmsg;

		qcom,rpc-latency-us = <2343>;

		qcom,adsp-remoteheap-vmid = <22 37>;

		qcom,fastrpc-adsp-sensors-pdr;



		qcom,msm_fastrpc_rpmsg {

			compatible = "qcom,msm-fastrpc-rpmsg";