Promotion of kernel.lnx.4.4-160909.

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1045908   I28af6ada1d0d709d44cfd0da29de8775796a0bbc   msm: sensor: Enable combo mode in 10NM CSI PHY
1057119   I01e2c9c8bafbb2be4c8d312a4212195c2a99f3ac   ARM: dts: msm: add VDD_APC CPR speed-bin 1 configuration
1062953   Id6524b7ae3e82e10ca651a2ca0de9223c18109da   tty : msm_serial: Remove the rtb logs of msm_serial writ
1064025   I08b3ffa1a027b3212b77fe661348f2852485ed0d   ARM: dts: msm: Update debug uart support for msmfalcon
1054908   Ibc0656c878f1bac6ac9b3b7c9e7a471d969e2b8c   ASoC: wcd934x: Use minimum phase for RX interpolation fi
1061427   Iac276eeec710a11e5feeb6899da121ca6324e19b   ASoC: qdsp6v2: Add proper dependency for audio driver
1064040   Id4b5593a5ed3290684ba43ebebe2466ba0b730b6   PM / devfreq: bw_hwmon: Add HW offload support to govern
1064333   Ic83fe1607d5f62e0ceefd4497aae0c111a2727d7   defconfig: msm: Add MSMTRITON in defconfigs
1050042   I452a050298a6ab081f64aa2dcf295d2d257bcb32   qcom-charger: expose RRADC charger temp and usbin readin
1053503   I3b42ee147fd0883696f9783f0a38d5bef888a10a   ALSA: timer: Fix leak in SNDRV_TIMER_IOCTL_PARAMS
1026601   Iab61eb0333545a17fff85bd34e7cf0c489d85700   ARM: dts: msm: enable audio over Display Port on msmcoba
1046606   Ia490d15a51ad70759c917fbe7e84fdadaa140e20   ASoC: wcd9xxx: check impedance index before use
1061372   Ica925da95b5ab35f63bb0355470475733080a88c   regulator: cpr3-regulator: correct CPR aging cleanup han
1060739   I75b83ce99f061104641188c0f0d3d6cd3e0cfb09   msm: mdss: Update MDP memory retention sequence for msmc
1052747   Ifcde1c6af624294cbd1944eaa9b526dd6dcc51de   usb: Add support for reset controller framework
982871   Idbae7f95dfd56293805b58e3c6626f5f6e07d08a   skb: printing port numbers with gso trace events
1064802   Ib959355264405ab779b24948f111a2ca61d367de   sched: Further re-factor HMP specific code
1057119   I778e33b9de9947dd33f4cb7142be8771d4afc7cb   regulator: cprh-kbss-regulator: increase number of suppo
1063805   I94ebf6366b75daf9102a50eb86e757139e6d4231   ARM: dts: msm: Add initial support for msmcobalt QRD VR1
1057119   Icf06fe334558bfc4e4dedc9b1f18d51c99987966   ARM: dts: msm: Update VDD_APC floor and ceiling voltages
1053705   Ic6e406254f9c20e89f40436cefa351002d18fd7b   msm: camera: jpegdma: Reg values stored in array at alte
1026601   I4e85351226b30b97d58ffcec76398fb8cbf9e730   ASoC: msmcobalt: Add support for Display Port
1063393   I585f4c560f0920d3cb56cce009297b5665abb42e   usb: composite: Draw 900mA on USB resume if speed is sup
1061372   I55d5fb0c799dfec73830e8e97dcff79cd045b29c   ARM: dts: msm: add VDD_GFX CPR aging allowed register fo
1054539   I8c4ceaa2703c15c1f590befb9397d47da9f9c1e9   ARM: dts: msm: update VDD_GFX CPR ceiling voltages for m
1060507   Icf927ce1eb7107007e1cc5c7b5f0a63814510398   msm: ipa: add dma test suite
1052415   I5148ec4ce55a00f5130a60d0c088b3f0218d2261   scsi: ufs: export set_bus_vote ops
1061793   Ie522631fc0db7460a0031a5d52e547b594547d4b   ARM: dts: msm: Add support for apqcobalt v2.1
1062365   If9f35626303321439286bd62e664e68c05ef19c5   regulator: cprh-kbss-regulator: add per-cluster fuse ref
1026601   I9fce9622ff0580bca2414a8d6625774ae3f2d6c0   ASoC: codecs: Add display port support in codec driver
1060019   Id8880caae81818fe72bf02f3a3a90a5650546182   ASoC: add sample rate macros upto 384KHz
1063482   I7ba2ef7baba673d4c06225e61df7a0922b82ba81   ARM: dts: msm: Add missing glink_pkt devices for MSMFALC
1060019   Iae32df7ce1fb42e0fa8e0259612a51c76bab1cb6   ASoC: msm: add 384KHz playback support
1058565   Ie3ed9fd8a4d58d4664fa71b2d3da320fabc6a05b   msm: isp: buffer queue management specific flags
1059577   I3ac8f740d7b84212da1d799b563a6e8ef1c9b493   usb: gadget: gsi: Fix handling of MSG PACKET FILTER
1051259   Ifa2c4721a156c34c6d917ff950d648bea6cee50e   msm: camera: sensor: Add state validation for flash
1061372   I7bcb88002bdc0609e835bc9ce29c84d93684e445   regulator: cpr3-regulator: add support for custom aging
1057115   I2c733a1f0ee4baf978c3715aa3bd74a6b46ee6c2   ARM: dts: msm: define perf cluster speed-bin 1 OSM LUT f
1046961   Ib0677ca792aea83ece1caf8a0afff341302747fb   input: ft5x06: defer touch resume to workqueue
1026601   I4cd5b738caab4d40c1c118d3111c3f4af740c84e   ASoC: msm: qdsp6v2: enable audio over display port
1062365   I9a8439d1f38a328a08590d2c5b11a611f11b4836   ARM: dts: msm: increase VDD_APC CPR LowSVS/SVS ceiling f
1062808   I5b8fa962718a5ae44dfd18a13285715580ee0dbc   clk: msm: Select appropriate clock flags for 32-bit
1058826   Ifea3a6e8bf45481c65a4455ee64318304798fee2   misc: qcom: qdsp6v2: initialize config_32
1038431   I8fd8bf7326f1ea80df1c2fdbb08ebf73aa9e279c   ASoC: wsa881x: Add a mixer control to control gain
1055047   I60d30192c55efd8b0d5dc455343464d29648281e   msm: kgsl: Add trace for throttling counters
1053360   Ia66e005d04bf9eccb7febd8cb0733a67f9a4faf4   ext4: check if in-inode xattr is corrupted in ext4_expan
1046606   I8e359864508cc2307d9e9619f36c7c08cc3842f9   ALSA: timer: check if timer->card is null before using i
1054539   Ibc5da9bb1e47e32acb0268a15cea79d48907b106   ARM: dts: msm: update VDD_GFX CPR step quot values for m
985631   Ifbbdc69044fc64d7ea02509bf8113ed94eeece1e   msm: kgsl: Improve logs for pagefaults on global buffers
1053360   Id3fc6ad39f771a0dbcab0c46a2df4f29cdb398f0   ext4 crypto: fix memleak in ext4_readdir()
1057383   I16556e1d6f4abe00e6f33b8375a5a1839dfca34e   arm64: Prevent msm-rtb tracing in memcpy_{from,to}io and
1049594   I0501e9d40461c91d913175df6869966d0a0a8b5b   ARM: dts: msm: Voter clocks for mmss_camss_jpeg0_clk for
1055867   I3ec0b8dce2b2bb1ccbcb5bdd7cd6621a5f9513f8   mfd: wcd9xxx: Reduce irqsoff latency
1059604   I8d39eaaa425e5e6fa97704c9bc15414f9a0f61ce   msm: vidc: Enhance debug capabilities of video driver
1064333   Ia18a2f53fc3bf7ca459182dc197ad6a2078c7f5c   ARM: dts: msm: Add initial device tree files for msmtrit
1008791   I5dc58b360b2bbce53493466a0bcd5363276c302a   cfg80211: Add option to report the bss entry in connect
1063719   Ie6858243a666aeb21cc486208b9dd8221e9ad674   soc: qcom: irq-helper: Add comments to exposed APIs
1053505   I53aa15632e941199010aae670cefb65c8fd56833   ALSA: timer: Fix leak in events via snd_timer_user_tinte
1061372   I3c0dd344e0192a375f31fefea7ef6559fab0652d   regulator: cpr3-mmss-regulator: change CPR aging sensor
1052787   Iedf7a3accbd14138ab7ed9e4e36a98fd7ca9a839   ASoC: utils: initialize dummy_codec before use
1057115   I9a864a2abb655e26fff5982b592b4f3c5dbfca24   clk: msm: osm: add support for speed-bin fuses
1026601   I7c2ace6dedc0cad34fe0ab46c6290526972824a1   ARM: dts: msm: rename codec child node of MSM external d
1053360   I64ea95854de3c633b17bea0b63ab658e1524befb   ext4 crypto: revalidate dentry after adding or removing
1053505   I12949efac2aba669d302908704005fb94ba7efd7   ALSA: timer: Fix leak in events via snd_timer_user_ccall
1046606   Ia988b11ff7d03edc4ddd959571da1378da62077c   ASoC: msm: qdsp6v2: check if buf is null before using it
1052854   I7d7517ab3f172016bb2f1c23fb2788bbd2d01086   power_supply: add two properties for step charging
1056610   I8d4267528068e36a648c328fbe6d6a35943f3810   msm: mdss: dsi: fix panel minimum refresh rate configura
1046606   Ib1af53ab52a65cca2ed9b3489359813e690b1cd6   ASoC: msm: qdsp6v2: check if index is out of range befor
1008791   If77035ca928bf5bc5a27230d9b3f6d56ea6c8b99   cfg80211: Define macro to indicate support for new cfg80

Change-Id: Id725fb8b5105b856e59ba90f0def8687b50cc711
CRs-Fixed: 1063805, 1063393, 1061372, 1062365, 1055047, 1060019, 1054908, 1062953, 1053705, 1057119, 1061427, 1060739, 1057115, 1054539, 1059604, 1046961, 1055867, 1053505, 1058826, 1053503, 1038431, 1063719, 1052854, 1058565, 1062808, 1056610, 1064333, 1049594, 1052747, 1060507, 982871, 1064040, 1064025, 985631, 1059577, 1061793, 1050042, 1057383, 1051259, 1053360, 1052415, 1046606, 1026601, 1064802, 1008791, 1063482, 1045908, 1052787

10 files changed, 96 insertions, 31 deletions

diff --git a/Documentation/DocBook/80211.tmpl b/Documentation/DocBook/80211.tmpl
index f9b9ad7894f5..02431aeca15f 100644
--- a/Documentation/DocBook/80211.tmpl
+++ b/Documentation/DocBook/80211.tmpl
@@ -136,6 +136,7 @@
 !Finclude/net/cfg80211.h cfg80211_tx_mlme_mgmt
 !Finclude/net/cfg80211.h cfg80211_ibss_joined
 !Finclude/net/cfg80211.h cfg80211_connect_result
+!Finclude/net/cfg80211.h cfg80211_connect_bss
 !Finclude/net/cfg80211.h cfg80211_roamed
 !Finclude/net/cfg80211.h cfg80211_disconnected
 !Finclude/net/cfg80211.h cfg80211_ready_on_channel
diff --git a/Documentation/devicetree/bindings/arm/msm/msm.txt b/Documentation/devicetree/bindings/arm/msm/msm.txt
index 42daa8a61e4c..7b1c081ef586 100644
--- a/Documentation/devicetree/bindings/arm/msm/msm.txt
+++ b/Documentation/devicetree/bindings/arm/msm/msm.txt
@@ -92,6 +92,9 @@ SoCs:
 - MSMFALCON
   compatible = "qcom,msmfalcon"
 
+- MSMTRITON
+  compatible = "qcom,msmtriton"
+
 - MSM8952
   compatible = "qcom,msm8952"
 
@@ -259,6 +262,7 @@ compatible = "qcom,msmhamster-cdp"
 compatible = "qcom,msmhamster-mtp"
 compatible = "qcom,msmfalcon-sim"
 compatible = "qcom,msmfalcon-rumi"
+compatible = "qcom,msmtriton-rumi"
 compatible = "qcom,msm8952-rumi"
 compatible = "qcom,msm8952-sim"
 compatible = "qcom,msm8952-qrd"
diff --git a/Documentation/devicetree/bindings/arm/msm/qcom,osm.txt b/Documentation/devicetree/bindings/arm/msm/qcom,osm.txt
index cee9b942a9e3..bcdef5564066 100644
--- a/Documentation/devicetree/bindings/arm/msm/qcom,osm.txt
+++ b/Documentation/devicetree/bindings/arm/msm/qcom,osm.txt
@@ -16,12 +16,14 @@ Properties:
 	Value type: <prop-encoded-array>
 	Definition: Addresses and sizes for the memory of the OSM controller,
 		    cluster PLL management, and APCS common register regions.
-
+		    Optionally, the address of the efuse registers used to
+		    determine the pwrcl or perfcl speed-bins.
 - reg-names
 	Usage:      required
 	Value type: <stringlist>
 	Definition: Address names. Must be "osm", "pwrcl_pll", "perfcl_pll",
-		    and "apcs_common".
+		    and "apcs_common". Optionally, "pwrcl_efuse" or
+		    "perfcl_efuse".
 		    Must be specified in the same order as the corresponding
 		    addresses are specified in the reg property.
 
diff --git a/Documentation/devicetree/bindings/fb/msm-hdmi-tx.txt b/Documentation/devicetree/bindings/fb/msm-hdmi-tx.txt
index da4cdf253b2c..628b4df9fd7d 100644
--- a/Documentation/devicetree/bindings/fb/msm-hdmi-tx.txt
+++ b/Documentation/devicetree/bindings/fb/msm-hdmi-tx.txt
@@ -53,23 +53,29 @@ Optional properties:
 		   - "secondary"
 		   - "tertiary"
 
-[Optional child nodes]: These nodes are for devices which are
-dependent on HDMI Tx controller. If HDMI Tx controller is disabled then
-these devices will be disabled as well. Ex. HDMI Audio Codec device.
-
-- qcom,msm-hdmi-audio-rx: Node for HDMI audio codec.
-Required properties:
-- compatible : "msm-hdmi-audio-codec-rx";
-
 msm_ext_disp is a device which manages the interaction between external
 displays (HDMI and Display Port) and the audio and display frameworks.
 
 Required properties:
 - compatible:				Must be "qcom,msm-ext-disp"
 
+[Required child nodes]: These nodes are for devices which are
+dependent on msm_ext_disp. If msm_ext_disp is disabled then
+these devices will be disabled as well. Ex. Audio Codec device.
+
+- ext_disp_audio_codec: Node for Audio Codec.
+
+Required properties:
+- compatible : "qcom,msm-ext-disp-audio-codec-rx";
+
 Example:
 	msm_ext_disp: qcom,msm_ext_disp {
 		compatible = "qcom,msm-ext-disp";
+
+		ext_disp_audio_codec: qcom,msm-ext-disp-audio-codec-rx {
+			compatible = "qcom,msm-ext-disp-audio-codec-rx";
+			qcom,msm_ext_disp = <&msm_ext_disp>;
+		};
 	};
 
 	mdss_hdmi_tx: qcom,hdmi_tx@fd922100 {
@@ -109,9 +115,6 @@ Example:
 		qcom,pluggable;
 		qcom,display-id = "secondary";
 
-		qcom,msm-hdmi-audio-rx {
-			compatible = "qcom,msm-hdmi-audio-codec-rx";
-		};
 		pinctrl-names = "hdmi_hpd_active", "hdmi_ddc_active",
 					"hdmi_cec_active", "hdmi_active",
 					"hdmi_sleep";
diff --git a/Documentation/devicetree/bindings/input/touchscreen/ft5x06-ts.txt b/Documentation/devicetree/bindings/input/touchscreen/ft5x06-ts.txt
index 8e2f0908562a..ec8b08ad60e4 100644
--- a/Documentation/devicetree/bindings/input/touchscreen/ft5x06-ts.txt
+++ b/Documentation/devicetree/bindings/input/touchscreen/ft5x06-ts.txt
@@ -71,6 +71,7 @@ Optional properties:
  - focaltech,fw-name	: specify the firmware file name
  - focaltech,psensor-support	: specify whether support the proximity sensor
  - focaltech,gesture-support	: specify whether support gesture feature
+ - focaltech,resume-in-workqueue : specifiy whether to defer the resume to workqueue
 
 Example:
 	i2c@f9923000{
diff --git a/Documentation/devicetree/bindings/power/qcom-charger/qpnp-smb2.txt b/Documentation/devicetree/bindings/power/qcom-charger/qpnp-smb2.txt
index 38f2cfe1d649..510a824fda79 100644
--- a/Documentation/devicetree/bindings/power/qcom-charger/qpnp-smb2.txt
+++ b/Documentation/devicetree/bindings/power/qcom-charger/qpnp-smb2.txt
@@ -80,6 +80,22 @@ Charger specific properties:
 		offset of charging current in uA, from -3100000 to 3200000.
 		If the array is not present, step charging is disabled.
 
+- io-channels
+  Usage:      optional
+  Value type: List of <phandle u32>
+  Definition: List of phandle and IIO specifier pairs, one pair
+		for each IIO input to the device. Note: if the
+		IIO provider specifies '0' for #io-channel-cells,
+		then only the phandle portion of the pair will appear.
+
+- io-channel-names
+  Usage:      optional
+  Value type: List of <string>
+  Definition: List of IIO input name strings sorted in the same
+		order as the io-channels property. Consumer drivers
+		will use io-channel-names to match IIO input names
+		with IIO specifiers.
+
 =============================================
 Second Level Nodes - SMB2 Charger Peripherals
 =============================================
@@ -110,6 +126,9 @@ pmicobalt_charger: qcom,qpnp-smb2 {
 	#address-cells = <1>;
 	#size-cells = <1>;
 
+	io-channels = <&pmic_rradc 0>;
+	io-channel-names = "rradc_batt_id";
+
 	qcom,suspend-input;
 	dpdm-supply = <&qusb_phy0>;
 
diff --git a/Documentation/devicetree/bindings/regulator/cpr3-regulator.txt b/Documentation/devicetree/bindings/regulator/cpr3-regulator.txt
index 7d88e9fbd9c6..af53e59cd87f 100644
--- a/Documentation/devicetree/bindings/regulator/cpr3-regulator.txt
+++ b/Documentation/devicetree/bindings/regulator/cpr3-regulator.txt
@@ -35,13 +35,15 @@ Platform independent properties:
 - reg
 	Usage:      required
 	Value type: <prop-encoded-array>
-	Definition: Addresses and sizes for the memory of the CPR3 controller
-		    and the first fuse row
+	Definition: Addresses and sizes for the memory of the CPR3 controller,
+		    the first fuse row, and optionally a register used to check
+		    if aging measurements are possible.
 
 - reg-names
 	Usage:      required
 	Value type: <stringlist>
-	Definition: Address names. Must be "cpr_ctrl" and "fuse_base".  Must be
+	Definition: Address names. Must include "cpr_ctrl" and "fuse_base".
+		    "aging_allowed" may also be specified.  The strings must be
 		    specified in the same order as the corresponding addresses
 		    are specified in the reg property.
 
@@ -183,6 +185,17 @@ Platform independent properties:
 		    This is the voltage that vdd-supply must be set to when
 		    performing an aging measurement.
 
+- qcom,cpr-aging-allowed-reg-mask
+	Usage:      required if "aging_allowed" register is specified
+	Value type: <u32>
+	Definition: Bitmask used to mask off the "aging_allowed" register.
+
+- qcom,cpr-aging-allowed-reg-value
+	Usage:      required if "aging_allowed" register is specified
+	Value type: <u32>
+	Definition: Value required in the masked off "aging_allowed" register
+		    bits in order for a CPR aging measurement to be possible.
+
 - qcom,cpr-panic-reg-addr-list
 	Usage:      optional
 	Value type: <prop-encoded-array>
diff --git a/Documentation/devicetree/bindings/sound/qcom-audio-dev.txt b/Documentation/devicetree/bindings/sound/qcom-audio-dev.txt
index f6dadb738175..a01bd451c577 100755
--- a/Documentation/devicetree/bindings/sound/qcom-audio-dev.txt
+++ b/Documentation/devicetree/bindings/sound/qcom-audio-dev.txt
@@ -470,6 +470,11 @@ Example:
 		qcom,msm-dai-q6-dev-id = <8>;
 	};
 
+	dai_dp: qcom,msm-dai-q6-dp {
+		compatible = "qcom,msm-dai-q6-hdmi";
+		qcom,msm-dai-q6-dev-id = <24608>;
+	};
+
 	qcom,msm-dai-q6 {
 		compatible = "qcom,msm-dai-q6";
 		qcom,msm-dai-q6-sb-0-rx {
@@ -784,7 +789,7 @@ Example:
 				"msm-voip-dsp", "msm-pcm-voice", "msm-pcm-loopback",
 				"msm-compress-dsp", "msm-pcm-hostless", "msm-pcm-afe",
 				"msm-lsm-client", "msm-pcm-routing", "msm-pcm-lpa";
-		asoc-cpu = <&dai_pri_auxpcm>, <&dai_hdmi>,
+		asoc-cpu = <&dai_pri_auxpcm>, <&dai_hdmi>, <&dai_dp>,
 				<&dai_mi2s0>, <&dai_mi2s1>, <&dai_mi2s2>, <&dai_mi2s3>,
 				<&sb_0_rx>, <&sb_0_tx>, <&sb_1_rx>, <&sb_1_tx>,
 				<&sb_3_rx>, <&sb_3_tx>, <&sb_4_rx>, <&sb_4_tx>,
@@ -793,6 +798,7 @@ Example:
 				<&incall_record_rx>, <&incall_record_tx>, <&incall_music_rx>,
 				<&incall_music_2_rx>;
 		asoc-cpu-names = "msm-dai-q6-auxpcm.1", "msm-dai-q6-hdmi.8",
+				"msm-dai-q6-dp.24608",
 				"msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",
 				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",
 				"msm-dai-q6-dev.16384", "msm-dai-q6-dev.16385",
@@ -1157,7 +1163,7 @@ Example:
 				<&bt_sco_tx>,<&int_fm_rx>,<&int_fm_tx>,<&afe_pcm_rx>,
 				<&afe_pcm_tx>,<&afe_proxy_rx>,<&afe_proxy_tx>,
 				<&incall_record_rx>,<&incall_record_tx>,<&incall_music_rx>,
-				<&incall_music2_rx>;
+				<&incall_music2_rx>,<&dai_dp>;
 		asoc-cpu-names = "msm-dai-q6-auxpcm.1","msm-dai-q6-auxpcm.2",
 				"msm-dai-q6-hdmi.8","msm-dai-q6-mi2s.0",
 				"msm-dai-q6-dev.16384","msm-dai-q6-dev.16385",
@@ -1171,7 +1177,7 @@ Example:
 				"msm-dai-q6-dev.225","msm-dai-q6-dev.241",
 				"msm-dai-q6-dev.240","msm-dai-q6-dev.32771",
 				"msm-dai-q6-dev.32772","msm-dai-q6-dev.32773",
-				"msm-dai-q6-dev.32770";
+				"msm-dai-q6-dev.32770","msm-dai-q6-dp.24608";
 		asoc-codec = <&stub>;
 		asoc-codec-names = "msm-stub-codec.1";
 	};
diff --git a/Documentation/devicetree/bindings/usb/msm-phy.txt b/Documentation/devicetree/bindings/usb/msm-phy.txt
index 0af26ca1f380..b45ee910258e 100644
--- a/Documentation/devicetree/bindings/usb/msm-phy.txt
+++ b/Documentation/devicetree/bindings/usb/msm-phy.txt
@@ -118,6 +118,10 @@ Required properties:
    USB3_PHY_POWER_DOWN_CONTROL,
    USB3_PHY_SW_RESET,
    USB3_PHY_START
+- resets: reset specifier pair consists of phandle for the reset controller
+  and reset lines used by this controller.
+- reset-names: reset signal name strings sorted in the same order as the resets
+  property.
 
 Optional properties:
  - reg: Additional register set of address and length to control QMP PHY are:
@@ -126,7 +130,7 @@ Optional properties:
  - clocks: a list of phandles to the PHY clocks. Use as per
    Documentation/devicetree/bindings/clock/clock-bindings.txt
  - clock-names: Names of the clocks in 1-1 correspondence with the "clocks"
-   property. Required clocks are "cfg_ahb_clk", "phy_reset" and "phy_phy_reset".
+   property. "cfg_ahb_clk" is an optional clock.
  - qcom,vbus-valid-override: If present, indicates VBUS pin is not connected to
    the USB PHY and the controller must rely on external VBUS notification in
    order to manually relay the notification to the SSPHY.
@@ -150,13 +154,17 @@ Example:
 		clocks = <&clock_gcc clk_gcc_usb3_phy_aux_clk>,
 			 <&clock_gcc clk_gcc_usb3_phy_pipe_clk>,
 			 <&clock_gcc clk_gcc_usb_phy_cfg_ahb2phy_clk>,
-			 <&clock_gcc clk_gcc_usb3_phy_reset>,
-			 <&clock_gcc clk_gcc_usb3phy_phy_reset>,
 			 <&clock_gcc clk_ln_bb_clk1>,
 			 <&clock_gcc clk_gcc_usb3_clkref_clk>;
 
-		clock-names = "aux_clk", "pipe_clk", "cfg_ahb_clk", "phy_reset",
-			      "phy_phy_reset", "ref_clk_src", "ref_clk";
+		clock-names = "aux_clk", "pipe_clk", "cfg_ahb_clk",
+			      "ref_clk_src", "ref_clk";
+
+		resets = <&clock_gcc GCC_USB3_PHY_BCR>,
+			<&clock_gcc GCC_USB3PHY_PHY_BCR>;
+		reset-names = "phy_reset",
+				"phy_phy_reset";
+
 	};
 
 QUSB2 High-Speed PHY
@@ -173,11 +181,11 @@ Required properties:
  - qcom,vdd-voltage-level: This property must be a list of three integer
    values (no, min, max) where each value represents either a voltage in
    microvolts or a value corresponding to voltage corner
- - clocks: a list of phandles to the PHY clocks. Use as per
-   Documentation/devicetree/bindings/clock/clock-bindings.txt
- - clock-names: Names of the clocks in 1-1 correspondence with the "clocks"
-   property. Required clock is "phy_reset".
  - phy_type: Should be one of "ulpi" or "utmi". ChipIdea core uses "ulpi" mode.
+ - resets: reset specifier pair consists of phandle for the reset controller
+   and reset lines used by this controller.
+ - reset-names: reset signal name strings sorted in the same order as the resets
+   property.
 
 Optional properties:
  - reg-names: Additional registers corresponding with the following:
@@ -218,7 +226,8 @@ Example:
 
 		clocks = <&clock_rpm clk_ln_bb_clk>,
 			 <&clock_gcc clk_gcc_rx2_usb1_clkref_clk>,
-			 <&clock_gcc clk_gcc_usb_phy_cfg_ahb2phy_clk>,
-			 <&clock_gcc clk_gcc_qusb2_phy_reset>;
-		clock-names = "ref_clk_src", "ref_clk", "cfg_ahb_clk", "phy_reset";
+			 <&clock_gcc clk_gcc_usb_phy_cfg_ahb2phy_clk>;
+		clock-names = "ref_clk_src", "ref_clk", "cfg_ahb_clk";
+		resets = <&clock_gcc GCC_QUSB2PHY_PRIM_BCR>;
+		reset-names = "phy_reset";
 	};
diff --git a/Documentation/devicetree/bindings/usb/msm-ssusb.txt b/Documentation/devicetree/bindings/usb/msm-ssusb.txt
index c5e5f1851fc2..f4d10908f4ff 100644
--- a/Documentation/devicetree/bindings/usb/msm-ssusb.txt
+++ b/Documentation/devicetree/bindings/usb/msm-ssusb.txt
@@ -15,6 +15,10 @@ Required properties :
  - clock-names: Names of the clocks in 1-1 correspondence with the "clocks"
    property. Required clocks are "xo", "iface_clk", "core_clk", "sleep_clk"
    and "utmi_clk".
+- resets: reset specifier pair consists of phandle for the reset provider
+  and reset lines used by this controller.
+- reset-names: reset signal name strings sorted in the same order as the resets
+  property.
 
 Optional properties :
 - reg: Additional registers
@@ -99,6 +103,9 @@ Example MSM USB3.0 controller device node :
 		clock-names = "core_clk", "iface_clk", "bus_aggr_clk",
 				"utmi_clk", "sleep_clk", "cfg_ahb_clk", "xo";
 
+		resets = <&clock_gcc GCC_USB_30_BCR>;
+		reset-names = "core_reset";
+
 		dwc3@f9200000 {
 			compatible = "synopsys,dwc3";
 			reg = <0xf9200000 0xfc000>;