diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-05-27 04:35:49 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-05-27 04:35:49 +0200 |
| commit | 13557b5d8477cc978b4ef08424f69789858670d0 (patch) | |
| tree | b4c26fe1b530d7bcc3e6da9aec1e74a1f0eb1bea /Documentation | |
| parent | Merge tag 'for-4.1-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/kisho... (diff) | |
| parent | usb: renesas_usbhs: Don't disable the pipe if Control write status stage (diff) | |
| download | linux-13557b5d8477cc978b4ef08424f69789858670d0.tar.xz linux-13557b5d8477cc978b4ef08424f69789858670d0.zip | |
Merge tag 'fixes-for-v4.1-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus
Felipe writes:
usb: fixes for v4.1-rc5
A few late important fixes which have been pending
on mailing list due to my vacations.
The important fixes are a fix for DEPCMD and DGCMD
status bitfields on DWC3, a couple fixes for Renesas
USB Controller, one of which prevents a broken DT
binding from reaching v4.1-final, and an old fix for
s3c2410-udc where pullup logic was reversed.
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/usb/renesas_usbhs.txt | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Documentation/devicetree/bindings/usb/renesas_usbhs.txt b/Documentation/devicetree/bindings/usb/renesas_usbhs.txt index dc2a18f0b3a1..ddbe304beb21 100644 --- a/Documentation/devicetree/bindings/usb/renesas_usbhs.txt +++ b/Documentation/devicetree/bindings/usb/renesas_usbhs.txt @@ -15,10 +15,8 @@ Optional properties: - phys: phandle + phy specifier pair - phy-names: must be "usb" - dmas: Must contain a list of references to DMA specifiers. - - dma-names : Must contain a list of DMA names: - - tx0 ... tx<n> - - rx0 ... rx<n> - - This <n> means DnFIFO in USBHS module. + - dma-names : named "ch%d", where %d is the channel number ranging from zero + to the number of channels (DnFIFOs) minus one. Example: usbhs: usb@e6590000 { |