11 files changed, 151 insertions, 42 deletions

diff --git a/include/linux/usb/cdc.h b/include/linux/usb/cdc.h
new file mode 100644
index 000000000000..b5706f94ee9e
--- /dev/null
+++ b/include/linux/usb/cdc.h
@@ -0,0 +1,51 @@
+/*
+ * USB CDC common helpers
+ *
+ * Copyright (c) 2015 Oliver Neukum <oneukum@suse.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ */
+#ifndef __LINUX_USB_CDC_H
+#define __LINUX_USB_CDC_H
+
+#include <uapi/linux/usb/cdc.h>
+
+/*
+ * inofficial magic numbers
+ */
+
+#define CDC_PHONET_MAGIC_NUMBER         0xAB
+
+/*
+ * parsing CDC headers
+ */
+
+struct usb_cdc_parsed_header {
+        struct usb_cdc_union_desc *usb_cdc_union_desc;
+        struct usb_cdc_header_desc *usb_cdc_header_desc;
+
+        struct usb_cdc_call_mgmt_descriptor *usb_cdc_call_mgmt_descriptor;
+        struct usb_cdc_acm_descriptor *usb_cdc_acm_descriptor;
+        struct usb_cdc_country_functional_desc *usb_cdc_country_functional_desc;
+        struct usb_cdc_network_terminal_desc *usb_cdc_network_terminal_desc;
+        struct usb_cdc_ether_desc *usb_cdc_ether_desc;
+        struct usb_cdc_dmm_desc *usb_cdc_dmm_desc;
+        struct usb_cdc_mdlm_desc *usb_cdc_mdlm_desc;
+        struct usb_cdc_mdlm_detail_desc *usb_cdc_mdlm_detail_desc;
+        struct usb_cdc_obex_desc *usb_cdc_obex_desc;
+        struct usb_cdc_ncm_desc *usb_cdc_ncm_desc;
+        struct usb_cdc_mbim_desc *usb_cdc_mbim_desc;
+        struct usb_cdc_mbim_extended_desc *usb_cdc_mbim_extended_desc;
+
+        bool phonet_magic_present;
+};
+
+struct usb_interface;
+int cdc_parse_cdc_header(struct usb_cdc_parsed_header *hdr,
+                                struct usb_interface *intf,
+                                u8 *buffer,
+                                int buflen);
+
+#endif /* __LINUX_USB_CDC_H */
diff --git a/include/linux/usb/ch9.h b/include/linux/usb/ch9.h
index 27603bcbb9b9..6cc96bb12ddc 100644
--- a/include/linux/usb/ch9.h
+++ b/include/linux/usb/ch9.h
@@ -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.
diff --git a/include/linux/usb/chipidea.h b/include/linux/usb/chipidea.h
index a41833cd184c..5dd75fa47dd8 100644
--- a/include/linux/usb/chipidea.h
+++ b/include/linux/usb/chipidea.h
@@ -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 */
diff --git a/include/linux/usb/gadget.h b/include/linux/usb/gadget.h
index c14a69b36d27..3d583a10b926 100644
--- a/include/linux/usb/gadget.h
+++ b/include/linux/usb/gadget.h
@@ -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 */
diff --git a/include/linux/usb/gadget_configfs.h b/include/linux/usb/gadget_configfs.h
index d74c0ae989d5..c36e95730de1 100644
--- a/include/linux/usb/gadget_configfs.h
+++ b/include/linux/usb/gadget_configfs.h
@@ -7,9 +7,10 @@ int check_user_usb_string(const char *name,
                 struct usb_gadget_strings *stringtab_dev);
 
 #define GS_STRINGS_W(__struct, __name)  \
-        static ssize_t __struct##_##__name##_store(struct __struct *gs, \
+static ssize_t __struct##_##__name##_store(struct config_item *item, \
                 const char *page, size_t len)           \
 {                                                       \
+        struct __struct *gs = to_##__struct(item);      \
         int ret;                                        \
                                                         \
         ret = usb_string_copy(page, &gs->__name);       \
@@ -19,30 +20,20 @@ int check_user_usb_string(const char *name,
 }
 
 #define GS_STRINGS_R(__struct, __name)  \
-        static ssize_t __struct##_##__name##_show(struct __struct *gs, \
-                        char *page)     \
+static ssize_t __struct##_##__name##_show(struct config_item *item, char *page) \
 {       \
+        struct __struct *gs = to_##__struct(item);      \
         return sprintf(page, "%s\n", gs->__name ?: ""); \
 }
 
-#define GS_STRING_ITEM_ATTR(struct_name, name)  \
-        static struct struct_name##_attribute struct_name##_##name = \
-                __CONFIGFS_ATTR(name,  S_IRUGO | S_IWUSR,               \
-                                struct_name##_##name##_show,            \
-                                struct_name##_##name##_store)
-
 #define GS_STRINGS_RW(struct_name, _name)       \
         GS_STRINGS_R(struct_name, _name)        \
         GS_STRINGS_W(struct_name, _name)        \
-        GS_STRING_ITEM_ATTR(struct_name, _name)
+        CONFIGFS_ATTR(struct_name##_, _name)
 
 #define USB_CONFIG_STRING_RW_OPS(struct_in)                             \
-        CONFIGFS_ATTR_OPS(struct_in);                                   \
-                                                                        \
 static struct configfs_item_operations struct_in##_langid_item_ops = {  \
         .release                = struct_in##_attr_release,             \
-        .show_attribute         = struct_in##_attr_show,                \
-        .store_attribute        = struct_in##_attr_store,               \
 };                                                                      \
                                                                         \
 static struct config_item_type struct_in##_langid_type = {              \
diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h
index d2784c10bfe2..f89c24bd53a4 100644
--- a/include/linux/usb/hcd.h
+++ b/include/linux/usb/hcd.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 */
 
diff --git a/include/linux/usb/musb.h b/include/linux/usb/musb.h
index a4ee1b582183..fa6dc132bd1b 100644
--- a/include/linux/usb/musb.h
+++ b/include/linux/usb/musb.h
@@ -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 {
diff --git a/include/linux/usb/of.h b/include/linux/usb/of.h
index 8c5a818ec244..c3fe9e48ce27 100644
--- a/include/linux/usb/of.h
+++ b/include/linux/usb/of.h
@@ -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;
diff --git a/include/linux/usb/otg.h b/include/linux/usb/otg.h
index bd1dcf816100..67929df86df5 100644
--- a/include/linux/usb/otg.h
+++ b/include/linux/usb/otg.h
@@ -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 */
diff --git a/include/linux/usb/phy.h b/include/linux/usb/phy.h
index e39f251cf861..31a8068c42a5 100644
--- a/include/linux/usb/phy.h
+++ b/include/linux/usb/phy.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);
 
diff --git a/include/linux/usb/renesas_usbhs.h b/include/linux/usb/renesas_usbhs.h
index 3dd5a781da99..bfb74723f151 100644
--- a/include/linux/usb/renesas_usbhs.h
+++ b/include/linux/usb/renesas_usbhs.h
@@ -157,7 +157,7 @@ struct renesas_usbhs_driver_param {
          */
         int pio_dma_border; /* default is 64byte */
 
-        u32 type;
+        uintptr_t type;
         u32 enable_gpio;
 
         /*