| Message ID | 20191002124427.23975-1-tjaalton@ubuntu.com |
|---|---|
| State | New |
| Headers | show |
| Series | [SRU,D/OEM-OSP1-B] HID: intel-ish-hid: Add Comet Lake PCI device ID | expand |
On 02.10.19 14:44, Timo Aaltonen wrote: > From: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> > > BugLink: http://bugs.launchpad.net/bugs/1843775 > > Add Comet Lake PCI device ID to the supported device list. > > Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> > Signed-off-by: Jiri Kosina <jkosina@suse.cz> > (cherry picked from commit a50e8e2ecc1428df28c748c6af6255eb65faf9f3) > Signed-off-by: Timo Aaltonen <timo.aaltonen@canonical.com> Clean cherry-pick, only adding support for new hardware. Can you please add the SRU template to the bug? Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com> Thanks. > --- > 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 08a8327dfd22..523c0cbd44a4 100644 > --- a/drivers/hid/intel-ish-hid/ipc/hw-ish.h > +++ b/drivers/hid/intel-ish-hid/ipc/hw-ish.h > @@ -31,6 +31,7 @@ > #define CNL_H_DEVICE_ID 0xA37C > #define ICL_MOBILE_DEVICE_ID 0x34FC > #define SPT_H_DEVICE_ID 0xA135 > +#define CML_LP_DEVICE_ID 0x02FC > > #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 a6e1ee744f4d..ac0a179daf23 100644 > --- a/drivers/hid/intel-ish-hid/ipc/pci-ish.c > +++ b/drivers/hid/intel-ish-hid/ipc/pci-ish.c > @@ -40,6 +40,7 @@ static const struct pci_device_id ish_pci_tbl[] = { > {PCI_DEVICE(PCI_VENDOR_ID_INTEL, CNL_H_DEVICE_ID)}, > {PCI_DEVICE(PCI_VENDOR_ID_INTEL, ICL_MOBILE_DEVICE_ID)}, > {PCI_DEVICE(PCI_VENDOR_ID_INTEL, SPT_H_DEVICE_ID)}, > + {PCI_DEVICE(PCI_VENDOR_ID_INTEL, CML_LP_DEVICE_ID)}, > {0, } > }; > MODULE_DEVICE_TABLE(pci, ish_pci_tbl); >
On 02.10.19 14:44, Timo Aaltonen wrote: > From: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> > > BugLink: http://bugs.launchpad.net/bugs/1843775 > > Add Comet Lake PCI device ID to the supported device list. > > Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> > Signed-off-by: Jiri Kosina <jkosina@suse.cz> > (cherry picked from commit a50e8e2ecc1428df28c748c6af6255eb65faf9f3) > Signed-off-by: Timo Aaltonen <timo.aaltonen@canonical.com> Acked-by: Stefan Bader <stefan.bader@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 08a8327dfd22..523c0cbd44a4 100644 > --- a/drivers/hid/intel-ish-hid/ipc/hw-ish.h > +++ b/drivers/hid/intel-ish-hid/ipc/hw-ish.h > @@ -31,6 +31,7 @@ > #define CNL_H_DEVICE_ID 0xA37C > #define ICL_MOBILE_DEVICE_ID 0x34FC > #define SPT_H_DEVICE_ID 0xA135 > +#define CML_LP_DEVICE_ID 0x02FC > > #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 a6e1ee744f4d..ac0a179daf23 100644 > --- a/drivers/hid/intel-ish-hid/ipc/pci-ish.c > +++ b/drivers/hid/intel-ish-hid/ipc/pci-ish.c > @@ -40,6 +40,7 @@ static const struct pci_device_id ish_pci_tbl[] = { > {PCI_DEVICE(PCI_VENDOR_ID_INTEL, CNL_H_DEVICE_ID)}, > {PCI_DEVICE(PCI_VENDOR_ID_INTEL, ICL_MOBILE_DEVICE_ID)}, > {PCI_DEVICE(PCI_VENDOR_ID_INTEL, SPT_H_DEVICE_ID)}, > + {PCI_DEVICE(PCI_VENDOR_ID_INTEL, CML_LP_DEVICE_ID)}, > {0, } > }; > MODULE_DEVICE_TABLE(pci, ish_pci_tbl); >
On 10/2/19 2:44 PM, Timo Aaltonen wrote: > From: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> > > BugLink: http://bugs.launchpad.net/bugs/1843775 > > Add Comet Lake PCI device ID to the supported device list. > > Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> > Signed-off-by: Jiri Kosina <jkosina@suse.cz> > (cherry picked from commit a50e8e2ecc1428df28c748c6af6255eb65faf9f3) > Signed-off-by: Timo Aaltonen <timo.aaltonen@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 08a8327dfd22..523c0cbd44a4 100644 > --- a/drivers/hid/intel-ish-hid/ipc/hw-ish.h > +++ b/drivers/hid/intel-ish-hid/ipc/hw-ish.h > @@ -31,6 +31,7 @@ > #define CNL_H_DEVICE_ID 0xA37C > #define ICL_MOBILE_DEVICE_ID 0x34FC > #define SPT_H_DEVICE_ID 0xA135 > +#define CML_LP_DEVICE_ID 0x02FC > > #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 a6e1ee744f4d..ac0a179daf23 100644 > --- a/drivers/hid/intel-ish-hid/ipc/pci-ish.c > +++ b/drivers/hid/intel-ish-hid/ipc/pci-ish.c > @@ -40,6 +40,7 @@ static const struct pci_device_id ish_pci_tbl[] = { > {PCI_DEVICE(PCI_VENDOR_ID_INTEL, CNL_H_DEVICE_ID)}, > {PCI_DEVICE(PCI_VENDOR_ID_INTEL, ICL_MOBILE_DEVICE_ID)}, > {PCI_DEVICE(PCI_VENDOR_ID_INTEL, SPT_H_DEVICE_ID)}, > + {PCI_DEVICE(PCI_VENDOR_ID_INTEL, CML_LP_DEVICE_ID)}, > {0, } > }; > MODULE_DEVICE_TABLE(pci, ish_pci_tbl); > Applied to disco/master-next branch. Thanks, Kleber
diff --git a/drivers/hid/intel-ish-hid/ipc/hw-ish.h b/drivers/hid/intel-ish-hid/ipc/hw-ish.h index 08a8327dfd22..523c0cbd44a4 100644 --- a/drivers/hid/intel-ish-hid/ipc/hw-ish.h +++ b/drivers/hid/intel-ish-hid/ipc/hw-ish.h @@ -31,6 +31,7 @@ #define CNL_H_DEVICE_ID 0xA37C #define ICL_MOBILE_DEVICE_ID 0x34FC #define SPT_H_DEVICE_ID 0xA135 +#define CML_LP_DEVICE_ID 0x02FC #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 a6e1ee744f4d..ac0a179daf23 100644 --- a/drivers/hid/intel-ish-hid/ipc/pci-ish.c +++ b/drivers/hid/intel-ish-hid/ipc/pci-ish.c @@ -40,6 +40,7 @@ static const struct pci_device_id ish_pci_tbl[] = { {PCI_DEVICE(PCI_VENDOR_ID_INTEL, CNL_H_DEVICE_ID)}, {PCI_DEVICE(PCI_VENDOR_ID_INTEL, ICL_MOBILE_DEVICE_ID)}, {PCI_DEVICE(PCI_VENDOR_ID_INTEL, SPT_H_DEVICE_ID)}, + {PCI_DEVICE(PCI_VENDOR_ID_INTEL, CML_LP_DEVICE_ID)}, {0, } }; MODULE_DEVICE_TABLE(pci, ish_pci_tbl);