From: Tom Rini <trini@konsulko.com>
Date: Wed, 18 Dec 2019 12:20:19 +0000 (-0500)
Subject: Merge branch 'next' of https://gitlab.denx.de/u-boot/custodians/u-boot-x86 into next
X-Git-Tag: v2020.04-rc1~39^2~2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c0912f9bbfb26dd03d189953678691b799d35b6e;p=oweals%2Fu-boot.git

Merge branch 'next' of https://gitlab.denx.de/u-boot/custodians/u-boot-x86 into next

- Various x86 common codes updated for TPL/SPL
- I2C designware driver updated for PCI
- ICH SPI driver updated to support Apollo Lake
- Add Intel FSP2 base support
- Intel Apollo Lake platform specific drivers support
- Add a new board Google Chromebook Coral
---

c0912f9bbfb26dd03d189953678691b799d35b6e
diff --cc drivers/i2c/i2c-uclass.c
index 44aace3a36,88c13e76cb..fe77e64619
--- a/drivers/i2c/i2c-uclass.c
+++ b/drivers/i2c/i2c-uclass.c
@@@ -469,23 -465,7 +469,23 @@@ int i2c_get_chip_offset_len(struct udev
  	return chip->offset_len;
  }
  
 +int i2c_set_chip_addr_offset_mask(struct udevice *dev, uint mask)
 +{
 +	struct dm_i2c_chip *chip = dev_get_parent_platdata(dev);
 +
 +	chip->chip_addr_offset_mask = mask;
 +
 +	return 0;
 +}
 +
 +uint i2c_get_chip_addr_offset_mask(struct udevice *dev)
 +{
 +	struct dm_i2c_chip *chip = dev_get_parent_platdata(dev);
 +
 +	return chip->chip_addr_offset_mask;
 +}
 +
- #ifdef CONFIG_DM_GPIO
+ #if CONFIG_IS_ENABLED(DM_GPIO)
  static void i2c_gpio_set_pin(struct gpio_desc *pin, int bit)
  {
  	if (bit)