Promotion of kernel.lnx.4.4-161102.

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1068171   Ic0f2a51b5af661fd23576ae5135c920b92f0cdfd   dt-bindings: power: reset: add document for reboot-mode
1082552   If27cb2bb3fcaafa5c8435f3c2e0e4be9b8f1e987   sched/hmp: Disable interrupts when resetting all task st
1082652   Ic4791164cee1dea0cc36c8445f546b9ec56785d4   drivers: cpuidle: lpm-levels: Enable Sleep prediction
1068171   Id65f6b9186e7a5209542a380bae31a1d8933b931   power: reset: add reboot mode driver
1070301   I619272c5d0439427061541f5658cfd305a4ebd46   usb: xhci-plat: Enable wakeup for the root hubs
1082708   I0228967ca3b33a56489a80833c0565ba2dfe8c2a   msm: ipa3: fix send_cmd_timeout logic
1080024   I00c612be2b8c22dd5afb65a739551df91cb324fc   ANDROID: dm verity fec: initialize recursion level
1083755   Iea068907241b42846d95d8e62e59409cdd29ca42   ASoC: wcd9335: Enable standalone ldo_h
1084195   I7c3d321f9f062037d85efba437a3fc1012b64d4b   pmic-voter: Add the votable name in debugfs
1077457   If2bb1900c07af1ea162da362c913d4880b0bc755   msm: crypto: Fix integer over flow check in qce driver
1072781   Ie6b5a511f5b3077adae7d464de437f2aa893b0c9   msm: kgsl: Clear the interrupt immediately
1082598   I2a49535786ac61c4da0bebe300aff33a556e485d   ARM: dts: msm: fix WLED sink configuration for msmcobalt
1066400   Id08f7b2e109b6b2963b19dfe07f07cbfb424202b   spmi-pmic-arb: fix a possible null pointer dereference
1082630   I490b5679de4cb4837f5ed5d4e40d339e12c8ecc9   icnss: Shutdown Adrastea before remapping MSA0
1080024   I7ce9f38d8c7a62361392c5a8ccebb288f8a3a2ea   ANDROID: dm: allow adb disable-verity only in userdebug
1082196   I1f53c9536b6896111707b77954d2b6cf4d227db8   usb: dwc3: Turn on memory core and periphery upon resume
1081279   I30cd3fb0435e085e76a60043b80b6ff7aded2819   clk: msm: Add COMMON_CLK branch memory flags
1080024   Id27cf5231aebcdd14f4fb25dd44052f829e0427e   Revert "dm-verity: Add a temporary dummy opaque struct d
1080024   Idb88b901e0209c2cccc9c0796689f780592d58f9   ANDROID: dm verity fec: fix RS block calculation
1081637   I0a34f0bbc9f2049b826777a31e14d2cf62cdc211   qseecom: check error return value of ion_map_kernel
1080024   I2d9354e240d36ea06fc68c2d18d8e87b823a4c2f   ANDROID: dm: fix signature verification flag
1082349   I0d8e9bdc15d052458e366cef13a6d2d8c7420ff2   arm64: Implement optimised IP checksum helpers
1083795   Ifa59335033f8b9bda6fb0ca4b071387fdaa8f6f9   ASoC: wcd934x: Restore CPR defaults after SSR
1080024   Ib34d25c0854202f3e70df0a6d0ef1d96f0250c8e   ANDROID: dm: android-verity: Verify header before fetchi
1049512   Id254a12ba8fc2d57951d158c8fce80168375586d   Bluetooth:Add ioctl to power control connectivity chip
1080024   I8f5c2289b842b820ca04f5773525e5449bb3f355   ANDROID: dm: mount as linear target if eng build
1080024   I4a377e417b00afd9ecccdb3e605fea31a7df112e   ANDROID: dm: rename dm-linear methods for dm-android-ver
1082804   I7901df15ec03273304c5e4d417f272497ad1523c   clk: msm: clock-osm: Request Nominal Fmax frequency afte
1083524   Iabc11506074511ee71463e9d287f6e460dca451e   ARM: dts: msm: Add initial support for msmcobalt v2 QRD
1080024   I506c89b053d835ab579e703eef2bc1f8487250de   ANDROID: dm: use default verity public key
1083708   Ifdd0089a6a970792ebd84665178bd4de86eae2fb   soc: qcom: signal buffer response after glink_rx_done()
1083306   I018729af22dbd787f42fc3788cbff018be7b4014   ARM: dts: msm: correct pmicobalt_bob regulator name for
1068949   Iba43e192905ab37d196aea4b5d00861b9cb7c347   msm: ipa3: Support IPA-USB suspend sequence without remo
1082304   I04008d0bfc9a874e08b45f78a937004e9f37527d   usb: pd: Fix sink hard reset looping bug
1080024   Icfdc3e7b3ead5de335a059cade1aca70414db415   ANDROID: dm-android-verity: Rebase on top of 4.1
1080024   Ie04c8cf2dd755f54d02dbdc4e734a13d6f6507b5   ANDROID: dm: android-verity: Remove fec_header location
1080024   I82a911cf963367b1f311c5035bf894a380a76e54   dm-verity: Add a temporary dummy opaque struct declarati
1067432   I2cd3b87aca032d4c5868cc9db35987213349a337   msm: ADSPRPC: Do not pass offset for secure buffers
1080024   I0a7ebff331d259c59a5e03c81918cc1613c3a766   ANDROID: dm verity fec: limit error correction recursion
1081779   I321bd79d04e135030764dcdf83a58fee3c4e72c8   msm: mdss: Add Rec2020 YUV conversion to CSC tables
1082870   Iea0a8cd64fcce14a99b828cadb0f07664ce858f0   usb: pd: Observe PSHardResetTimer for source hard reset
1082940   Idfc139ff63f6268f836694e0680c1e44582dfbb3   ARM: qcom: add board entries for msmtriton
1083675   I0ba41c9564c12b0b2c419222b54fa0e05be93b75   msm: ipa3: wait for uC load before USB disconnect
1056777   Ibee5689216d9115cb4888fb8593734eaef6c7f9f   ARM: dts: msm: add support for etm and cpu-cti on msmfal
1080024   I7e99644a0960ac8279f02c0158ed20999510ea97   ANDROID: dm: Add android verity target
1082643   I1aae776d5e6cc8f1cc2af9278c0e3d6ac37804a9   icnss: Enable PMM_TCXO_CLK before switch to cxo
1066017   Ibe0053e8bd4d8219098ba09041d66fcd5b4592fd   binder: prevent kptr leak by using %pK format specifier
1080024   Idb84453e70cc11abd5ef3a0adfbb16f8b5feaf07   ANDROID: dm: use name_to_dev_t
1083760   I2d3f3a299939a061a43b4f552aedc7cac897d8b7   smb138x-charger: Fix FCC and FV parameters
1051250   Ia5cc4a6bbf6b6d0d86e13cec7da167f8a49b859d   leds: qpnp-wled: Update AMOLED_VOUT programming
1054930   Id9273e546d3565935a7b1150c27993f02c5734e3   wil6210: prevent XTAL off in device bootloader
1080024   Ic64950c3b55f0a6eaa570bcedc2ace83bbf3005e   ANDROID: dm-verity: adopt changes made to dm callbacks
1078627   I55bff36d8504f5fd3041f0dad42a077f25976966   power: reset: Do not disable SDI during reset
1080024   Ic0f7c17e4889c5580d70b52d9a709a37165a5747   ANDROID: dm verity fec: add missing release from fec_kty
1044007   Ia706e7184ab31c5e4e3bb2668a1ab7660ca3c6ce   Don't show empty tag stats for unprivileged uids
1083199   Ib19d78f0834803c75b255ee3a119e043ffb8a988   ASoC: wcd934x: fix default value for FLL threshold
1081102   I9665dfc1c52d77dc8953042101d726e7f7ba1807   msm: vidc: Add Colorspace in sequence change event
1080024   Ic41ca4b8908fb2777263799cf3a3e25934d70f18   ANDROID: dm: Mounting root as linear device when verity
1075843   Ibc69706ae1dc878de5cbdaf283f0d71aff8000a1   leds: qpnp-wled: add support for configuring ILIM in pmi
1080024   Iceca2eb6daa55f0acb936eafe1d59f65f7cfcd55   init: do_mounts: Add a dummy definition for dm_table_put
1080024   I157170eebe3c0f89a68ae05870a1060f188d0da0   ANDROID: dm: Minor cleanup
1025311   Ic4c7f66e84c8898d9db630d373b8a3cc8472e826   cfg80211: pass struct to interface combination check/ite
1083198   Ibbca465192c58deba3618d70e36089119c7f3994   ASoC: wcd934x: Add impedance detection controls

Change-Id: Id0fc440d2bfff0c915eaf17a6dd1335053a7d24f
CRs-Fixed: 1083708, 1044007, 1083198, 1083199, 1083760, 1049512, 1082349, 1082304, 1070301, 1066017, 1081637, 1068949, 1082552, 1082870, 1083795, 1025311, 1082630, 1077457, 1080024, 1083524, 1066400, 1082196, 1081102, 1075843, 1083755, 1072781, 1083306, 1082652, 1084195, 1083675, 1051250, 1082940, 1054930, 1056777, 1081779, 1082598, 1082804, 1068171, 1067432, 1082643, 1078627, 1082708, 1081279

3 files changed, 76 insertions, 5 deletions

diff --git a/Documentation/devicetree/bindings/leds/leds-qpnp-wled.txt b/Documentation/devicetree/bindings/leds/leds-qpnp-wled.txt
index 1ca2b6dd6d5c..ebbcfe5b2fd0 100644
--- a/Documentation/devicetree/bindings/leds/leds-qpnp-wled.txt
+++ b/Documentation/devicetree/bindings/leds/leds-qpnp-wled.txt
@@ -33,7 +33,15 @@ Optional properties for WLED:
 			  - 31100, 29600, 19600, 18100 for pmicobalt/pm2falcon.
 			  Should only be used if qcom,disp-type-amoled is not
 			  specified.
-- qcom,ilim-ma		: maximum current limiter in ma. default is 980.
+- qcom,ilim-ma		: Current limit threshold in mA.
+			  For pmi8994/8952/8996, default value for LCD is 980mA
+			  and AMOLED is 385mA.
+			  Supported values are:
+			  - 105, 385, 660, 980, 1150, 1420, 1700, 1980.
+			  For pmicobalt/pm2falcon, default value for LCD is
+			  970mA and AMOLED is 620mA.
+			  Supported values are:
+			  - 105, 280, 450, 620, 970, 1150, 1300, 1500.
 - qcom,boost-duty-ns	: maximum boost duty cycle in ns. default is 104.
 - qcom,mod-freq-khz	: modulation frequency in khz. default is 9600.
 - qcom,dim-mode		: dimming mode. supporting dimming modes are "analog",
@@ -61,10 +69,13 @@ Optional properties if 'qcom,disp-type-amoled' is mentioned in DT:
 - qcom,loop-ea-gm	: control the gm for gm stage in control loop. default is 3.
 - qcom,loop-comp-res-kohm	: control to select the compensation resistor in kohm. default is 320.
 - qcom,vref-psm-mv	: reference psm voltage in mv. default for amoled is 450.
-- qcom,avdd-target-voltage-mv: The target voltage desired for the AVDD module in mV.
-				The supported values are:
-				7900, 7600, 7300, 6400, 6100, 5800.
-				If not specified, default value used is 7600.
+- qcom,avdd-mode-spmi: Boolean property to enable AMOLED_VOUT programming via SPMI. If not specified,
+			AMOLED_VOUT is programmed via S-wire. This can be specified only for newer
+			PMICs like pmicobalt/pm2falcon.
+- qcom,avdd-target-voltage-mv: The voltage required for AMOLED_VOUT. Accepted values are in the range
+				of 5650 to 7900 in steps of 150. Default value is 7600. Unit is in mV.
+				For old revisions, accepted values are: 7900, 7600, 7300, 6400, 6100,
+				5800.
 
 Example:
 	qcom,leds@d800 {
diff --git a/Documentation/devicetree/bindings/power/reset/reboot-mode.txt b/Documentation/devicetree/bindings/power/reset/reboot-mode.txt
new file mode 100644
index 000000000000..de34f27d509e
--- /dev/null
+++ b/Documentation/devicetree/bindings/power/reset/reboot-mode.txt
@@ -0,0 +1,25 @@
+Generic reboot mode core map driver
+
+This driver get reboot mode arguments and call the write
+interface to store the magic value in special register
+or ram. Then the bootloader can read it and take different
+action according to the argument stored.
+
+All mode properties are vendor specific, it is a indication to tell
+the bootloader what to do when the system reboots, and should be named
+as mode-xxx = <magic> (xxx is mode name, magic should be a none-zero value).
+
+For example modes common on Android platform:
+- mode-normal: Normal reboot mode, system reboot with command "reboot".
+- mode-recovery: Android Recovery mode, it is a mode to format the device or update a new image.
+- mode-bootloader: Android fastboot mode, it's a mode to re-flash partitions on the Android based device.
+- mode-loader: A bootloader mode, it's a mode used to download image on Rockchip platform,
+	       usually used in development.
+
+Example:
+	reboot-mode {
+		mode-normal = <BOOT_NORMAL>;
+		mode-recovery = <BOOT_RECOVERY>;
+		mode-bootloader = <BOOT_FASTBOOT>;
+		mode-loader = <BOOT_BL_DOWNLOAD>;
+	}
diff --git a/Documentation/devicetree/bindings/power/reset/syscon-reboot-mode.txt b/Documentation/devicetree/bindings/power/reset/syscon-reboot-mode.txt
new file mode 100644
index 000000000000..f7ce1d8af04a
--- /dev/null
+++ b/Documentation/devicetree/bindings/power/reset/syscon-reboot-mode.txt
@@ -0,0 +1,35 @@
+SYSCON reboot mode driver
+
+This driver gets reboot mode magic value form reboot-mode driver
+and stores it in a SYSCON mapped register. Then the bootloader
+can read it and take different action according to the magic
+value stored.
+
+This DT node should be represented as a sub-node of a "syscon", "simple-mfd"
+node.
+
+Required properties:
+- compatible: should be "syscon-reboot-mode"
+- offset: offset in the register map for the storage register (in bytes)
+
+Optional property:
+- mask: bits mask of the bits in the register to store the reboot mode magic value,
+  default set to 0xffffffff if missing.
+
+The rest of the properties should follow the generic reboot-mode description
+found in reboot-mode.txt
+
+Example:
+	pmu: pmu@20004000 {
+		compatible = "rockchip,rk3066-pmu", "syscon", "simple-mfd";
+		reg = <0x20004000 0x100>;
+
+		reboot-mode {
+			compatible = "syscon-reboot-mode";
+			offset = <0x40>;
+			mode-normal = <BOOT_NORMAL>;
+			mode-recovery = <BOOT_RECOVERY>;
+			mode-bootloader = <BOOT_FASTBOOT>;
+			mode-loader = <BOOT_BL_DOWNLOAD>;
+		};
+	};