summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2019-09-30 12:57:38 +0300
committerKyösti Mälkki <kyosti.malkki@gmail.com>2019-10-05 05:07:29 +0000
commit81ade745b19194fbad3e3d51d0dac6ca76de1f01 (patch)
tree6d5c5a1e1755a9a499ec19315af6e867cae1df49 /src
parentd32efc9c7bdc9a5e35bf212d75b13c7ac95d1b98 (diff)
downloadcoreboot-81ade745b19194fbad3e3d51d0dac6ca76de1f01.tar.xz
intel/fsp_baytrail: Define PCH_DEV_SLOT_I2C1
Change-Id: I02c08b847fa1523e3296bdf9e3db5a7a322df72e Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/35733 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Werner Zeh <werner.zeh@siemens.com>
Diffstat (limited to 'src')
-rw-r--r--src/soc/intel/fsp_baytrail/i2c.c6
-rw-r--r--src/soc/intel/fsp_baytrail/include/soc/pci_devs.h2
2 files changed, 5 insertions, 3 deletions
diff --git a/src/soc/intel/fsp_baytrail/i2c.c b/src/soc/intel/fsp_baytrail/i2c.c
index 3ea91e3b5e..5f6ca467ea 100644
--- a/src/soc/intel/fsp_baytrail/i2c.c
+++ b/src/soc/intel/fsp_baytrail/i2c.c
@@ -117,7 +117,7 @@ int i2c_init(unsigned bus)
base_ptr = (char*)base_adr[bus];
/* Set the I2C-device the user wants to use */
- dev = pcidev_on_root(I2C1_DEV, bus + 1);
+ dev = pcidev_on_root(PCH_DEV_SLOT_I2C1, bus + 1);
/* Ensure we have the right PCI device */
if ((pci_read_config16(dev, 0x0) != I2C_PCI_VENDOR_ID) ||
@@ -174,7 +174,7 @@ int i2c_read(unsigned bus, unsigned chip, unsigned addr,
int stat;
/* Get base address of desired I2C-controller */
- dev = pcidev_on_root(I2C1_DEV, bus + 1);
+ dev = pcidev_on_root(PCH_DEV_SLOT_I2C1, bus + 1);
base_ptr = (char *)pci_read_config32(dev, PCI_BASE_ADDRESS_0);
if (base_ptr == NULL) {
printk(BIOS_INFO, "I2C: Invalid Base address\n");
@@ -233,7 +233,7 @@ int i2c_write(unsigned bus, unsigned chip, unsigned addr,
int stat;
/* Get base address of desired I2C-controller */
- dev = pcidev_on_root(I2C1_DEV, bus + 1);
+ dev = pcidev_on_root(PCH_DEV_SLOT_I2C1, bus + 1);
base_ptr = (char *)pci_read_config32(dev, PCI_BASE_ADDRESS_0);
if (base_ptr == NULL) {
return I2C_ERR_INVALID_ADR;
diff --git a/src/soc/intel/fsp_baytrail/include/soc/pci_devs.h b/src/soc/intel/fsp_baytrail/include/soc/pci_devs.h
index 00ff268862..5e5b8071df 100644
--- a/src/soc/intel/fsp_baytrail/include/soc/pci_devs.h
+++ b/src/soc/intel/fsp_baytrail/include/soc/pci_devs.h
@@ -110,6 +110,8 @@
# define SOC_DEVFN_I2C6 PCI_DEVFN(I2C6_DEV,I2C6_FUNC)
# define SOC_DEVFN_I2C7 PCI_DEVFN(I2C7_DEV,I2C7_FUNC)
+#define PCH_DEV_SLOT_I2C1 I2C1_DEV
+
/* Trusted Execution Engine */
#define TXE_DEV 0x1a
#define TXE_FUNC 0