diff options
| author | Simon Glass <sjg@chromium.org> | 2016-01-17 16:11:45 -0700 |
|---|---|---|
| committer | Bin Meng <bmeng.cn@gmail.com> | 2016-01-24 12:09:41 +0800 |
| commit | 0c7645bde0961c6f44ba265186e3cb50fd5d6247 (patch) | |
| tree | f93876dabfd86bdb48f02ca269c7bbf843507fdd /drivers/i2c | |
| parent | abb0b01e7a22c4a1f3fdd2301fae7276e857b04b (diff) | |
| download | u-boot-0c7645bde0961c6f44ba265186e3cb50fd5d6247.tar.gz | |
x86: ivybridge: Use the I2C driver to perform SMbus init
Move the init code into the I2C driver.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Heiko Schocher <hs@denx.de>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/intel_i2c.c | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/drivers/i2c/intel_i2c.c b/drivers/i2c/intel_i2c.c index 1082d1a3ed..3d777ff23e 100644 --- a/drivers/i2c/intel_i2c.c +++ b/drivers/i2c/intel_i2c.c @@ -9,6 +9,7 @@ #include <dm.h> #include <i2c.h> #include <asm/io.h> +#include <asm/arch/pch.h> int intel_i2c_xfer(struct udevice *bus, struct i2c_msg *msg, int nmsgs) { @@ -27,6 +28,29 @@ int intel_i2c_set_bus_speed(struct udevice *bus, unsigned int speed) static int intel_i2c_probe(struct udevice *dev) { + /* + * So far this is just setup code for ivybridge SMbus. When we have + * a full I2C driver this may need to be moved, generalised or made + * dependant on a particular compatible string. + * + * Set SMBus I/O base + */ + dm_pci_write_config32(dev, SMB_BASE, + SMBUS_IO_BASE | PCI_BASE_ADDRESS_SPACE_IO); + + /* Set SMBus enable. */ + dm_pci_write_config8(dev, HOSTC, HST_EN); + + /* Set SMBus I/O space enable. */ + dm_pci_write_config16(dev, PCI_COMMAND, PCI_COMMAND_IO); + + /* Disable interrupt generation. */ + outb(0, SMBUS_IO_BASE + SMBHSTCTL); + + /* Clear any lingering errors, so transactions can run. */ + outb(inb(SMBUS_IO_BASE + SMBHSTSTAT), SMBUS_IO_BASE + SMBHSTSTAT); + debug("SMBus controller enabled\n"); + return 0; } |