Skip to content

Commit 22f8bce

Browse files
lixuzhaJiri Kosina
authored andcommitted
HID: intel-ish-hid: ipc: Add Nova Lake-H/S PCI device IDs
Add device IDs of Nova Lake-H and Nova Lake-S into ishtp support list. Signed-off-by: Zhang Lixu <lixu.zhang@intel.com> Reviewed-by: Andy Shevchenko <andriy.shevchenko@intel.com> Acked-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> Signed-off-by: Jiri Kosina <jkosina@suse.com>
1 parent b4f4fd9 commit 22f8bce

2 files changed

Lines changed: 14 additions & 0 deletions

File tree

drivers/hid/intel-ish-hid/ipc/hw-ish.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@
3939
#define PCI_DEVICE_ID_INTEL_ISH_PTL_H 0xE345
4040
#define PCI_DEVICE_ID_INTEL_ISH_PTL_P 0xE445
4141
#define PCI_DEVICE_ID_INTEL_ISH_WCL 0x4D45
42+
#define PCI_DEVICE_ID_INTEL_ISH_NVL_H 0xD354
43+
#define PCI_DEVICE_ID_INTEL_ISH_NVL_S 0x6E78
4244

4345
#define REVISION_ID_CHT_A0 0x6
4446
#define REVISION_ID_CHT_Ax_SI 0x0

drivers/hid/intel-ish-hid/ipc/pci-ish.c

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,15 @@ enum ishtp_driver_data_index {
2828
ISHTP_DRIVER_DATA_LNL_M,
2929
ISHTP_DRIVER_DATA_PTL,
3030
ISHTP_DRIVER_DATA_WCL,
31+
ISHTP_DRIVER_DATA_NVL_H,
32+
ISHTP_DRIVER_DATA_NVL_S,
3133
};
3234

3335
#define ISH_FW_GEN_LNL_M "lnlm"
3436
#define ISH_FW_GEN_PTL "ptl"
3537
#define ISH_FW_GEN_WCL "wcl"
38+
#define ISH_FW_GEN_NVL_H "nvlh"
39+
#define ISH_FW_GEN_NVL_S "nvls"
3640

3741
#define ISH_FIRMWARE_PATH(gen) "intel/ish/ish_" gen ".bin"
3842
#define ISH_FIRMWARE_PATH_ALL "intel/ish/ish_*.bin"
@@ -47,6 +51,12 @@ static struct ishtp_driver_data ishtp_driver_data[] = {
4751
[ISHTP_DRIVER_DATA_WCL] = {
4852
.fw_generation = ISH_FW_GEN_WCL,
4953
},
54+
[ISHTP_DRIVER_DATA_NVL_H] = {
55+
.fw_generation = ISH_FW_GEN_NVL_H,
56+
},
57+
[ISHTP_DRIVER_DATA_NVL_S] = {
58+
.fw_generation = ISH_FW_GEN_NVL_S,
59+
},
5060
};
5161

5262
static const struct pci_device_id ish_pci_tbl[] = {
@@ -76,6 +86,8 @@ static const struct pci_device_id ish_pci_tbl[] = {
7686
{PCI_DEVICE_DATA(INTEL, ISH_PTL_H, ISHTP_DRIVER_DATA_PTL)},
7787
{PCI_DEVICE_DATA(INTEL, ISH_PTL_P, ISHTP_DRIVER_DATA_PTL)},
7888
{PCI_DEVICE_DATA(INTEL, ISH_WCL, ISHTP_DRIVER_DATA_WCL)},
89+
{PCI_DEVICE_DATA(INTEL, ISH_NVL_H, ISHTP_DRIVER_DATA_NVL_H)},
90+
{PCI_DEVICE_DATA(INTEL, ISH_NVL_S, ISHTP_DRIVER_DATA_NVL_S)},
7991
{}
8092
};
8193
MODULE_DEVICE_TABLE(pci, ish_pci_tbl);

0 commit comments

Comments
 (0)