Commit ce001778 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'thunderbolt-for-v6.0-rc6' of... 

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

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
parents 91062e66 14c7d905

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