History

Merge tag 'usb-4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

Pull USB/PHY driver updates from Greg KH: "Here is the large USB and PHY driver update for 4.14-rc1. Not all that exciting, a few new PHY drivers, the usual mess of gadget driver updates and fixes, and of course, xhci updates to try to tame that beast. A number of usb-serial updates and other small fixes all over the USB driver tree are in here as well. Full details are in the shortlog. All of these have been in linux-next for a while with no reported issues" * tag 'usb-4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (171 commits) usbip: vhci-hcd: make vhci_hc_driver const usb: phy: Avoid unchecked dereference warning usb: imx21-hcd: make imx21_hc_driver const usb: host: make ehci_fsl_overrides const and __initconst dt-bindings: mt8173-mtu3: add generic compatible and rename file dt-bindings: mt8173-xhci: add generic compatible and rename file usb: xhci-mtk: add generic compatible string usbip: auto retry for concurrent attach USB: serial: option: simplify 3 D-Link device entries USB: serial: option: add support for D-Link DWM-157 C1 usb: core: usbport: fix "BUG: key not in .data" when lockdep is enabled usb: chipidea: usb2: check memory allocation failure usb: Add device quirk for Logitech HD Pro Webcam C920-C usb: misc: lvstest: add entry to place port in compliance mode usb: xhci: Support enabling of compliance mode for xhci 1.1 usb:xhci:Fix regression when ATI chipsets detected usb: quirks: add delay init quirk for Corsair Strafe RGB keyboard usb: gadget: make snd_pcm_hardware const usb: common: use of_property_read_bool() USB: core: constify vm_operations_struct ...

Linus Torvalds committed 9 years ago

Commit 1a3b85e2 parents 0475919 46f5489162 files · +2925 −667Browse files

Showing the changes to include/uapi/linux (1 of 162 files). Show all

Unified · Split

include/uapi/linux/usb/charger.h+31−0
@@ -0,0 +1,31 @@
1/*
2 * This file defines the USB charger type and state that are needed for
3 * USB device APIs.
4 */
5
6#ifndef _UAPI__LINUX_USB_CHARGER_H
7#define _UAPI__LINUX_USB_CHARGER_H
8
9/*
10 * USB charger type:
11 * SDP (Standard Downstream Port)
12 * DCP (Dedicated Charging Port)
13 * CDP (Charging Downstream Port)
14 * ACA (Accessory Charger Adapters)
15 */
16enum usb_charger_type {
17 UNKNOWN_TYPE,
18 SDP_TYPE,
19 DCP_TYPE,
20 CDP_TYPE,
21 ACA_TYPE,
22};
23
24/* USB charger state */
25enum usb_charger_state {
26 USB_CHARGER_DEFAULT,
27 USB_CHARGER_PRESENT,
28 USB_CHARGER_ABSENT,
29};
30
31#endif /* _UAPI__LINUX_USB_CHARGER_H */