summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-10-10 11:17:45 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-10-10 11:17:45 -0700
commit4a06c8ac2fb3ef484579ce44f9b809bd310fad48 (patch)
treed7b5e49aaf84737243aadbbafc9d0b2f52877686 /Documentation
parent97d0c931c043646abd1f4c5446a8dfcaba162004 (diff)
parent72194739f54607bbf8cfded159627a2015381557 (diff)
downloadtalos-obmc-linux-4a06c8ac2fb3ef484579ce44f9b809bd310fad48.tar.gz
talos-obmc-linux-4a06c8ac2fb3ef484579ce44f9b809bd310fad48.zip
Merge tag 'usb-4.3-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
Pull USB fixes from Greg KH: "Here are some small USB and PHY fixes and quirk updates for 4.3-rc5. Nothing major here, full details in the shortlog, and all of these have been in linux-next for a while" * tag 'usb-4.3-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: usb: Add device quirk for Logitech PTZ cameras USB: chaoskey read offset bug USB: Add reset-resume quirk for two Plantronics usb headphones. usb: renesas_usbhs: Add support for R-Car H3 usb: renesas_usbhs: fix build warning if 64-bit architecture usb: gadget: bdc: fix memory leak phy: berlin-sata: Fix module autoload for OF platform driver phy: rockchip-usb: power down phy when rockchip phy probe phy: qcom-ufs: fix build error when the component is built as a module
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/usb/renesas_usbhs.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/usb/renesas_usbhs.txt b/Documentation/devicetree/bindings/usb/renesas_usbhs.txt
index 64a4ca6cf96f..7d48f63db44e 100644
--- a/Documentation/devicetree/bindings/usb/renesas_usbhs.txt
+++ b/Documentation/devicetree/bindings/usb/renesas_usbhs.txt
@@ -5,6 +5,7 @@ Required properties:
- "renesas,usbhs-r8a7790"
- "renesas,usbhs-r8a7791"
- "renesas,usbhs-r8a7794"
+ - "renesas,usbhs-r8a7795"
- reg: Base address and length of the register for the USBHS
- interrupts: Interrupt specifier for the USBHS
- clocks: A list of phandle + clock specifier pairs
OpenPOWER on IntegriCloud