Skip to content

Commit ce00177

Browse files
committed
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
2 parents 91062e6 + 14c7d90 commit ce00177

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

drivers/thunderbolt/icm.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2529,6 +2529,7 @@ struct tb *icm_probe(struct tb_nhi *nhi)
25292529
tb->cm_ops = &icm_icl_ops;
25302530
break;
25312531

2532+
case PCI_DEVICE_ID_INTEL_MAPLE_RIDGE_2C_NHI:
25322533
case PCI_DEVICE_ID_INTEL_MAPLE_RIDGE_4C_NHI:
25332534
icm->is_supported = icm_tgl_is_supported;
25342535
icm->get_mode = icm_ar_get_mode;

drivers/thunderbolt/nhi.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ extern const struct tb_nhi_ops icl_nhi_ops;
5555
* need for the PCI quirk anymore as we will use ICM also on Apple
5656
* hardware.
5757
*/
58+
#define PCI_DEVICE_ID_INTEL_MAPLE_RIDGE_2C_NHI 0x1134
5859
#define PCI_DEVICE_ID_INTEL_MAPLE_RIDGE_4C_NHI 0x1137
5960
#define PCI_DEVICE_ID_INTEL_WIN_RIDGE_2C_NHI 0x157d
6061
#define PCI_DEVICE_ID_INTEL_WIN_RIDGE_2C_BRIDGE 0x157e

0 commit comments

Comments
 (0)