From: Tom Rini <trini@konsulko.com>
Date: Thu, 13 Dec 2018 14:36:55 +0000 (-0500)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-i2c
X-Git-Tag: v2019.01-rc2~8
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d117d8f19b0625f88309e47a8a32c2faa384dddc;hp=277b06684ddf5231ce1e684ee2860aedacb32b3c;p=oweals%2Fu-boot.git

Merge branch 'master' of git://git.denx.de/u-boot-i2c
---

diff --git a/drivers/i2c/tegra186_bpmp_i2c.c b/drivers/i2c/tegra186_bpmp_i2c.c
index b4fff43269..793f3f59b5 100644
--- a/drivers/i2c/tegra186_bpmp_i2c.c
+++ b/drivers/i2c/tegra186_bpmp_i2c.c
@@ -85,6 +85,12 @@ static int tegra186_bpmp_i2c_xfer(struct udevice *dev, struct i2c_msg *msg,
 	return 0;
 }
 
+static int tegra186_bpmp_probe_chip(struct udevice *bus, uint chip_addr,
+				    uint chip_flags)
+{
+	return 0;
+}
+
 static int tegra186_bpmp_i2c_probe(struct udevice *dev)
 {
 	struct tegra186_bpmp_i2c *priv = dev_get_priv(dev);
@@ -101,6 +107,7 @@ static int tegra186_bpmp_i2c_probe(struct udevice *dev)
 
 static const struct dm_i2c_ops tegra186_bpmp_i2c_ops = {
 	.xfer = tegra186_bpmp_i2c_xfer,
+	.probe_chip = tegra186_bpmp_probe_chip,
 };
 
 static const struct udevice_id tegra186_bpmp_i2c_ids[] = {