diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2020-01-06 19:41:42 +0200 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2020-01-14 18:18:26 +0000 |
| commit | f555a58abc487270d4ba42527b1b43850bd718c0 (patch) | |
| tree | 5285cf1bb4cc64cedf5c9defa78ea63803aca3e5 /src/southbridge/intel/i82801ix | |
| parent | 542fa6de384d4b79d8964512b4088bcd90863bd2 (diff) | |
sb/intel/common: Declare common smbus_base() and enable_smbus()
This avoids including platform-specific headers with different
filenames from common code.
Change-Id: Idf9893e55949d63f3ceca2249e618d0f81320321
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/38232
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Diffstat (limited to 'src/southbridge/intel/i82801ix')
| -rw-r--r-- | src/southbridge/intel/i82801ix/early_init.c | 1 | ||||
| -rw-r--r-- | src/southbridge/intel/i82801ix/early_smbus.c | 18 | ||||
| -rw-r--r-- | src/southbridge/intel/i82801ix/i82801ix.h | 1 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/southbridge/intel/i82801ix/early_init.c b/src/southbridge/intel/i82801ix/early_init.c index 4ce4fbebc4..9c1e6c0dc2 100644 --- a/src/southbridge/intel/i82801ix/early_init.c +++ b/src/southbridge/intel/i82801ix/early_init.c @@ -16,6 +16,7 @@ #include <arch/io.h> #include <device/pci_ops.h> +#include <device/smbus_host.h> #include "i82801ix.h" #include "chip.h" diff --git a/src/southbridge/intel/i82801ix/early_smbus.c b/src/southbridge/intel/i82801ix/early_smbus.c index 4286760a7e..60f49d2e9b 100644 --- a/src/southbridge/intel/i82801ix/early_smbus.c +++ b/src/southbridge/intel/i82801ix/early_smbus.c @@ -16,26 +16,28 @@ */ #include <device/pci_ops.h> -#include <console/console.h> #include <device/pci_def.h> #include <device/pci_ids.h> #include <device/smbus_host.h> #include "i82801ix.h" -void enable_smbus(void) +uintptr_t smbus_base(void) { - pci_devfn_t dev; + return SMBUS_IO_BASE; +} +int smbus_enable_iobar(uintptr_t base) +{ /* Set the SMBus device statically. */ - dev = PCI_DEV(0x0, 0x1f, 0x3); + pci_devfn_t dev = PCI_DEV(0x0, 0x1f, 0x3); /* Check to make sure we've got the right device. */ if (pci_read_config16(dev, 0x2) != PCI_DEVICE_ID_INTEL_82801IB_SMB) - die("SMBus controller not found!"); + return -1; /* Set SMBus I/O base. */ pci_write_config32(dev, SMB_BASE, - SMBUS_IO_BASE | PCI_BASE_ADDRESS_SPACE_IO); + base | PCI_BASE_ADDRESS_SPACE_IO); /* Set SMBus enable. */ pci_write_config8(dev, HOSTC, HST_EN); @@ -43,9 +45,7 @@ void enable_smbus(void) /* Set SMBus I/O space enable. */ pci_write_config16(dev, PCI_COMMAND, PCI_COMMAND_IO); - smbus_host_reset(SMBUS_IO_BASE); - - printk(BIOS_DEBUG, "SMBus controller enabled.\n"); + return 0; } int smbus_read_byte(unsigned int device, unsigned int address) diff --git a/src/southbridge/intel/i82801ix/i82801ix.h b/src/southbridge/intel/i82801ix/i82801ix.h index 906d24e95b..f60aad387e 100644 --- a/src/southbridge/intel/i82801ix/i82801ix.h +++ b/src/southbridge/intel/i82801ix/i82801ix.h @@ -208,7 +208,6 @@ static inline int lpc_is_mobile(const u16 devid) void aseg_smm_lock(void); -void enable_smbus(void); void i82801ix_early_init(void); void i82801ix_lpc_decode(void); void i82801ix_dmi_setup(void); |