Skip to content

Commit ec513b1

Browse files
committed
Merge tag 'usb-3.14-rc1' of git://git.kernel.org/pub/scm/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() ...
2 parents bcee634 + 2fc5a7d commit ec513b1

File tree

367 files changed

+16189
-8071
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

367 files changed

+16189
-8071
lines changed
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
What: /config/usb-gadget/gadget/functions/ffs.name
2+
Date: Nov 2013
3+
KenelVersion: 3.13
4+
Description: The purpose of this directory is to create and remove it.
5+
6+
A corresponding USB function instance is created/removed.
7+
There are no attributes here.
8+
9+
All parameters are set through FunctionFS.
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
What: /config/usb-gadget/gadget/functions/Loopback.name
2+
Date: Nov 2013
3+
KenelVersion: 3.13
4+
Description:
5+
The attributes:
6+
7+
qlen - depth of loopback queue
8+
bulk_buflen - buffer length
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
What: /config/usb-gadget/gadget/functions/SourceSink.name
2+
Date: Nov 2013
3+
KenelVersion: 3.13
4+
Description:
5+
The attributes:
6+
7+
pattern - 0 (all zeros), 1 (mod63), 2 (none)
8+
isoc_interval - 1..16
9+
isoc_maxpacket - 0 - 1023 (fs), 0 - 1024 (hs/ss)
10+
isoc_mult - 0..2 (hs/ss only)
11+
isoc_maxburst - 0..15 (ss only)
12+
qlen - buffer length

Documentation/ABI/testing/sysfs-bus-usb

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,19 @@ Description:
5050
This may allow the driver to support more hardware than
5151
was included in the driver's static device ID support
5252
table at compile time. The format for the device ID is:
53-
idVendor idProduct bInterfaceClass.
53+
idVendor idProduct bInterfaceClass RefIdVendor RefIdProduct
5454
The vendor ID and device ID fields are required, the
55-
interface class is optional.
55+
rest is optional. The Ref* tuple can be used to tell the
56+
driver to use the same driver_data for the new device as
57+
it is used for the reference device.
5658
Upon successfully adding an ID, the driver will probe
5759
for the device and attempt to bind to it. For example:
5860
# echo "8086 10f5" > /sys/bus/usb/drivers/foo/new_id
5961

62+
Here add a new device (0458:7045) using driver_data from
63+
an already supported device (0458:704c):
64+
# echo "0458 7045 0 0458 704c" > /sys/bus/usb/drivers/foo/new_id
65+
6066
Reading from this file will list all dynamically added
6167
device IDs in the same format, with one entry per
6268
line. For example:
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
What: /sys/bus/platform/devices/tahvo-usb/otg_mode
2+
Date: December 2013
3+
Contact: Aaro Koskinen <aaro.koskinen@iki.fi>
4+
Description:
5+
Set or read the current OTG mode. Valid values are "host" and
6+
"peripheral".
7+
8+
Reading: returns the current mode.
9+
10+
What: /sys/bus/platform/devices/tahvo-usb/vbus
11+
Date: December 2013
12+
Contact: Aaro Koskinen <aaro.koskinen@iki.fi>
13+
Description:
14+
Read the current VBUS state.
15+
16+
Reading: returns "on" or "off".
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
BROADCOM KONA USB2 PHY
2+
3+
Required properties:
4+
- compatible: brcm,kona-usb2-phy
5+
- reg: offset and length of the PHY registers
6+
- #phy-cells: must be 0
7+
Refer to phy/phy-bindings.txt for the generic PHY binding properties
8+
9+
Example:
10+
11+
usbphy: usb-phy@3f130000 {
12+
compatible = "brcm,kona-usb2-phy";
13+
reg = <0x3f130000 0x28>;
14+
#phy-cells = <0>;
15+
};
File renamed without changes.

Documentation/devicetree/bindings/usb/dwc2.txt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,23 @@ Required properties:
77
- snps,dwc2: A generic DWC2 USB controller with default parameters.
88
- reg : Should contain 1 register range (address and length)
99
- interrupts : Should contain 1 interrupt
10+
- clocks: clock provider specifier
11+
- clock-names: shall be "otg"
12+
Refer to clk/clock-bindings.txt for generic clock consumer properties
13+
14+
Optional properties:
15+
- phys: phy provider specifier
16+
- phy-names: shall be "device"
17+
Refer to phy/phy-bindings.txt for generic phy consumer properties
1018

1119
Example:
1220

1321
usb@101c0000 {
1422
compatible = "ralink,rt3050-usb, snps,dwc2";
1523
reg = <0x101c0000 40000>;
1624
interrupts = <18>;
25+
clocks = <&usb_otg_ahb_clk>;
26+
clock-names = "otg";
27+
phys = <&usbphy>;
28+
phy-names = "usb2-phy";
1729
};
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
USB Peripheral Controller driver for Aeroflex Gaisler GRUSBDC.
2+
3+
The GRUSBDC USB Device Controller core is available in the GRLIB VHDL
4+
IP core library.
5+
6+
Note: In the ordinary environment for the core, a Leon SPARC system,
7+
these properties are built from information in the AMBA plug&play.
8+
9+
Required properties:
10+
11+
- name : Should be "GAISLER_USBDC" or "01_021"
12+
13+
- reg : Address and length of the register set for the device
14+
15+
- interrupts : Interrupt numbers for this device
16+
17+
Optional properties:
18+
19+
- epobufsizes : An array of buffer sizes for OUT endpoints. If the property is
20+
not present, or for endpoints outside of the array, 1024 is assumed by
21+
the driver.
22+
23+
- epibufsizes : An array of buffer sizes for IN endpoints. If the property is
24+
not present, or for endpoints outside of the array, 1024 is assumed by
25+
the driver.
26+
27+
For further information look in the documentation for the GLIB IP core library:
28+
http://www.gaisler.com/products/grlib/grip.pdf

Documentation/devicetree/bindings/usb/omap-usb.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,8 @@ Required properties:
8787
e.g. USB3 PHY and SATA PHY on OMAP5.
8888
"ti,control-phy-dra7usb2" - if it has power down register like USB2 PHY on
8989
DRA7 platform.
90+
"ti,control-phy-am437usb2" - if it has power down register like USB2 PHY on
91+
AM437 platform.
9092
- reg : Address and length of the register set for the device. It contains
9193
the address of "otghs_control" for control-phy-otghs or "power" register
9294
for other types.

0 commit comments

Comments
 (0)