| Message ID | 1521822887-5798-2-git-send-email-kamal@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | ISH support for CFL-H | expand |
On 23/03/18 16:34, Kamal Mostafa wrote: > From: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> > > BugLink: https://bugs.launchpad.net/bugs/1739522 > > Added PCI ID for Cannon Lake and Coffee Lake laptop/desktop skews. > > Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> > Signed-off-by: Jiri Kosina <jkosina@suse.cz> > (cherry picked from commit 7103f6b23392c0a57ceba7915f72fa7bf11d2a90) > Signed-off-by: Kamal Mostafa <kamal@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 2aac097..97869b7 100644 > --- a/drivers/hid/intel-ish-hid/ipc/hw-ish.h > +++ b/drivers/hid/intel-ish-hid/ipc/hw-ish.h > @@ -28,6 +28,7 @@ > #define SPT_Ax_DEVICE_ID 0x9D35 > #define CNL_Ax_DEVICE_ID 0x9DFC > #define GLK_Ax_DEVICE_ID 0x31A2 > +#define CNL_H_DEVICE_ID 0xA37C > > #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 20d824f..582e449 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, SPT_Ax_DEVICE_ID)}, > {PCI_DEVICE(PCI_VENDOR_ID_INTEL, CNL_Ax_DEVICE_ID)}, > {PCI_DEVICE(PCI_VENDOR_ID_INTEL, GLK_Ax_DEVICE_ID)}, > + {PCI_DEVICE(PCI_VENDOR_ID_INTEL, CNL_H_DEVICE_ID)}, > {0, } > }; > MODULE_DEVICE_TABLE(pci, ish_pci_tbl); > Clean upstream cherry pick, limited regression potential as this is for a specific device. Looks good to me. Acked-by: Colin Ian King <colin.king@canonical.com>
Applied to bionic master-next branch. Thanks. Cascardo. Applied-to: bionic/master-next
diff --git a/drivers/hid/intel-ish-hid/ipc/hw-ish.h b/drivers/hid/intel-ish-hid/ipc/hw-ish.h index 2aac097..97869b7 100644 --- a/drivers/hid/intel-ish-hid/ipc/hw-ish.h +++ b/drivers/hid/intel-ish-hid/ipc/hw-ish.h @@ -28,6 +28,7 @@ #define SPT_Ax_DEVICE_ID 0x9D35 #define CNL_Ax_DEVICE_ID 0x9DFC #define GLK_Ax_DEVICE_ID 0x31A2 +#define CNL_H_DEVICE_ID 0xA37C #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 20d824f..582e449 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, SPT_Ax_DEVICE_ID)}, {PCI_DEVICE(PCI_VENDOR_ID_INTEL, CNL_Ax_DEVICE_ID)}, {PCI_DEVICE(PCI_VENDOR_ID_INTEL, GLK_Ax_DEVICE_ID)}, + {PCI_DEVICE(PCI_VENDOR_ID_INTEL, CNL_H_DEVICE_ID)}, {0, } }; MODULE_DEVICE_TABLE(pci, ish_pci_tbl);