| Message ID | a4c1165294d4f77f87a6fdd6030777e35e64f6e1.1372798604.git.leann.ogasawara@canonical.com |
|---|---|
| State | New |
| Headers | show |
On 07/02/2013 02:07 PM, leann.ogasawara@canonical.com wrote: > From: James Ralston <james.d.ralston@intel.com> > > BugLink: http://bugs.launchpad.net/bugs/1196658 > > This patch adds the LPC Controller Device IDs for Watchdog and GPIO for > Intel Avoton SoC, to the lpc_ich driver. > > Signed-off-by: James Ralston <james.d.ralston@intel.com> > Signed-off-by: Samuel Ortiz <sameo@linux.intel.com> > (backporteded from commit 8477128fe0c3c455e9dfb1ba7ad7e6d09489d33c in linux-next) > > Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com> > --- > drivers/mfd/lpc_ich.c | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/drivers/mfd/lpc_ich.c b/drivers/mfd/lpc_ich.c > index d9d9303..5ed8250 100644 > --- a/drivers/mfd/lpc_ich.c > +++ b/drivers/mfd/lpc_ich.c > @@ -50,6 +50,7 @@ > * document number TBD : Panther Point > * document number TBD : Lynx Point > * document number TBD : Lynx Point-LP > + * document number TBD : Avoton SoC > */ > > #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt > @@ -194,6 +195,7 @@ enum lpc_chipsets { > LPC_PPT, /* Panther Point */ > LPC_LPT, /* Lynx Point */ > LPC_LPT_LP, /* Lynx Point-LP */ > + LPC_AVN, /* Avoton SoC */ > }; > > struct lpc_ich_info lpc_chipset_info[] = { > @@ -474,6 +476,10 @@ struct lpc_ich_info lpc_chipset_info[] = { > .name = "Lynx Point_LP", > .iTCO_version = 2, > }, > + [LPC_AVN] = { > + .name = "Avoton SoC", > + .iTCO_version = 1, > + }, > }; > > /* > @@ -655,6 +661,10 @@ static DEFINE_PCI_DEVICE_TABLE(lpc_ich_ids) = { > { PCI_VDEVICE(INTEL, 0x9c45), LPC_LPT_LP}, > { PCI_VDEVICE(INTEL, 0x9c46), LPC_LPT_LP}, > { PCI_VDEVICE(INTEL, 0x9c47), LPC_LPT_LP}, > + { PCI_VDEVICE(INTEL, 0x1f38), LPC_AVN}, > + { PCI_VDEVICE(INTEL, 0x1f39), LPC_AVN}, > + { PCI_VDEVICE(INTEL, 0x1f3a), LPC_AVN}, > + { PCI_VDEVICE(INTEL, 0x1f3b), LPC_AVN}, > { 0, }, /* End of list */ > }; > MODULE_DEVICE_TABLE(pci, lpc_ich_ids); >
diff --git a/drivers/mfd/lpc_ich.c b/drivers/mfd/lpc_ich.c index d9d9303..5ed8250 100644 --- a/drivers/mfd/lpc_ich.c +++ b/drivers/mfd/lpc_ich.c @@ -50,6 +50,7 @@ * document number TBD : Panther Point * document number TBD : Lynx Point * document number TBD : Lynx Point-LP + * document number TBD : Avoton SoC */ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt @@ -194,6 +195,7 @@ enum lpc_chipsets { LPC_PPT, /* Panther Point */ LPC_LPT, /* Lynx Point */ LPC_LPT_LP, /* Lynx Point-LP */ + LPC_AVN, /* Avoton SoC */ }; struct lpc_ich_info lpc_chipset_info[] = { @@ -474,6 +476,10 @@ struct lpc_ich_info lpc_chipset_info[] = { .name = "Lynx Point_LP", .iTCO_version = 2, }, + [LPC_AVN] = { + .name = "Avoton SoC", + .iTCO_version = 1, + }, }; /* @@ -655,6 +661,10 @@ static DEFINE_PCI_DEVICE_TABLE(lpc_ich_ids) = { { PCI_VDEVICE(INTEL, 0x9c45), LPC_LPT_LP}, { PCI_VDEVICE(INTEL, 0x9c46), LPC_LPT_LP}, { PCI_VDEVICE(INTEL, 0x9c47), LPC_LPT_LP}, + { PCI_VDEVICE(INTEL, 0x1f38), LPC_AVN}, + { PCI_VDEVICE(INTEL, 0x1f39), LPC_AVN}, + { PCI_VDEVICE(INTEL, 0x1f3a), LPC_AVN}, + { PCI_VDEVICE(INTEL, 0x1f3b), LPC_AVN}, { 0, }, /* End of list */ }; MODULE_DEVICE_TABLE(pci, lpc_ich_ids);