diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2022-09-29 23:30:51 +0200 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-09-29 23:30:51 +0200 |
| commit | accc3b4a572bba903a801a393532272727f83f5b (patch) | |
| tree | b6677755ec43793d5719246f51e27f0e9d12b6c0 /drivers/thunderbolt | |
| parent | net: cpmac: Add __init/__exit annotations to module init/exit funcs (diff) | |
| parent | Merge tag 'net-6.0-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/netd... (diff) | |
| download | linux-accc3b4a572bba903a801a393532272727f83f5b.tar.xz linux-accc3b4a572bba903a801a393532272727f83f5b.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
No conflicts.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/thunderbolt')
| -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 |