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

Commit 9adece38 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Promotion of kernel.lnx.4.4-161117. 

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1087423   I20a04c766e55c75db15662e9a13e20396b35f30e   msm: sde: Fix SDE rotator context list locking
1079648   I2ebdc0c41c521e56a400d685b6254174cffdc14b   msm: cpp: Use the src clock node to read the cpp src clo
1088608   I9c014261f5e25b3ec4585747d324ea2cb6ab18fb   icnss: Collect ramdump from MSA memory space
1079648   I436ad7fca01e599714f1bcb0abc06e5bc1165350   ARM: dts: msm: Add cpp src clock rates configuration for
1081738   Ibaa555cec8cfd296125af3e6277df5331f5c438b   leds: qpnp-wled: Add support to configure VREF_CONTROL f
1082787   I8c8bcf9da42668f3964b4dffcbc1b15465ea8018   icnss: Update WLFW header file to the latest and add fw_

Change-Id: If91f3f1170ebb92da7041b4b819c751f04474f1c
CRs-Fixed: 1088608, 1082787, 1087423, 1079648, 1081738
parents e53bd266 4b1c2e22

Documentation/devicetree/bindings/leds/leds-qpnp-wled.txt

+6 −2
Original line number Diff line number Diff line
@@ -25,7 +25,11 @@ Optional properties for WLED: 
- linux,default-trigger	: trigger for the backlight. default is NONE.

- qcom,fdbk-output	: string feedback current output for wled module. The accepted values

			  are "wled1", "wled2", "wled3", "wled4" and "auto". default is "auto".

- qcom,vref-mv		: maximum reference voltage in mv. default is 350.

- qcom,vref-uv		: maximum reference voltage in uV.

			  For pmi8994/8952/8996, supported values are from 300000 to 675000

			  with a step size of 25000, the default value is 350000.

			  For pmicobalt/pm2falcon, supported values are from 60000 to 397500

			  with a step size of 22500, the default value is 127500.

- qcom,switch-freq-khz	: switch frequency in khz. default is 800.

- qcom,ovp-mv		: Over voltage protection threshold in mV. Default is

			  29500. Supported values are:
@@ -94,7 +98,7 @@ Example: 
		linux,name = "wled";

		linux,default-trigger = "bkl-trigger";

		qcom,fdbk-output = "auto";

		qcom,vref-mv = <350>;

		qcom,vref-uv = <350000>;

		qcom,switch-freq-khz = <800>;

		qcom,ovp-mv = <29500>;

		qcom,ilim-ma = <980>;

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

+4 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ Required properties: 
  and reset lines used by this controller.

- reset-names: reset signal name strings sorted in the same order as the resets

  property.

- qcom,src-clock-rates =  This is an array which holds clock rates for cpp src

  clocks. The maximum size for the array is 10.



Required properties of the child node:

- qcom,stripe-base = Base offset of stripes in cpp payload.
@@ -107,6 +109,8 @@ Example: 
			<0x24 0x10000000>,

			<0x28 0x10000000>,

			<0x2C 0x10000000>;

		qcom,src-clock-rates = <100000000 200000000 384000000 404000000

			480000000 576000000 600000000>;

		qcom,cpp-fw-payload-info {

			qcom,stripe-base = <553>;

			qcom,plane-base = <481>;

arch/arm/boot/dts/qcom/msm-pm2falcon.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ 
			linux,name = "wled";

			linux,default-trigger = "bkl-trigger";

			qcom,fdbk-output = "auto";

			qcom,vref-mv = <350>;

			qcom,vref-uv = <127500>;

			qcom,switch-freq-khz = <800>;

			qcom,ovp-mv = <29600>;

			qcom,ilim-ma = <970>;

arch/arm/boot/dts/qcom/msm-pmi8994.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -523,7 +523,7 @@ 
			linux,name = "wled";

			linux,default-trigger = "bkl-trigger";

			qcom,fdbk-output = "auto";

			qcom,vref-mv = <350>;

			qcom,vref-uv = <350000>;

			qcom,switch-freq-khz = <800>;

			qcom,ovp-mv = <29500>;

			qcom,ilim-ma = <980>;

arch/arm/boot/dts/qcom/msm-pmicobalt.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -598,7 +598,7 @@ 
			linux,name = "wled";

			linux,default-trigger = "bkl-trigger";

			qcom,fdbk-output = "auto";

			qcom,vref-mv = <350>;

			qcom,vref-uv = <127500>;

			qcom,switch-freq-khz = <800>;

			qcom,ovp-mv = <29600>;

			qcom,ilim-ma = <970>;