| Message ID | 20191010144909.20008-1-tjaalton@ubuntu.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [SRU,B/OEM] HID: intel-ish-hid: Add Comet Lake PCI device ID | expand |
On 10.10.19 16:49, 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> > (backported from commit a50e8e2ecc1428df28c748c6af6255eb65faf9f3) > Signed-off-by: Timo Aaltonen <timo.aaltonen@canonical.com> 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 da133716bed05..b9445b74855a2 100644 > --- a/drivers/hid/intel-ish-hid/ipc/hw-ish.h > +++ b/drivers/hid/intel-ish-hid/ipc/hw-ish.h > @@ -30,6 +30,7 @@ > #define GLK_Ax_DEVICE_ID 0x31A2 > #define CNL_H_DEVICE_ID 0xA37C > #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 c7b8eb32b1eaf..fef5a0fa3d172 100644 > --- a/drivers/hid/intel-ish-hid/ipc/pci-ish.c > +++ b/drivers/hid/intel-ish-hid/ipc/pci-ish.c > @@ -39,6 +39,7 @@ static const struct pci_device_id ish_pci_tbl[] = { > {PCI_DEVICE(PCI_VENDOR_ID_INTEL, GLK_Ax_DEVICE_ID)}, > {PCI_DEVICE(PCI_VENDOR_ID_INTEL, CNL_H_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/10/19 7:49 AM, 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> > (backported from commit a50e8e2ecc1428df28c748c6af6255eb65faf9f3) > Signed-off-by: Timo Aaltonen <timo.aaltonen@canonical.com> Do you have any notes to accompany the "backported from" line? Acked-by: Connor Kuehl <connor.kuehl@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 da133716bed05..b9445b74855a2 100644 > --- a/drivers/hid/intel-ish-hid/ipc/hw-ish.h > +++ b/drivers/hid/intel-ish-hid/ipc/hw-ish.h > @@ -30,6 +30,7 @@ > #define GLK_Ax_DEVICE_ID 0x31A2 > #define CNL_H_DEVICE_ID 0xA37C > #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 c7b8eb32b1eaf..fef5a0fa3d172 100644 > --- a/drivers/hid/intel-ish-hid/ipc/pci-ish.c > +++ b/drivers/hid/intel-ish-hid/ipc/pci-ish.c > @@ -39,6 +39,7 @@ static const struct pci_device_id ish_pci_tbl[] = { > {PCI_DEVICE(PCI_VENDOR_ID_INTEL, GLK_Ax_DEVICE_ID)}, > {PCI_DEVICE(PCI_VENDOR_ID_INTEL, CNL_H_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.10.2019 18.37, Connor Kuehl wrote: > On 10/10/19 7:49 AM, 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> >> (backported from commit a50e8e2ecc1428df28c748c6af6255eb65faf9f3) >> Signed-off-by: Timo Aaltonen <timo.aaltonen@canonical.com> > > Do you have any notes to accompany the "backported from" line? git am refused to apply it, manual patching showed some fuzz since the newer kernel has ICL_MOBILE_DEVICE_ID added before this.
On 10.10.2019 17.49, 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. since we're re-spinning; applied to oem-next
On 10.10.19 16:49, 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> > (backported 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 da133716bed05..b9445b74855a2 100644 > --- a/drivers/hid/intel-ish-hid/ipc/hw-ish.h > +++ b/drivers/hid/intel-ish-hid/ipc/hw-ish.h > @@ -30,6 +30,7 @@ > #define GLK_Ax_DEVICE_ID 0x31A2 > #define CNL_H_DEVICE_ID 0xA37C > #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 c7b8eb32b1eaf..fef5a0fa3d172 100644 > --- a/drivers/hid/intel-ish-hid/ipc/pci-ish.c > +++ b/drivers/hid/intel-ish-hid/ipc/pci-ish.c > @@ -39,6 +39,7 @@ static const struct pci_device_id ish_pci_tbl[] = { > {PCI_DEVICE(PCI_VENDOR_ID_INTEL, GLK_Ax_DEVICE_ID)}, > {PCI_DEVICE(PCI_VENDOR_ID_INTEL, CNL_H_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 bionic/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 da133716bed05..b9445b74855a2 100644 --- a/drivers/hid/intel-ish-hid/ipc/hw-ish.h +++ b/drivers/hid/intel-ish-hid/ipc/hw-ish.h @@ -30,6 +30,7 @@ #define GLK_Ax_DEVICE_ID 0x31A2 #define CNL_H_DEVICE_ID 0xA37C #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 c7b8eb32b1eaf..fef5a0fa3d172 100644 --- a/drivers/hid/intel-ish-hid/ipc/pci-ish.c +++ b/drivers/hid/intel-ish-hid/ipc/pci-ish.c @@ -39,6 +39,7 @@ static const struct pci_device_id ish_pci_tbl[] = { {PCI_DEVICE(PCI_VENDOR_ID_INTEL, GLK_Ax_DEVICE_ID)}, {PCI_DEVICE(PCI_VENDOR_ID_INTEL, CNL_H_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);