Merge "usb: phy: Make cfg_ahb_clk optional"

diff --cc Documentation/devicetree/bindings/usb/msm-phy.txt
index 83bccb7,1d71dd6..2f82fbf
--- 1/Documentation/devicetree/bindings/usb/msm-phy.txt
--- 2/Documentation/devicetree/bindings/usb/msm-phy.txt
+++ b/Documentation/devicetree/bindings/usb/msm-phy.txt
@@@ -171,9 -190,11 +190,13 @@@ Optional properties
     allows us to manipulate QUSB PHY bits eg. to enable D+ pull-up using s/w
     control in device mode. The reg-names property is required if the
     reg property is specified.
+  - 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. "cfg_ahb_clk", "ref_clk_src" and "ref_clk" are optional clocks.
   - qcom,qusb-phy-init-seq: QUSB PHY initialization sequence with value,reg pair.
 + - qcom,qusb-phy-host-init-seq: QUSB PHY initialization sequence for host mode
 +   with value,reg pair.
   - qcom,emu-init-seq : emulation initialization sequence with value,reg pair.
   - qcom,phy-pll-reset-seq : emulation PLL reset sequence with value,reg pair.
   - qcom,emu-dcm-reset-seq : emulation DCM reset sequence with value,reg pair.

diff --cc drivers/usb/dwc3/dwc3-msm.c
Simple merge

diff --cc drivers/usb/phy/phy-msm-qusb-v2.c
Simple merge