Commit 33a4e37e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull USB / Thunderbolt driver fixes and ids from Greg KH:
 "Here are a few small USB and Thunderbolt driver fixes and new device
  ids for 6.0-rc7.

  They contain:

   - new usb-serial driver ids

   - documentation build warning fix in USB hub code

   - flexcop-usb long-posted bugfix (the v4l maintainer for this is MIA
     so I have finally picked this up as it is a fix for a reported
     problem.)

   - dwc3 64bit DMA bugfix

   - new thunderbolt device ids

   - typec build error fix

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

* tag 'usb-6.0-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  usb: typec: anx7411: Fix build error without CONFIG_POWER_SUPPLY
  media: flexcop-usb: fix endpoint type check
  USB: serial: option: add Quectel RM520N
  USB: serial: option: add Quectel BG95 0x0203 composition
  thunderbolt: Add support for Intel Maple Ridge single port controller
  usb: dwc3: core: leave default DMA if the controller does not support 64-bit DMA
  USB: core: Fix RST error in hub.c
parents 9395cd7c 47af6c64

drivers/media/usb/b2c2/flexcop-usb.c

+1 −1
Original line number Diff line number Diff line
@@ -511,7 +511,7 @@ static int flexcop_usb_init(struct flexcop_usb *fc_usb) 


	if (fc_usb->uintf->cur_altsetting->desc.bNumEndpoints < 1)

		return -ENODEV;

	if (!usb_endpoint_is_isoc_in(&fc_usb->uintf->cur_altsetting->endpoint[1].desc))

	if (!usb_endpoint_is_isoc_in(&fc_usb->uintf->cur_altsetting->endpoint[0].desc))

		return -ENODEV;



	switch (fc_usb->udev->speed) {

drivers/thunderbolt/icm.c

+1 −0
Original line number Diff line number Diff line
@@ -2529,6 +2529,7 @@ struct tb *icm_probe(struct tb_nhi *nhi) 
		tb->cm_ops = &icm_icl_ops;

		break;



	case PCI_DEVICE_ID_INTEL_MAPLE_RIDGE_2C_NHI:

	case PCI_DEVICE_ID_INTEL_MAPLE_RIDGE_4C_NHI:

		icm->is_supported = icm_tgl_is_supported;

		icm->get_mode = icm_ar_get_mode;

drivers/thunderbolt/nhi.h

+1 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ extern const struct tb_nhi_ops icl_nhi_ops; 
 * need for the PCI quirk anymore as we will use ICM also on Apple

 * hardware.

 */

#define PCI_DEVICE_ID_INTEL_MAPLE_RIDGE_2C_NHI		0x1134

#define PCI_DEVICE_ID_INTEL_MAPLE_RIDGE_4C_NHI		0x1137

#define PCI_DEVICE_ID_INTEL_WIN_RIDGE_2C_NHI            0x157d

#define PCI_DEVICE_ID_INTEL_WIN_RIDGE_2C_BRIDGE         0x157e

drivers/usb/core/hub.c

+1 −1
Original line number Diff line number Diff line
@@ -6039,7 +6039,7 @@ static int usb_reset_and_verify_device(struct usb_device *udev) 
 *

 * Return: The same as for usb_reset_and_verify_device().

 * However, if a reset is already in progress (for instance, if a

 * driver doesn't have pre_ or post_reset() callbacks, and while

 * driver doesn't have pre_reset() or post_reset() callbacks, and while

 * being unbound or re-bound during the ongoing reset its disconnect()

 * or probe() routine tries to perform a second, nested reset), the

 * routine returns -EINPROGRESS.

drivers/usb/dwc3/core.c

+7 −6
Original line number Diff line number Diff line
@@ -1752,12 +1752,6 @@ static int dwc3_probe(struct platform_device *pdev) 


	dwc3_get_properties(dwc);



	if (!dwc->sysdev_is_parent) {

		ret = dma_set_mask_and_coherent(dwc->sysdev, DMA_BIT_MASK(64));

		if (ret)

			return ret;

	}



	dwc->reset = devm_reset_control_array_get_optional_shared(dev);

	if (IS_ERR(dwc->reset))

		return PTR_ERR(dwc->reset);
@@ -1823,6 +1817,13 @@ static int dwc3_probe(struct platform_device *pdev) 
	platform_set_drvdata(pdev, dwc);

	dwc3_cache_hwparams(dwc);



	if (!dwc->sysdev_is_parent &&

	    DWC3_GHWPARAMS0_AWIDTH(dwc->hwparams.hwparams0) == 64) {

		ret = dma_set_mask_and_coherent(dwc->sysdev, DMA_BIT_MASK(64));

		if (ret)

			goto disable_clks;

	}



	spin_lock_init(&dwc->lock);

	mutex_init(&dwc->mutex);