diff options
| author | David S. Miller <davem@davemloft.net> | 2018-09-12 22:22:42 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-09-12 22:22:42 -0700 |
| commit | aaf9253025e80cf8f62d7b33670e84e838eec5a3 (patch) | |
| tree | f13b307c8407cc05ff803c4d7f6a0967d85ce3ec /drivers/i2c/busses/i2c-i801.c | |
| parent | a20625e49ddefc250c221478fb0dc62ea27722a6 (diff) | |
| parent | 7428b2e5d0b195f2a5e40f91d2b41a8503fcfe68 (diff) | |
| download | lwn-aaf9253025e80cf8f62d7b33670e84e838eec5a3.tar.gz lwn-aaf9253025e80cf8f62d7b33670e84e838eec5a3.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/i2c/busses/i2c-i801.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-i801.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c index 04b60a349d7e..c91e145ef5a5 100644 --- a/drivers/i2c/busses/i2c-i801.c +++ b/drivers/i2c/busses/i2c-i801.c @@ -140,6 +140,7 @@ #define SBREG_BAR 0x10 #define SBREG_SMBCTRL 0xc6000c +#define SBREG_SMBCTRL_DNV 0xcf000c /* Host status bits for SMBPCISTS */ #define SMBPCISTS_INTS BIT(3) @@ -1399,7 +1400,11 @@ static void i801_add_tco(struct i801_priv *priv) spin_unlock(&p2sb_spinlock); res = &tco_res[ICH_RES_MEM_OFF]; - res->start = (resource_size_t)base64_addr + SBREG_SMBCTRL; + if (pci_dev->device == PCI_DEVICE_ID_INTEL_DNV_SMBUS) + res->start = (resource_size_t)base64_addr + SBREG_SMBCTRL_DNV; + else + res->start = (resource_size_t)base64_addr + SBREG_SMBCTRL; + res->end = res->start + 3; res->flags = IORESOURCE_MEM; |