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

Pull USB/PHY updates from Greg KH:
 "Here is the big set of USB and PHY driver patches for 4.21-rc1.

  All of the usual bits are in here:

  - loads of USB gadget driver updates and additions

  - new device ids

  - phy driver updates

  - xhci reworks and new features

  - typec updates

  Full details are in the shortlog.

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

* tag 'usb-4.21-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (142 commits)
  USB: serial: option: add Fibocom NL678 series
  cdc-acm: fix abnormal DATA RX issue for Mediatek Preloader.
  usb: r8a66597: Fix a possible concurrency use-after-free bug in r8a66597_endpoint_disable()
  usb: typec: tcpm: Extend the matching rules on PPS APDO selection
  usb: typec: Improve Alt Mode documentation
  usb: musb: dsps: fix runtime pm for peripheral mode
  usb: musb: dsps: fix otg state machine
  USB: serial: pl2303: add ids for Hewlett-Packard HP POS pole displays
  usb: renesas_usbhs: add support for RZ/G2E
  usb: ehci-omap: Fix deferred probe for phy handling
  usb: roles: Add a description for the class to Kconfig
  usb: renesas_usbhs: mark PM functions as __maybe_unused
  usb: core: Remove unnecessary memset()
  usb: host: isp1362-hcd: convert to DEFINE_SHOW_ATTRIBUTE
  phy: qcom-qmp: Expose provided clocks to DT
  dt-bindings: phy-qcom-qmp: Move #clock-cells to child
  phy: qcom-qmp: Utilize fully-specified DT registers
  dt-bindings: phy-qcom-qmp: Fix register underspecification
  phy: ti: fix semicolon.cocci warnings
  phy: dphy: Add configuration helpers
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/mscc/ocelot.c
Simple merge

diff --cc drivers/net/ethernet/ti/cpsw.c
index 0e8f61a29479201ec157f1e1cdd97e76d0851cc4,94e5e5b791ecbdfc69b7d381160f29128f0ac6e2..a591583d120e1f598ab66f8d5e07daf15dc46321
--- 1/drivers/net/ethernet/ti/cpsw.c
--- 2/drivers/net/ethernet/ti/cpsw.c
+++ b/drivers/net/ethernet/ti/cpsw.c
@@@ -3271,9 -3151,19 +3278,19 @@@ static int cpsw_probe_dt(struct cpsw_pl
                const __be32 *parp;
  
                /* This is no slave child node, continue */
 -              if (strcmp(slave_node->name, "slave"))
 +              if (!of_node_name_eq(slave_node, "slave"))
                        continue;
  
+               slave_data->ifphy = devm_of_phy_get(&pdev->dev, slave_node,
+                                                   NULL);
+               if (!IS_ENABLED(CONFIG_TI_CPSW_PHY_SEL) &&
+                   IS_ERR(slave_data->ifphy)) {
+                       ret = PTR_ERR(slave_data->ifphy);
+                       dev_err(&pdev->dev,
+                               "%d: Error retrieving port phy: %d\n", i, ret);
+                       return ret;
+               }
+ 
                slave_data->phy_node = of_parse_phandle(slave_node,
                                                        "phy-handle", 0);
                parp = of_get_property(slave_node, "phy_id", &lenp);

diff --cc drivers/platform/x86/intel_cht_int33fe.c
Simple merge