Merge branch 'next' of https://source.denx.de/u-boot/custodians/u-boot-net

[J-u-boot.git] / drivers / i2c / cros_ec_tunnel.c

diff --git a/drivers/i2c/cros_ec_tunnel.c b/drivers/i2c/cros_ec_tunnel.c
index 7ab1fd898ad0bd13d5e6e606869361b1ea812b16..75828b6e7c273c53fadf564494fb0346004df859 100644 (file)
--- a/drivers/i2c/cros_ec_tunnel.c
+++ b/drivers/i2c/cros_ec_tunnel.c
@@ -1,8 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (c) 2015 Google, Inc
  * Written by Simon Glass <[email protected]>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -10,6 +9,13 @@
 #include <cros_ec.h>
 #include <errno.h>
 #include <i2c.h>
+#include <asm/global_data.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+struct cros_ec_i2c_bus {
+       int remote_bus;
+};
 
 static int cros_ec_i2c_set_bus_speed(struct udevice *dev, unsigned int speed)
 {
@@ -19,7 +25,21 @@ static int cros_ec_i2c_set_bus_speed(struct udevice *dev, unsigned int speed)
 static int cros_ec_i2c_xfer(struct udevice *dev, struct i2c_msg *msg,
                            int nmsgs)
 {
-       return cros_ec_i2c_tunnel(dev->parent, msg, nmsgs);
+       struct cros_ec_i2c_bus *i2c_bus = dev_get_priv(dev);
+
+       return cros_ec_i2c_tunnel(dev->parent, i2c_bus->remote_bus, msg, nmsgs);
+}
+
+static int cros_ec_i2c_of_to_plat(struct udevice *dev)
+{
+       struct cros_ec_i2c_bus *i2c_bus = dev_get_priv(dev);
+       const void *blob = gd->fdt_blob;
+       int node = dev_of_offset(dev);
+
+       i2c_bus->remote_bus = fdtdec_get_uint(blob, node, "google,remote-bus",
+                                             0);
+
+       return 0;
 }
 
 static const struct dm_i2c_ops cros_ec_i2c_ops = {
@@ -36,6 +56,7 @@ U_BOOT_DRIVER(cros_ec_tunnel) = {
        .name   = "cros_ec_tunnel",
        .id     = UCLASS_I2C,
        .of_match = cros_ec_i2c_ids,
-       .per_child_auto_alloc_size = sizeof(struct dm_i2c_chip),
+       .of_to_plat = cros_ec_i2c_of_to_plat,
+       .priv_auto      = sizeof(struct cros_ec_i2c_bus),
        .ops    = &cros_ec_i2c_ops,
 };