diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-09-15 12:55:55 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-09-15 12:55:55 +0200 |
| commit | ce001778dfc34804f2b1fa6faaad7ac888326afb (patch) | |
| tree | 195c8525efb29f5b6a8ef4b5b1a6fa3a990739d4 /drivers | |
| parent | 91062e663b261815573ce00967b1895a99e668df (diff) | |
| parent | 14c7d905283744809e6b82efae2f490660a11cda (diff) | |
| download | linux-stable-ce001778dfc34804f2b1fa6faaad7ac888326afb.tar.gz linux-stable-ce001778dfc34804f2b1fa6faaad7ac888326afb.tar.bz2 linux-stable-ce001778dfc34804f2b1fa6faaad7ac888326afb.zip | |
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
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/thunderbolt/icm.c | 1 | ||||
| -rw-r--r-- | drivers/thunderbolt/nhi.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/thunderbolt/icm.c b/drivers/thunderbolt/icm.c index ae38f0d25a8d..572b5896caa3 100644 --- a/drivers/thunderbolt/icm.c +++ b/drivers/thunderbolt/icm.c @@ -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; diff --git a/drivers/thunderbolt/nhi.h b/drivers/thunderbolt/nhi.h index f09da5b62233..01190d9ced16 100644 --- a/drivers/thunderbolt/nhi.h +++ b/drivers/thunderbolt/nhi.h @@ -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 |