Merge tag 'thunderbolt-for-v6.0-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt into usb-linus

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

Mika writes:
"thunderbolt: Fix for v6.0-rc6

This includes a single commit adding missing PCI ID for Intel Maple
Ridge Thunderbolt 4 single port controller.

This has been in linux-next with no reported issues."

* tag 'thunderbolt-for-v6.0-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt:
thunderbolt: Add support for Intel Maple Ridge single port controller

Greg Kroah-Hartman 3 years ago ce001778 91062e66

2 changed files

expand all

drivers

thunderbolt

icm.c

nhi.h

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;

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