From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 21 Jan 2014 00:13:02 +0000 (-0800)
Subject: Merge tag 'usb-3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
X-Git-Tag: v3.14-rc1~148
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ec513b16c480c6cdda1e3d597e611eafca05227b;p=platform%2Fkernel%2Flinux-stable.git

Merge tag 'usb-3.14-rc1' of git://git./linux/kernel/git/gregkh/usb

Pull USB updates from Greg KH:
 "Here's the big USB pull request for 3.14-rc1

  Lots of little things all over the place, and the usual USB gadget
  updates, and XHCI fixes (some for an issue reported by a lot of
  people).  USB PHY updates as well as chipidea updates and fixes.

  All of these have been in the linux-next tree with no reported issues"

* tag 'usb-3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (318 commits)
  usb: chipidea: udc: using MultO at TD as real mult value for ISO-TX
  usb: chipidea: need to mask INT_STATUS when write otgsc
  usb: chipidea: put hw_phymode_configure before ci_usb_phy_init
  usb: chipidea: Fix Internal error: : 808 [#1] ARM related to STS flag
  usb: chipidea: imx: set CI_HDRC_IMX28_WRITE_FIX for imx28
  usb: chipidea: add freescale imx28 special write register method
  usb: ehci: add freescale imx28 special write register method
  usb: core: check for valid id_table when using the RefId feature
  usb: cdc-wdm: resp_count can be 0 even if WDM_READ is set
  usb: core: bail out if user gives an unknown RefId when using new_id
  usb: core: allow a reference device for new_id
  usb: core: add sanity checks when using bInterfaceClass with new_id
  USB: image: correct spelling mistake in comment
  USB: c67x00: correct spelling mistakes in comments
  usb: delete non-required instances of include <linux/init.h>
  usb:hub set hub->change_bits when over-current happens
  Revert "usb: chipidea: imx: set CI_HDRC_IMX28_WRITE_FIX for imx28"
  xhci: Set scatter-gather limit to avoid failed block writes.
  xhci: Avoid infinite loop when sg urb requires too many trbs
  usb: gadget: remove unused variable in gr_queue_int()
  ...
---

ec513b16c480c6cdda1e3d597e611eafca05227b
diff --cc Documentation/devicetree/bindings/usb/dwc2.txt
index 8b60e90,a1753ed..b8b6871
--- a/Documentation/devicetree/bindings/usb/dwc2.txt
+++ b/Documentation/devicetree/bindings/usb/dwc2.txt
@@@ -2,11 -2,17 +2,19 @@@ Platform DesignWare HS OTG USB 2.0 cont
  -----------------------------------------------------
  
  Required properties:
 -- compatible : "snps,dwc2"
 +- compatible : One of:
 +  - brcm,bcm2835-usb: The DWC2 USB controller instance in the BCM2835 SoC.
 +  - snps,dwc2: A generic DWC2 USB controller with default parameters.
  - reg : Should contain 1 register range (address and length)
  - interrupts : Should contain 1 interrupt
+ - clocks: clock provider specifier
+ - clock-names: shall be "otg"
+ Refer to clk/clock-bindings.txt for generic clock consumer properties
+ 
+ Optional properties:
+ - phys: phy provider specifier
+ - phy-names: shall be "device"
+ Refer to phy/phy-bindings.txt for generic phy consumer properties
  
  Example:
  
diff --cc drivers/phy/Makefile
index 4e4adc9,c447f1a..b57c253
--- a/drivers/phy/Makefile
+++ b/drivers/phy/Makefile
@@@ -3,8 -3,8 +3,9 @@@
  #
  
  obj-$(CONFIG_GENERIC_PHY)		+= phy-core.o
+ obj-$(CONFIG_BCM_KONA_USB2_PHY)		+= phy-bcm-kona-usb2.o
  obj-$(CONFIG_PHY_EXYNOS_DP_VIDEO)	+= phy-exynos-dp-video.o
  obj-$(CONFIG_PHY_EXYNOS_MIPI_VIDEO)	+= phy-exynos-mipi-video.o
 +obj-$(CONFIG_PHY_MVEBU_SATA)		+= phy-mvebu-sata.o
  obj-$(CONFIG_OMAP_USB2)			+= phy-omap-usb2.o
  obj-$(CONFIG_TWL4030_USB)		+= phy-twl4030-usb.o
diff --cc drivers/usb/Kconfig
index 7eb909a,a34fb98..2e6b832
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@@ -106,10 -104,10 +104,12 @@@ source "drivers/usb/image/Kconfig
  
  endif
  
+ source "drivers/usb/musb/Kconfig"
+ 
  source "drivers/usb/dwc3/Kconfig"
  
 +source "drivers/usb/dwc2/Kconfig"
 +
  source "drivers/usb/chipidea/Kconfig"
  
  comment "USB port drivers"