tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 33a4e37e 9395cd7c

+18 -8
+1 -1
drivers/media/usb/b2c2/flexcop-usb.c
··· 511 511 512 512 if (fc_usb->uintf->cur_altsetting->desc.bNumEndpoints < 1) 513 513 return -ENODEV; 514 - if (!usb_endpoint_is_isoc_in(&fc_usb->uintf->cur_altsetting->endpoint[1].desc)) 514 + if (!usb_endpoint_is_isoc_in(&fc_usb->uintf->cur_altsetting->endpoint[0].desc)) 515 515 return -ENODEV; 516 516 517 517 switch (fc_usb->udev->speed) {
+1
drivers/thunderbolt/icm.c
··· 2529 2529 tb->cm_ops = &icm_icl_ops; 2530 2530 break; 2531 2531 2532 + case PCI_DEVICE_ID_INTEL_MAPLE_RIDGE_2C_NHI: 2532 2533 case PCI_DEVICE_ID_INTEL_MAPLE_RIDGE_4C_NHI: 2533 2534 icm->is_supported = icm_tgl_is_supported; 2534 2535 icm->get_mode = icm_ar_get_mode;
+1
drivers/thunderbolt/nhi.h
··· 55 55 * need for the PCI quirk anymore as we will use ICM also on Apple 56 56 * hardware. 57 57 */ 58 + #define PCI_DEVICE_ID_INTEL_MAPLE_RIDGE_2C_NHI 0x1134 58 59 #define PCI_DEVICE_ID_INTEL_MAPLE_RIDGE_4C_NHI 0x1137 59 60 #define PCI_DEVICE_ID_INTEL_WIN_RIDGE_2C_NHI 0x157d 60 61 #define PCI_DEVICE_ID_INTEL_WIN_RIDGE_2C_BRIDGE 0x157e
+1 -1
drivers/usb/core/hub.c
··· 6039 6039 * 6040 6040 * Return: The same as for usb_reset_and_verify_device(). 6041 6041 * However, if a reset is already in progress (for instance, if a 6042 - * driver doesn't have pre_ or post_reset() callbacks, and while 6042 + * driver doesn't have pre_reset() or post_reset() callbacks, and while 6043 6043 * being unbound or re-bound during the ongoing reset its disconnect() 6044 6044 * or probe() routine tries to perform a second, nested reset), the 6045 6045 * routine returns -EINPROGRESS.
+7 -6
drivers/usb/dwc3/core.c
··· 1752 1752 1753 1753 dwc3_get_properties(dwc); 1754 1754 1755 - if (!dwc->sysdev_is_parent) { 1756 - ret = dma_set_mask_and_coherent(dwc->sysdev, DMA_BIT_MASK(64)); 1757 - if (ret) 1758 - return ret; 1759 - } 1760 - 1761 1755 dwc->reset = devm_reset_control_array_get_optional_shared(dev); 1762 1756 if (IS_ERR(dwc->reset)) 1763 1757 return PTR_ERR(dwc->reset); ··· 1816 1822 1817 1823 platform_set_drvdata(pdev, dwc); 1818 1824 dwc3_cache_hwparams(dwc); 1825 + 1826 + if (!dwc->sysdev_is_parent && 1827 + DWC3_GHWPARAMS0_AWIDTH(dwc->hwparams.hwparams0) == 64) { 1828 + ret = dma_set_mask_and_coherent(dwc->sysdev, DMA_BIT_MASK(64)); 1829 + if (ret) 1830 + goto disable_clks; 1831 + } 1819 1832 1820 1833 spin_lock_init(&dwc->lock); 1821 1834 mutex_init(&dwc->mutex);
+6
drivers/usb/serial/option.c
··· 256 256 #define QUECTEL_PRODUCT_EM060K 0x030b 257 257 #define QUECTEL_PRODUCT_EM12 0x0512 258 258 #define QUECTEL_PRODUCT_RM500Q 0x0800 259 + #define QUECTEL_PRODUCT_RM520N 0x0801 259 260 #define QUECTEL_PRODUCT_EC200S_CN 0x6002 260 261 #define QUECTEL_PRODUCT_EC200T 0x6026 261 262 #define QUECTEL_PRODUCT_RM500K 0x7001 ··· 1139 1138 { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EG95, 0xff, 0xff, 0xff), 1140 1139 .driver_info = NUMEP2 }, 1141 1140 { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EG95, 0xff, 0, 0) }, 1141 + { USB_DEVICE_INTERFACE_CLASS(QUECTEL_VENDOR_ID, 0x0203, 0xff), /* BG95-M3 */ 1142 + .driver_info = ZLP }, 1142 1143 { USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96), 1143 1144 .driver_info = RSVD(4) }, 1144 1145 { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EP06, 0xff, 0xff, 0xff), ··· 1162 1159 { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM500Q, 0xff, 0, 0) }, 1163 1160 { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM500Q, 0xff, 0xff, 0x10), 1164 1161 .driver_info = ZLP }, 1162 + { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM520N, 0xff, 0xff, 0x30) }, 1163 + { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM520N, 0xff, 0, 0x40) }, 1164 + { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM520N, 0xff, 0, 0) }, 1165 1165 { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC200S_CN, 0xff, 0, 0) }, 1166 1166 { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC200T, 0xff, 0, 0) }, 1167 1167 { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM500K, 0xff, 0x00, 0x00) },
+1
drivers/usb/typec/Kconfig
··· 56 56 tristate "Analogix ANX7411 Type-C DRP Port controller driver" 57 57 depends on I2C 58 58 depends on USB_ROLE_SWITCH 59 + depends on POWER_SUPPLY 59 60 help 60 61 Say Y or M here if your system has Analogix ANX7411 Type-C DRP Port 61 62 controller driver.