Commit 22f8bcec authored by Zhang Lixu's avatar Zhang Lixu Committed by Jiri Kosina
Browse files

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: default avatarZhang Lixu <lixu.zhang@intel.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@intel.com>
Acked-by: default avatarSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.com>
parent b4f4fd94

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

+2 −0
Original line number Diff line number Diff line
@@ -39,6 +39,8 @@ 
#define PCI_DEVICE_ID_INTEL_ISH_PTL_H		0xE345

#define PCI_DEVICE_ID_INTEL_ISH_PTL_P		0xE445

#define PCI_DEVICE_ID_INTEL_ISH_WCL		0x4D45

#define PCI_DEVICE_ID_INTEL_ISH_NVL_H		0xD354

#define PCI_DEVICE_ID_INTEL_ISH_NVL_S		0x6E78



#define	REVISION_ID_CHT_A0	0x6

#define	REVISION_ID_CHT_Ax_SI	0x0

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

+12 −0
Original line number Diff line number Diff line
@@ -28,11 +28,15 @@ enum ishtp_driver_data_index { 
	ISHTP_DRIVER_DATA_LNL_M,

	ISHTP_DRIVER_DATA_PTL,

	ISHTP_DRIVER_DATA_WCL,

	ISHTP_DRIVER_DATA_NVL_H,

	ISHTP_DRIVER_DATA_NVL_S,

};



#define ISH_FW_GEN_LNL_M "lnlm"

#define ISH_FW_GEN_PTL "ptl"

#define ISH_FW_GEN_WCL "wcl"

#define ISH_FW_GEN_NVL_H "nvlh"

#define ISH_FW_GEN_NVL_S "nvls"



#define ISH_FIRMWARE_PATH(gen) "intel/ish/ish_" gen ".bin"

#define ISH_FIRMWARE_PATH_ALL "intel/ish/ish_*.bin"
@@ -47,6 +51,12 @@ static struct ishtp_driver_data ishtp_driver_data[] = { 
	[ISHTP_DRIVER_DATA_WCL] = {

		.fw_generation = ISH_FW_GEN_WCL,

	},

	[ISHTP_DRIVER_DATA_NVL_H] = {

		.fw_generation = ISH_FW_GEN_NVL_H,

	},

	[ISHTP_DRIVER_DATA_NVL_S] = {

		.fw_generation = ISH_FW_GEN_NVL_S,

	},

};



static const struct pci_device_id ish_pci_tbl[] = {
@@ -76,6 +86,8 @@ static const struct pci_device_id ish_pci_tbl[] = { 
	{PCI_DEVICE_DATA(INTEL, ISH_PTL_H, ISHTP_DRIVER_DATA_PTL)},

	{PCI_DEVICE_DATA(INTEL, ISH_PTL_P, ISHTP_DRIVER_DATA_PTL)},

	{PCI_DEVICE_DATA(INTEL, ISH_WCL, ISHTP_DRIVER_DATA_WCL)},

	{PCI_DEVICE_DATA(INTEL, ISH_NVL_H, ISHTP_DRIVER_DATA_NVL_H)},

	{PCI_DEVICE_DATA(INTEL, ISH_NVL_S, ISHTP_DRIVER_DATA_NVL_S)},

	{}

};

MODULE_DEVICE_TABLE(pci, ish_pci_tbl);