diff mbox series

[1/1,SRU,U/G/F/OEM-5.10] UBUNTU: SAUCE: HID: intel-ish-hid: ipc: Add Tiger Lake H PCI device ID

Message ID 20210205072922.1147281-2-vicamo.yang@canonical.com
State New
Headers show
Series HID: intel-ish-hid: ipc: Add Tiger Lake H PCI device ID | expand

Commit Message

You-Sheng Yang Feb. 5, 2021, 7:29 a.m. UTC
BugLink: https://bugs.launchpad.net/bugs/1914543

Added Tiger Lake H PCI device ID to the supported device list.

Signed-off-by: You-Sheng Yang <vicamo.yang@canonical.com>
(cherry picked from
https://patchwork.kernel.org/project/linux-input/patch/20210204083315.122952-1-vicamo.yang@canonical.com/)
Signed-off-by: You-Sheng Yang <vicamo.yang@canonical.com>
---
 drivers/hid/intel-ish-hid/ipc/hw-ish.h  | 1 +
 drivers/hid/intel-ish-hid/ipc/pci-ish.c | 1 +
 2 files changed, 2 insertions(+)

Comments

Kleber Sacilotto de Souza Feb. 11, 2021, 10:24 a.m. UTC | #1
On 05.02.21 08:29, You-Sheng Yang wrote:
> BugLink: https://bugs.launchpad.net/bugs/1914543
> 
> Added Tiger Lake H PCI device ID to the supported device list.
> 
> Signed-off-by: You-Sheng Yang <vicamo.yang@canonical.com>
> (cherry picked from
> https://patchwork.kernel.org/project/linux-input/patch/20210204083315.122952-1-vicamo.yang@canonical.com/)
> Signed-off-by: You-Sheng Yang <vicamo.yang@canonical.com>

This is now 2aefba190f17a3f409292ee9fc8f00c20fed411e in linux-next
and this should be added above when applying.

Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>

> ---
>   drivers/hid/intel-ish-hid/ipc/hw-ish.h  | 1 +
>   drivers/hid/intel-ish-hid/ipc/pci-ish.c | 1 +
>   2 files changed, 2 insertions(+)
> 
> diff --git a/drivers/hid/intel-ish-hid/ipc/hw-ish.h b/drivers/hid/intel-ish-hid/ipc/hw-ish.h
> index 1fb294ca463e5..21b0e6123754e 100644
> --- a/drivers/hid/intel-ish-hid/ipc/hw-ish.h
> +++ b/drivers/hid/intel-ish-hid/ipc/hw-ish.h
> @@ -27,6 +27,7 @@
>   #define CMP_H_DEVICE_ID		0x06FC
>   #define EHL_Ax_DEVICE_ID	0x4BB3
>   #define TGL_LP_DEVICE_ID	0xA0FC
> +#define TGL_H_DEVICE_ID		0x43FC
>   
>   #define	REVISION_ID_CHT_A0	0x6
>   #define	REVISION_ID_CHT_Ax_SI	0x0
> diff --git a/drivers/hid/intel-ish-hid/ipc/pci-ish.c b/drivers/hid/intel-ish-hid/ipc/pci-ish.c
> index c6d48a8648b70..6dea657b7b152 100644
> --- a/drivers/hid/intel-ish-hid/ipc/pci-ish.c
> +++ b/drivers/hid/intel-ish-hid/ipc/pci-ish.c
> @@ -37,6 +37,7 @@ static const struct pci_device_id ish_pci_tbl[] = {
>   	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, CMP_H_DEVICE_ID)},
>   	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, EHL_Ax_DEVICE_ID)},
>   	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, TGL_LP_DEVICE_ID)},
> +	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, TGL_H_DEVICE_ID)},
>   	{0, }
>   };
>   MODULE_DEVICE_TABLE(pci, ish_pci_tbl);
>
Stefan Bader Feb. 12, 2021, 8:15 a.m. UTC | #2
On 05.02.21 08:29, You-Sheng Yang wrote:
> BugLink: https://bugs.launchpad.net/bugs/1914543
> 
> Added Tiger Lake H PCI device ID to the supported device list.
> 
> Signed-off-by: You-Sheng Yang <vicamo.yang@canonical.com>
> (cherry picked from
> https://patchwork.kernel.org/project/linux-input/patch/20210204083315.122952-1-vicamo.yang@canonical.com/)
> Signed-off-by: You-Sheng Yang <vicamo.yang@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
> ---

To hopefully clarify what Kleber said: when applying we should dropt the
"UBUNTU: SAUCE:" and replace the patchwork link with

(cherry picked from 2aefba190f17a3f409292ee9fc8f00c20fed411e linux-next)

Possibly dropping linux-next if things moved even beyond that stage and hit
upstream then.

-Stefan

>  drivers/hid/intel-ish-hid/ipc/hw-ish.h  | 1 +
>  drivers/hid/intel-ish-hid/ipc/pci-ish.c | 1 +
>  2 files changed, 2 insertions(+)
> 
> diff --git a/drivers/hid/intel-ish-hid/ipc/hw-ish.h b/drivers/hid/intel-ish-hid/ipc/hw-ish.h
> index 1fb294ca463e5..21b0e6123754e 100644
> --- a/drivers/hid/intel-ish-hid/ipc/hw-ish.h
> +++ b/drivers/hid/intel-ish-hid/ipc/hw-ish.h
> @@ -27,6 +27,7 @@
>  #define CMP_H_DEVICE_ID		0x06FC
>  #define EHL_Ax_DEVICE_ID	0x4BB3
>  #define TGL_LP_DEVICE_ID	0xA0FC
> +#define TGL_H_DEVICE_ID		0x43FC
>  
>  #define	REVISION_ID_CHT_A0	0x6
>  #define	REVISION_ID_CHT_Ax_SI	0x0
> diff --git a/drivers/hid/intel-ish-hid/ipc/pci-ish.c b/drivers/hid/intel-ish-hid/ipc/pci-ish.c
> index c6d48a8648b70..6dea657b7b152 100644
> --- a/drivers/hid/intel-ish-hid/ipc/pci-ish.c
> +++ b/drivers/hid/intel-ish-hid/ipc/pci-ish.c
> @@ -37,6 +37,7 @@ static const struct pci_device_id ish_pci_tbl[] = {
>  	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, CMP_H_DEVICE_ID)},
>  	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, EHL_Ax_DEVICE_ID)},
>  	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, TGL_LP_DEVICE_ID)},
> +	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, TGL_H_DEVICE_ID)},
>  	{0, }
>  };
>  MODULE_DEVICE_TABLE(pci, ish_pci_tbl);
>
diff mbox series

Patch

diff --git a/drivers/hid/intel-ish-hid/ipc/hw-ish.h b/drivers/hid/intel-ish-hid/ipc/hw-ish.h
index 1fb294ca463e5..21b0e6123754e 100644
--- a/drivers/hid/intel-ish-hid/ipc/hw-ish.h
+++ b/drivers/hid/intel-ish-hid/ipc/hw-ish.h
@@ -27,6 +27,7 @@ 
 #define CMP_H_DEVICE_ID		0x06FC
 #define EHL_Ax_DEVICE_ID	0x4BB3
 #define TGL_LP_DEVICE_ID	0xA0FC
+#define TGL_H_DEVICE_ID		0x43FC
 
 #define	REVISION_ID_CHT_A0	0x6
 #define	REVISION_ID_CHT_Ax_SI	0x0
diff --git a/drivers/hid/intel-ish-hid/ipc/pci-ish.c b/drivers/hid/intel-ish-hid/ipc/pci-ish.c
index c6d48a8648b70..6dea657b7b152 100644
--- a/drivers/hid/intel-ish-hid/ipc/pci-ish.c
+++ b/drivers/hid/intel-ish-hid/ipc/pci-ish.c
@@ -37,6 +37,7 @@  static const struct pci_device_id ish_pci_tbl[] = {
 	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, CMP_H_DEVICE_ID)},
 	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, EHL_Ax_DEVICE_ID)},
 	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, TGL_LP_DEVICE_ID)},
+	{PCI_DEVICE(PCI_VENDOR_ID_INTEL, TGL_H_DEVICE_ID)},
 	{0, }
 };
 MODULE_DEVICE_TABLE(pci, ish_pci_tbl);