github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-28 17:13:52 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

thunderbolt: Fix for v6.0-rc6

Browse Source 
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.
 -----BEGIN PGP SIGNATURE-----
 
 iQJUBAABCgA+FiEEVTdhRGBbNzLrSUBaAP2fSd+ZWKAFAmMi+vogHG1pa2Eud2Vz
 dGVyYmVyZ0BsaW51eC5pbnRlbC5jb20ACgkQAP2fSd+ZWKD6ug/8CLtAPYgPeUjq
 4emgwUkugkuHDQK9A6xgYQM0JQhABf51wUZjumfgEhOjQMGtlmN2uvOtFklYVi2U
 6YDT42wZD8BotEvIzSeY4Hf0uCiiSaAte6rfHXpizLkTIBnYUjT2N4hUmFYIb8ux
 wFhuvAHter/JJvL2FG/9DzthAYtHJVT0EJIcgOo6LWe9RBZqgoOGgGfF8aX+sXwu
 uhiFmP1JyTugl5KlLC9W7MXYQmdR2KThL+0Yk2rcVHKO0K7V/IXzciWTFfXG8OJa
 9tmjZ6II3tBxNY2FaycmoFiBBJAiRkoBy5216SoJKZACiCdAxxhMD0I4XU03pJ66
 BTd9QyMJxaJhHDYKiV7GX3pMI1Z6/f88d+7OB/8bGkMf8gLbFrJta1pdrO1gjeh4
 FsFE2v9Qmxev2wEk6y+z8ocQDduTXTEXaVfquyRUoOXb7+gaaPh83d9T1KfR8vw/
 j/lf6WhESLs1u/oMNVTd9fx2WuaaSg5GdXmO7x9wMJbdMF9t9Y8gJEh6pd3CAWeC
 4Sfc3wS2+kEaPhxnEmQDF4EA1gEtIcDSLaZ1jlhXJ+kWNKxbg40X4DyajOJqAOi7
 HSfbn8noACh7IiCoig6WgOYttsoqdReXz8iNIs/ua4ckFRmh9lJvzn1s+jW8i6/4
 5qeke/oYSnX3o6VbSGoFb1oTtnCquNQ=
 =PxnM
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Greg Kroah-Hartman 2022-09-15 12:55:55 +02:00
commit ce001778df
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/thunderbolt/icm.c
View File

@ -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;

1
drivers/thunderbolt/nhi.h
View File

@ -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