diff options
| author | Furquan Shaikh <furquan@chromium.org> | 2017-06-09 17:54:00 -0700 |
|---|---|---|
| committer | Furquan Shaikh <furquan@google.com> | 2017-06-14 20:20:07 +0200 |
| commit | d629e433dddeff040260e9ca309525cbf47a7601 (patch) | |
| tree | df4ec1e37fddec300d32c3736a0c2d662699b7a6 /src/soc | |
| parent | ab37e9a171794d3d1fdaa5eff93a61590e5cee8c (diff) | |
| download | coreboot-d629e433dddeff040260e9ca309525cbf47a7601.tar.xz | |
soc/intel/common/block/i2c: Ignore disabled I2C devices
If I2C device is disabled:
1. BAR for the device will be 0
2. There is no need to generate ACPI tables for the device
TEST=Verified that if an i2c device is disabled statically in
devicetree or dynamically in mainboard, then coreboot does not die
looking for missing resources.
Change-Id: Id9a790e338a0e6f32c199f5f437203e1525df208
Signed-off-by: Furquan Shaikh <furquan@chromium.org>
Reviewed-on: https://review.coreboot.org/20140
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Martin Roth <martinroth@google.com>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Philippe Mathieu-Daudé <philippe.mathieu.daude@gmail.com>
Diffstat (limited to 'src/soc')
| -rw-r--r-- | src/soc/intel/common/block/i2c/i2c.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/soc/intel/common/block/i2c/i2c.c b/src/soc/intel/common/block/i2c/i2c.c index fe220b58fb..6debe88eeb 100644 --- a/src/soc/intel/common/block/i2c/i2c.c +++ b/src/soc/intel/common/block/i2c/i2c.c @@ -41,7 +41,7 @@ uintptr_t lpss_i2c_base_address(unsigned int bus) /* devfn -> dev */ dev = dev_find_slot(0, devfn); - if (!dev) + if (!dev || !dev->enabled) return (uintptr_t)NULL; /* dev -> bar0 */ @@ -119,7 +119,12 @@ static void lpss_i2c_acpi_fill_ssdt(struct device *dev) I2C_SPEED_FAST_PLUS, I2C_SPEED_HIGH, }; - int i, bus = lpss_i2c_dev_to_bus(dev); + int i, bus; + + if (!dev->enabled) + return; + + bus = lpss_i2c_dev_to_bus(dev); bcfg = i2c_get_soc_cfg(bus, dev); |