From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 18 Sep 2019 17:33:46 +0000 (-0700)
Subject: Merge tag 'usb-5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
X-Git-Tag: Ubuntu-5.4-5.4.0-11.14~2046
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=c6b48dad92aedaa9bdc013ee495cb5b1bbdf1f11;p=mirror_ubuntu-focal-kernel.git

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

Pull USB updates from Greg KH:
 "Here is the big set of USB patches for 5.4-rc1.

  Two major chunks of code are moving out of the tree and into the
  staging directory, uwb and wusb (wireless USB support), because there
  are no devices that actually use this protocol anymore, and what we
  have today probably doesn't work at all given that the maintainers
  left many many years ago. So move it to staging where it will be
  removed in a few releases if no one screams.

  Other than that, lots of little things. The usual gadget and xhci and
  usb serial driver updates, along with a bunch of sysfs file cleanups
  due to the driver core changes to support that. Nothing really major,
  just constant forward progress.

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

* tag 'usb-5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (159 commits)
  USB: usbcore: Fix slab-out-of-bounds bug during device reset
  usb: cdns3: Remove redundant dev_err call in cdns3_probe()
  USB: rio500: Fix lockdep violation
  USB: rio500: simplify locking
  usb: mtu3: register a USB Role Switch for dual role mode
  usb: common: add USB GPIO based connection detection driver
  usb: common: create Kconfig file
  usb: roles: get usb-role-switch from parent
  usb: roles: Add fwnode_usb_role_switch_get() function
  device connection: Add fwnode_connection_find_match()
  usb: roles: Introduce stubs for the exiting functions in role.h
  dt-bindings: usb: mtu3: add properties about USB Role Switch
  dt-bindings: usb: add binding for USB GPIO based connection detection driver
  dt-bindings: connector: add optional properties for Type-B
  dt-binding: usb: add usb-role-switch property
  usbip: Implement SG support to vhci-hcd and stub driver
  usb: roles: intel: Enable static DRD mode for role switch
  xhci-ext-caps.c: Add property to disable Intel SW switch
  usb: dwc3: remove generic PHY calibrate() calls
  usb: core: phy: add support for PHY calibration
  ...
---

c6b48dad92aedaa9bdc013ee495cb5b1bbdf1f11
diff --cc drivers/usb/roles/intel-xhci-usb-role-switch.c
index 7325a84dd1c8,88d041601c51..409851306e99
--- a/drivers/usb/roles/intel-xhci-usb-role-switch.c
+++ b/drivers/usb/roles/intel-xhci-usb-role-switch.c
@@@ -37,12 -44,9 +44,13 @@@
  struct intel_xhci_usb_data {
  	struct usb_role_switch *role_sw;
  	void __iomem *base;
+ 	bool enable_sw_switch;
  };
  
 +static const struct software_node intel_xhci_usb_node = {
 +	"intel-xhci-usb-sw",
 +};
 +
  static int intel_xhci_usb_set_role(struct device *dev, enum usb_role role)
  {
  	struct intel_xhci_usb_data *data = dev_get_drvdata(dev);
@@@ -147,20 -167,12 +167,23 @@@ static int intel_xhci_usb_probe(struct 
  
  	platform_set_drvdata(pdev, data);
  
 +	ret = software_node_register(&intel_xhci_usb_node);
 +	if (ret)
 +		return ret;
 +
 +	sw_desc.set = intel_xhci_usb_set_role,
 +	sw_desc.get = intel_xhci_usb_get_role,
 +	sw_desc.allow_userspace_control = true,
 +	sw_desc.fwnode = software_node_fwnode(&intel_xhci_usb_node);
 +
+ 	data->enable_sw_switch = !device_property_read_bool(dev,
+ 						"sw_switch_disable");
+ 
  	data->role_sw = usb_role_switch_register(dev, &sw_desc);
 -	if (IS_ERR(data->role_sw))
 +	if (IS_ERR(data->role_sw)) {
 +		fwnode_handle_put(sw_desc.fwnode);
  		return PTR_ERR(data->role_sw);
 +	}
  
  	pm_runtime_set_active(dev);
  	pm_runtime_enable(dev);