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

Pull USB/PHY updates from Greg KH:
 "Here is the big USB/PHY driver pull request for 5.1-rc1.

  The usual set of gadget driver updates, phy driver updates, xhci
  updates, and typec additions. Also included in here are a lot of small
  cleanups and fixes and driver updates where needed.

  All of these have been in linux-next for a while with no reported
  issues"

* tag 'usb-5.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (167 commits)
  wusb: Remove unnecessary static function ckhdid_printf
  usb: core: make default autosuspend delay configurable
  usb: core: Fix typo in description of "authorized_default"
  usb: chipidea: Refactor USB PHY selection and keep a single PHY
  usb: chipidea: Grab the (legacy) USB PHY by phandle first
  usb: chipidea: imx: set power polarity
  dt-bindings: usb: ci-hdrc-usb2: add property power-active-high
  usb: chipidea: imx: remove unused header files
  usb: chipidea: tegra: Fix missed ci_hdrc_remove_device()
  usb: core: add option of only authorizing internal devices
  usb: typec: tps6598x: handle block writes separately with plain-I2C adapters
  usb: xhci: Fix for Enabling USB ROLE SWITCH QUIRK on INTEL_SUNRISEPOINT_LP_XHCI
  usb: xhci: fix build warning - missing prototype
  usb: xhci: dbc: Fixing typo error.
  usb: xhci: remove unused member 'parent' in xhci_regset struct
  xhci: tegra: Prevent error pointer dereference
  USB: serial: option: add Telit ME910 ECM composition
  usb: core: Replace hardcoded check with inline function from usb.h
  usb: core: skip interfaces disabled in devicetree
  usb: typec: mux: remove redundant check on variable match
  ...

9 files changed, 31 insertions, 36 deletions

diff --git a/include/linux/device.h b/include/linux/device.h
index 928e899ccbfb..54b586105179 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -758,11 +758,17 @@ struct device_dma_parameters {
 
 /**
  * struct device_connection - Device Connection Descriptor
+ * @fwnode: The device node of the connected device
  * @endpoint: The names of the two devices connected together
  * @id: Unique identifier for the connection
  * @list: List head, private, for internal use only
+ *
+ * NOTE: @fwnode is not used together with @endpoint. @fwnode is used when
+ * platform firmware defines the connection. When the connection is registered
+ * with device_connection_add() @endpoint is used instead.
  */
 struct device_connection {
+        struct fwnode_handle    *fwnode;
         const char              *endpoint[2];
         const char              *id;
         struct list_head        list;
diff --git a/include/linux/fsl_devices.h b/include/linux/fsl_devices.h
index 60cef8227534..5da56a674f2f 100644
--- a/include/linux/fsl_devices.h
+++ b/include/linux/fsl_devices.h
@@ -98,10 +98,11 @@ struct fsl_usb2_platform_data {
 
         unsigned        suspended:1;
         unsigned        already_suspended:1;
-        unsigned        has_fsl_erratum_a007792:1;
-        unsigned        has_fsl_erratum_a005275:1;
+        unsigned        has_fsl_erratum_a007792:1;
+        unsigned        has_fsl_erratum_14:1;
+        unsigned        has_fsl_erratum_a005275:1;
         unsigned        has_fsl_erratum_a005697:1;
-        unsigned        check_phy_clk_valid:1;
+        unsigned        check_phy_clk_valid:1;
 
         /* register save area for suspend/resume */
         u32             pm_command;
diff --git a/include/linux/phy/phy-mipi-dphy.h b/include/linux/phy/phy-mipi-dphy.h
index c08aacc0ac35..a877ffee845d 100644
--- a/include/linux/phy/phy-mipi-dphy.h
+++ b/include/linux/phy/phy-mipi-dphy.h
@@ -6,8 +6,6 @@
 #ifndef __PHY_MIPI_DPHY_H_
 #define __PHY_MIPI_DPHY_H_
 
-#include <video/videomode.h>
-
 /**
  * struct phy_configure_opts_mipi_dphy - MIPI D-PHY configuration set
  *
@@ -192,10 +190,10 @@ struct phy_configure_opts_mipi_dphy {
         /**
          * @init:
          *
-         * Time, in picoseconds for the initialization period to
+         * Time, in microseconds for the initialization period to
          * complete.
          *
-         * Minimum value: 100000000 ps
+         * Minimum value: 100 us
          */
         unsigned int            init;
 
@@ -246,11 +244,11 @@ struct phy_configure_opts_mipi_dphy {
         /**
          * @wakeup:
          *
-         * Time, in picoseconds, that a transmitter drives a Mark-1
+         * Time, in microseconds, that a transmitter drives a Mark-1
          * state prior to a Stop state in order to initiate an exit
          * from ULPS.
          *
-         * Minimum value: 1000000000 ps
+         * Minimum value: 1000 us
          */
         unsigned int            wakeup;
 
@@ -271,7 +269,8 @@ struct phy_configure_opts_mipi_dphy {
         /**
          * @lanes:
          *
-         * Number of active data lanes used for the transmissions.
+         * Number of active, consecutive, data lanes, starting from
+         * lane 0, used for the transmissions.
          */
         unsigned char           lanes;
 };
diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h
index 7dc3a411bece..695931b03684 100644
--- a/include/linux/usb/hcd.h
+++ b/include/linux/usb/hcd.h
@@ -72,6 +72,12 @@ struct giveback_urb_bh {
         struct usb_host_endpoint *completing_ep;
 };
 
+enum usb_dev_authorize_policy {
+        USB_DEVICE_AUTHORIZE_NONE       = 0,
+        USB_DEVICE_AUTHORIZE_ALL        = 1,
+        USB_DEVICE_AUTHORIZE_INTERNAL   = 2,
+};
+
 struct usb_hcd {
 
         /*
@@ -117,7 +123,6 @@ struct usb_hcd {
 #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().
@@ -142,8 +147,7 @@ struct usb_hcd {
          * 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))
+        enum usb_dev_authorize_policy dev_policy;
 
         /* Flags that get set only during HCD registration or removal. */
         unsigned                rh_registered:1;/* is root hub registered? */
diff --git a/include/linux/usb/role.h b/include/linux/usb/role.h
index edc51be4a77c..c05ffa6abda9 100644
--- a/include/linux/usb/role.h
+++ b/include/linux/usb/role.h
@@ -18,6 +18,7 @@ typedef enum usb_role (*usb_role_switch_get_t)(struct device *dev);
 
 /**
  * struct usb_role_switch_desc - USB Role Switch Descriptor
+ * @fwnode: The device node to be associated with the role switch
  * @usb2_port: Optional reference to the host controller port device (USB2)
  * @usb3_port: Optional reference to the host controller port device (USB3)
  * @udc: Optional reference to the peripheral controller device
@@ -32,6 +33,7 @@ typedef enum usb_role (*usb_role_switch_get_t)(struct device *dev);
  * usb_role_switch_register() before registering the switch.
  */
 struct usb_role_switch_desc {
+        struct fwnode_handle *fwnode;
         struct device *usb2_port;
         struct device *usb3_port;
         struct device *udc;
diff --git a/include/linux/usb/tcpm.h b/include/linux/usb/tcpm.h
index 50c74a77db55..0c532ca3f079 100644
--- a/include/linux/usb/tcpm.h
+++ b/include/linux/usb/tcpm.h
@@ -159,12 +159,6 @@ struct tcpm_port;
 struct tcpm_port *tcpm_register_port(struct device *dev, struct tcpc_dev *tcpc);
 void tcpm_unregister_port(struct tcpm_port *port);
 
-int tcpm_update_source_capabilities(struct tcpm_port *port, const u32 *pdo,
-                                    unsigned int nr_pdo);
-int tcpm_update_sink_capabilities(struct tcpm_port *port, const u32 *pdo,
-                                  unsigned int nr_pdo,
-                                  unsigned int operating_snk_mw);
-
 void tcpm_vbus_change(struct tcpm_port *port);
 void tcpm_cc_change(struct tcpm_port *port);
 void tcpm_pd_receive(struct tcpm_port *port,
diff --git a/include/linux/usb/typec_dp.h b/include/linux/usb/typec_dp.h
index 55ae781d60a9..7fa12ef8d09a 100644
--- a/include/linux/usb/typec_dp.h
+++ b/include/linux/usb/typec_dp.h
@@ -92,4 +92,8 @@ enum {
 #define DP_CONF_PIN_ASSIGNEMENT_SHIFT   8
 #define DP_CONF_PIN_ASSIGNEMENT_MASK    GENMASK(15, 8)
 
+/* Helper for setting/getting the pin assignement value to the configuration */
+#define DP_CONF_SET_PIN_ASSIGN(_a_)     ((_a_) << 8)
+#define DP_CONF_GET_PIN_ASSIGN(_conf_)  (((_conf_) & GENMASK(15, 8)) >> 8)
+
 #endif /* __USB_TYPEC_DP_H */
diff --git a/include/linux/usb/typec_mux.h b/include/linux/usb/typec_mux.h
index 79293f630ee1..43f40685e53c 100644
--- a/include/linux/usb/typec_mux.h
+++ b/include/linux/usb/typec_mux.h
@@ -47,7 +47,8 @@ void typec_switch_put(struct typec_switch *sw);
 int typec_switch_register(struct typec_switch *sw);
 void typec_switch_unregister(struct typec_switch *sw);
 
-struct typec_mux *typec_mux_get(struct device *dev, const char *name);
+struct typec_mux *
+typec_mux_get(struct device *dev, const struct typec_altmode_desc *desc);
 void typec_mux_put(struct typec_mux *mux);
 int typec_mux_register(struct typec_mux *mux);
 void typec_mux_unregister(struct typec_mux *mux);
diff --git a/include/linux/usb/wusb.h b/include/linux/usb/wusb.h
index 9e4a3213f2c2..65adee629106 100644
--- a/include/linux/usb/wusb.h
+++ b/include/linux/usb/wusb.h
@@ -236,22 +236,6 @@ enum {
         WUSB_TRUST_TIMEOUT_MS = 4000,   /* [WUSB] section 4.15.1 */
 };
 
-static inline size_t ckhdid_printf(char *pr_ckhdid, size_t size,
-                                   const struct wusb_ckhdid *ckhdid)
-{
-        return scnprintf(pr_ckhdid, size,
-                         "%02hx %02hx %02hx %02hx %02hx %02hx %02hx %02hx "
-                         "%02hx %02hx %02hx %02hx %02hx %02hx %02hx %02hx",
-                         ckhdid->data[0],  ckhdid->data[1],
-                         ckhdid->data[2],  ckhdid->data[3],
-                         ckhdid->data[4],  ckhdid->data[5],
-                         ckhdid->data[6],  ckhdid->data[7],
-                         ckhdid->data[8],  ckhdid->data[9],
-                         ckhdid->data[10], ckhdid->data[11],
-                         ckhdid->data[12], ckhdid->data[13],
-                         ckhdid->data[14], ckhdid->data[15]);
-}
-
 /*
  * WUSB Crypto stuff (WUSB1.0[6])
  */