mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-25 22:23:14 -04:00
USB patches for 4.4-rc1
Here is the big USB patchset for 4.4-rc1. As usual, most of the changes are in the gadget subsystem, and we removed a host controller for a device that is no longer in existance, and probably never was even made public. There is also other minor driver updates and new device ids, full details in the changelog. All of these have been in linux-next for a while. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iEYEABECAAYFAlY6gVMACgkQMUfUDdst+ynLZgCePfhiDuwriaX7osq90HDu8JOc pTEAn2dBdw2VMPToUlxccR963YSfgu2A =mMgp -----END PGP SIGNATURE----- Merge tag 'usb-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb Pull USB updates from Greg KH: "Here is the big USB patchset for 4.4-rc1. As usual, most of the changes are in the gadget subsystem, and we removed a host controller for a device that is no longer in existance, and probably never was even made public. There is also other minor driver updates and new device ids, full details in the changelog. All of these have been in linux-next for a while" * tag 'usb-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (233 commits) USB: core: Codestyle fix in urb.c usb: misc: usb3503: Use i2c_add_driver helper macro usb: host: lpc32xx: don't unregister phy device usb: host: lpc32xx: balance clk enable/disable on removal usb: host: lpc32xx: fix warnings caused by enabling unprepared clock uwb: drp: Use setup_timer uwb: neh: Use setup_timer uwb: rsv: Use setup_timer USB: qcserial: add Sierra Wireless MC74xx/EM74xx usb: chipidea: otg: don't wait vbus drops below BSV when starts host chipidea: ci_hdrc_pci: use PCI_VDEVICE() instead of PCI_DEVICE() doc: dt-binding: ci-hdrc-usb2: split vendor specific properties usb: chipidea: imx: add imx6ul usb support doc: dt-binding: ci-hdrc-usb2: improve property description usb: chipidea: imx: add usb support for imx7d Doc: usb: ci-hdrc-usb2: Add phy-clkgate-delay-us entry usb: chipidea: Add support for 'phy-clkgate-delay-us' property usb: chipidea: Use extcon framework for VBUS and ID detect usb: gadget: net2280: restore ep_cfg after defect7374 workaround usb: dwc2: host: Fix use after free w/ simultaneous irqs ...
This commit is contained in:
Linus Torvalds
commit
3d6f47801c
144 changed files with 5964 additions and 10544 deletions
|
|
@ -25,15 +25,6 @@
|
|||
*/
|
||||
#define ATMEL_MAX_UART 7
|
||||
|
||||
/* USB Device */
|
||||
struct at91_udc_data {
|
||||
int vbus_pin; /* high == host powering us */
|
||||
u8 vbus_active_low; /* vbus polarity */
|
||||
u8 vbus_polled; /* Use polling, not interrupt */
|
||||
int pullup_pin; /* active == D+ pulled up */
|
||||
u8 pullup_active_low; /* true == pullup_pin is active low */
|
||||
};
|
||||
|
||||
/* Compact Flash */
|
||||
struct at91_cf_data {
|
||||
int irq_pin; /* I/O IRQ */
|
||||
|
|
|
|||
|
|
@ -17,19 +17,19 @@
|
|||
|
||||
struct platform_device;
|
||||
|
||||
enum s3c_hsotg_dmamode {
|
||||
enum dwc2_hsotg_dmamode {
|
||||
S3C_HSOTG_DMA_NONE, /* do not use DMA at-all */
|
||||
S3C_HSOTG_DMA_ONLY, /* always use DMA */
|
||||
S3C_HSOTG_DMA_DRV, /* DMA is chosen by driver */
|
||||
};
|
||||
|
||||
/**
|
||||
* struct s3c_hsotg_plat - platform data for high-speed otg/udc
|
||||
* struct dwc2_hsotg_plat - platform data for high-speed otg/udc
|
||||
* @dma: Whether to use DMA or not.
|
||||
* @is_osc: The clock source is an oscillator, not a crystal
|
||||
*/
|
||||
struct s3c_hsotg_plat {
|
||||
enum s3c_hsotg_dmamode dma;
|
||||
struct dwc2_hsotg_plat {
|
||||
enum dwc2_hsotg_dmamode dma;
|
||||
unsigned int is_osc:1;
|
||||
int phy_type;
|
||||
|
||||
|
|
@ -37,6 +37,6 @@ struct s3c_hsotg_plat {
|
|||
int (*phy_exit)(struct platform_device *pdev, int type);
|
||||
};
|
||||
|
||||
extern void s3c_hsotg_set_platdata(struct s3c_hsotg_plat *pd);
|
||||
extern void dwc2_hsotg_set_platdata(struct dwc2_hsotg_plat *pd);
|
||||
|
||||
#endif /* __LINUX_USB_S3C_HSOTG_H */
|
||||
|
|
|
|||
|
|
@ -122,6 +122,8 @@ enum usb_interface_condition {
|
|||
* has been deferred.
|
||||
* @needs_binding: flag set when the driver should be re-probed or unbound
|
||||
* following a reset or suspend operation it doesn't support.
|
||||
* @authorized: This allows to (de)authorize individual interfaces instead
|
||||
* a whole device in contrast to the device authorization.
|
||||
* @dev: driver model's view of this device
|
||||
* @usb_dev: if an interface is bound to the USB major, this will point
|
||||
* to the sysfs representation for that device.
|
||||
|
|
@ -178,6 +180,7 @@ struct usb_interface {
|
|||
unsigned needs_altsetting0:1; /* switch to altsetting 0 is pending */
|
||||
unsigned needs_binding:1; /* needs delayed unbind/rebind */
|
||||
unsigned resetting_device:1; /* true: bandwidth alloc after reset */
|
||||
unsigned authorized:1; /* used for interface authorization */
|
||||
|
||||
struct device dev; /* interface specific device info */
|
||||
struct device *usb_dev;
|
||||
|
|
@ -325,6 +328,7 @@ struct usb_host_bos {
|
|||
/* wireless cap descriptor is handled by wusb */
|
||||
struct usb_ext_cap_descriptor *ext_cap;
|
||||
struct usb_ss_cap_descriptor *ss_cap;
|
||||
struct usb_ssp_cap_descriptor *ssp_cap;
|
||||
struct usb_ss_container_id_descriptor *ss_id;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -32,9 +32,9 @@
|
|||
#ifndef __LINUX_USB_CH9_H
|
||||
#define __LINUX_USB_CH9_H
|
||||
|
||||
#include <linux/device.h>
|
||||
#include <uapi/linux/usb/ch9.h>
|
||||
|
||||
|
||||
/**
|
||||
* usb_speed_string() - Returns human readable-name of the speed.
|
||||
* @speed: The speed to return human-readable name for. If it's not
|
||||
|
|
@ -43,6 +43,15 @@
|
|||
*/
|
||||
extern const char *usb_speed_string(enum usb_device_speed speed);
|
||||
|
||||
/**
|
||||
* usb_get_maximum_speed - Get maximum requested speed for a given USB
|
||||
* controller.
|
||||
* @dev: Pointer to the given USB controller device
|
||||
*
|
||||
* The function gets the maximum speed string from property "maximum-speed",
|
||||
* and returns the corresponding enum usb_device_speed.
|
||||
*/
|
||||
extern enum usb_device_speed usb_get_maximum_speed(struct device *dev);
|
||||
|
||||
/**
|
||||
* usb_state_string - Returns human readable name for the state.
|
||||
|
|
|
|||
|
|
@ -5,9 +5,28 @@
|
|||
#ifndef __LINUX_USB_CHIPIDEA_H
|
||||
#define __LINUX_USB_CHIPIDEA_H
|
||||
|
||||
#include <linux/extcon.h>
|
||||
#include <linux/usb/otg.h>
|
||||
|
||||
struct ci_hdrc;
|
||||
|
||||
/**
|
||||
* struct ci_hdrc_cable - structure for external connector cable state tracking
|
||||
* @state: current state of the line
|
||||
* @changed: set to true when extcon event happen
|
||||
* @edev: device which generate events
|
||||
* @ci: driver state of the chipidea device
|
||||
* @nb: hold event notification callback
|
||||
* @conn: used for notification registration
|
||||
*/
|
||||
struct ci_hdrc_cable {
|
||||
bool state;
|
||||
bool changed;
|
||||
struct extcon_dev *edev;
|
||||
struct ci_hdrc *ci;
|
||||
struct notifier_block nb;
|
||||
};
|
||||
|
||||
struct ci_hdrc_platform_data {
|
||||
const char *name;
|
||||
/* offset of the capability registers */
|
||||
|
|
@ -48,6 +67,11 @@ struct ci_hdrc_platform_data {
|
|||
u32 ahb_burst_config;
|
||||
u32 tx_burst_size;
|
||||
u32 rx_burst_size;
|
||||
|
||||
/* VBUS and ID signal state tracking, using extcon framework */
|
||||
struct ci_hdrc_cable vbus_extcon;
|
||||
struct ci_hdrc_cable id_extcon;
|
||||
u32 phy_clkgate_delay_us;
|
||||
};
|
||||
|
||||
/* Default offset of capability registers */
|
||||
|
|
|
|||
|
|
@ -215,6 +215,7 @@ struct usb_ep {
|
|||
struct list_head ep_list;
|
||||
struct usb_ep_caps caps;
|
||||
bool claimed;
|
||||
bool enabled;
|
||||
unsigned maxpacket:16;
|
||||
unsigned maxpacket_limit:16;
|
||||
unsigned max_streams:16;
|
||||
|
|
@ -264,7 +265,18 @@ static inline void usb_ep_set_maxpacket_limit(struct usb_ep *ep,
|
|||
*/
|
||||
static inline int usb_ep_enable(struct usb_ep *ep)
|
||||
{
|
||||
return ep->ops->enable(ep, ep->desc);
|
||||
int ret;
|
||||
|
||||
if (ep->enabled)
|
||||
return 0;
|
||||
|
||||
ret = ep->ops->enable(ep, ep->desc);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
ep->enabled = true;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -281,7 +293,18 @@ static inline int usb_ep_enable(struct usb_ep *ep)
|
|||
*/
|
||||
static inline int usb_ep_disable(struct usb_ep *ep)
|
||||
{
|
||||
return ep->ops->disable(ep);
|
||||
int ret;
|
||||
|
||||
if (!ep->enabled)
|
||||
return 0;
|
||||
|
||||
ret = ep->ops->disable(ep);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
ep->enabled = false;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -1233,6 +1256,8 @@ extern struct usb_ep *usb_ep_autoconfig_ss(struct usb_gadget *,
|
|||
struct usb_endpoint_descriptor *,
|
||||
struct usb_ss_ep_comp_descriptor *);
|
||||
|
||||
extern void usb_ep_autoconfig_release(struct usb_ep *);
|
||||
|
||||
extern void usb_ep_autoconfig_reset(struct usb_gadget *);
|
||||
|
||||
#endif /* __LINUX_USB_GADGET_H */
|
||||
|
|
|
|||
|
|
@ -58,12 +58,6 @@
|
|||
*
|
||||
* Since "struct usb_bus" is so thin, you can't share much code in it.
|
||||
* This framework is a layer over that, and should be more sharable.
|
||||
*
|
||||
* @authorized_default: Specifies if new devices are authorized to
|
||||
* connect by default or they require explicit
|
||||
* user space authorization; this bit is settable
|
||||
* through /sys/class/usb_host/X/authorized_default.
|
||||
* For the rest is RO, so we don't lock to r/w it.
|
||||
*/
|
||||
|
||||
/*-------------------------------------------------------------------------*/
|
||||
|
|
@ -120,6 +114,8 @@ struct usb_hcd {
|
|||
#define HCD_FLAG_WAKEUP_PENDING 4 /* root hub is resuming? */
|
||||
#define HCD_FLAG_RH_RUNNING 5 /* root hub is running? */
|
||||
#define HCD_FLAG_DEAD 6 /* controller has died? */
|
||||
#define HCD_FLAG_INTF_AUTHORIZED 7 /* authorize interfaces? */
|
||||
#define HCD_FLAG_DEV_AUTHORIZED 8 /* authorize devices? */
|
||||
|
||||
/* The flags can be tested using these macros; they are likely to
|
||||
* be slightly faster than test_bit().
|
||||
|
|
@ -131,6 +127,22 @@ struct usb_hcd {
|
|||
#define HCD_RH_RUNNING(hcd) ((hcd)->flags & (1U << HCD_FLAG_RH_RUNNING))
|
||||
#define HCD_DEAD(hcd) ((hcd)->flags & (1U << HCD_FLAG_DEAD))
|
||||
|
||||
/*
|
||||
* Specifies if interfaces are authorized by default
|
||||
* or they require explicit user space authorization; this bit is
|
||||
* settable through /sys/class/usb_host/X/interface_authorized_default
|
||||
*/
|
||||
#define HCD_INTF_AUTHORIZED(hcd) \
|
||||
((hcd)->flags & (1U << HCD_FLAG_INTF_AUTHORIZED))
|
||||
|
||||
/*
|
||||
* Specifies if devices are authorized by default
|
||||
* or they require explicit user space authorization; this bit is
|
||||
* settable through /sys/class/usb_host/X/authorized_default
|
||||
*/
|
||||
#define HCD_DEV_AUTHORIZED(hcd) \
|
||||
((hcd)->flags & (1U << HCD_FLAG_DEV_AUTHORIZED))
|
||||
|
||||
/* Flags that get set only during HCD registration or removal. */
|
||||
unsigned rh_registered:1;/* is root hub registered? */
|
||||
unsigned rh_pollable:1; /* may we poll the root hub? */
|
||||
|
|
@ -141,7 +153,6 @@ struct usb_hcd {
|
|||
* support the new root-hub polling mechanism. */
|
||||
unsigned uses_new_polling:1;
|
||||
unsigned wireless:1; /* Wireless USB HCD */
|
||||
unsigned authorized_default:1;
|
||||
unsigned has_tt:1; /* Integrated TT in root hub */
|
||||
unsigned amd_resume_bug:1; /* AMD remote wakeup quirk */
|
||||
unsigned can_do_streams:1; /* HC supports streams */
|
||||
|
|
@ -239,6 +250,7 @@ struct hc_driver {
|
|||
#define HCD_USB2 0x0020 /* USB 2.0 */
|
||||
#define HCD_USB25 0x0030 /* Wireless USB 1.0 (USB 2.5)*/
|
||||
#define HCD_USB3 0x0040 /* USB 3.0 */
|
||||
#define HCD_USB31 0x0050 /* USB 3.1 */
|
||||
#define HCD_MASK 0x0070
|
||||
#define HCD_BH 0x0100 /* URB complete in BH context */
|
||||
|
||||
|
|
|
|||
|
|
@ -95,7 +95,7 @@ struct musb_hdrc_config {
|
|||
/* musb CLKIN in Blackfin in MHZ */
|
||||
unsigned char clkin;
|
||||
#endif
|
||||
|
||||
u32 maximum_speed;
|
||||
};
|
||||
|
||||
struct musb_hdrc_platform_data {
|
||||
|
|
|
|||
|
|
@ -12,22 +12,10 @@
|
|||
#include <linux/usb/phy.h>
|
||||
|
||||
#if IS_ENABLED(CONFIG_OF)
|
||||
enum usb_dr_mode of_usb_get_dr_mode(struct device_node *np);
|
||||
enum usb_device_speed of_usb_get_maximum_speed(struct device_node *np);
|
||||
bool of_usb_host_tpl_support(struct device_node *np);
|
||||
int of_usb_update_otg_caps(struct device_node *np,
|
||||
struct usb_otg_caps *otg_caps);
|
||||
#else
|
||||
static inline enum usb_dr_mode of_usb_get_dr_mode(struct device_node *np)
|
||||
{
|
||||
return USB_DR_MODE_UNKNOWN;
|
||||
}
|
||||
|
||||
static inline enum usb_device_speed
|
||||
of_usb_get_maximum_speed(struct device_node *np)
|
||||
{
|
||||
return USB_SPEED_UNKNOWN;
|
||||
}
|
||||
static inline bool of_usb_host_tpl_support(struct device_node *np)
|
||||
{
|
||||
return false;
|
||||
|
|
|
|||
|
|
@ -119,4 +119,13 @@ enum usb_dr_mode {
|
|||
USB_DR_MODE_OTG,
|
||||
};
|
||||
|
||||
/**
|
||||
* usb_get_dr_mode - Get dual role mode for given device
|
||||
* @dev: Pointer to the given device
|
||||
*
|
||||
* The function gets phy interface string from property 'dr_mode',
|
||||
* and returns the correspondig enum usb_dr_mode
|
||||
*/
|
||||
extern enum usb_dr_mode usb_get_dr_mode(struct device *dev);
|
||||
|
||||
#endif /* __LINUX_USB_OTG_H */
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ enum usb_otg_state {
|
|||
struct usb_phy;
|
||||
struct usb_otg;
|
||||
|
||||
/* for transceivers connected thru an ULPI interface, the user must
|
||||
/* for phys connected thru an ULPI interface, the user must
|
||||
* provide access ops
|
||||
*/
|
||||
struct usb_phy_io_ops {
|
||||
|
|
@ -92,10 +92,10 @@ struct usb_phy {
|
|||
u16 port_status;
|
||||
u16 port_change;
|
||||
|
||||
/* to support controllers that have multiple transceivers */
|
||||
/* to support controllers that have multiple phys */
|
||||
struct list_head head;
|
||||
|
||||
/* initialize/shutdown the OTG controller */
|
||||
/* initialize/shutdown the phy */
|
||||
int (*init)(struct usb_phy *x);
|
||||
void (*shutdown)(struct usb_phy *x);
|
||||
|
||||
|
|
@ -106,7 +106,7 @@ struct usb_phy {
|
|||
int (*set_power)(struct usb_phy *x,
|
||||
unsigned mA);
|
||||
|
||||
/* Set transceiver into suspend mode */
|
||||
/* Set phy into suspend mode */
|
||||
int (*set_suspend)(struct usb_phy *x,
|
||||
int suspend);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue