cros_ec: Honor the google,remote-bus dt property

Boards where ECs that use a I2C port != 0 specify this in the
devicetree file via the google,remote-bus property.
Previously this was ignored and hardcoded to port 0.

Signed-off-by: Moritz Fischer <moritz.fischer@ettus.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Heiko Schocher <hs@denx.de>
Cc: u-boot@lists.denx.de
Acked-by: Simon Glass <sjg@chromium.org>

diff --git a/drivers/i2c/cros_ec_tunnel.c b/drivers/i2c/cros_ec_tunnel.c
index e2c6e447951068ba7505d90cfcaf547431665199..9cf8e7dec0f8861b44f5316e7196ce59e6ecf2ba 100644 (file)
--- a/drivers/i2c/cros_ec_tunnel.c
+++ b/drivers/i2c/cros_ec_tunnel.c
@@ -11,6 +11,12 @@
 #include <errno.h>
 #include <i2c.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)
 {
        return 0;
@@ -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_ofdata_to_platdata(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;
+
+       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,5 +56,7 @@ U_BOOT_DRIVER(cros_ec_tunnel) = {
        .name   = "cros_ec_tunnel",
        .id     = UCLASS_I2C,
        .of_match = cros_ec_i2c_ids,
+       .ofdata_to_platdata = cros_ec_i2c_ofdata_to_platdata,
+       .priv_auto_alloc_size = sizeof(struct cros_ec_i2c_bus),
        .ops    = &cros_ec_i2c_ops,
 };

diff --git a/drivers/misc/cros_ec.c b/drivers/misc/cros_ec.c
index 9378e96129b33a062c721936eead4050a39d6ec5..5225cdb1c0eb61c0b8701a6f39c7b69f2f8923c4 100644 (file)
--- a/drivers/misc/cros_ec.c
+++ b/drivers/misc/cros_ec.c
@@ -1058,7 +1058,8 @@ int cros_ec_decode_ec_flash(const void *blob, int node,
        return 0;
 }
 
-int cros_ec_i2c_tunnel(struct udevice *dev, struct i2c_msg *in, int nmsgs)
+int cros_ec_i2c_tunnel(struct udevice *dev, int port, struct i2c_msg *in,
+                      int nmsgs)
 {
        struct cros_ec_dev *cdev = dev_get_uclass_priv(dev);
        union {
@@ -1078,7 +1079,7 @@ int cros_ec_i2c_tunnel(struct udevice *dev, struct i2c_msg *in, int nmsgs)
        int rv;
        int i;
 
-       p->port = 0;
+       p->port = port;
 
        p->num_msgs = nmsgs;
        size = sizeof(*p) + p->num_msgs * sizeof(*msg);

diff --git a/include/cros_ec.h b/include/cros_ec.h
index 5fa5f6f782a08276ad6c785b471a140850c5666d..30b19089b14dd96683901637cc46d12f13d24035 100644 (file)
--- a/include/cros_ec.h
+++ b/include/cros_ec.h
@@ -395,9 +395,11 @@ struct i2c_msg;
  * Tunnel an I2C transfer to the EC
  *
  * @param dev          CROS-EC device
+ * @param port         The remote port on EC to use
  * @param msg          List of messages to transfer
  * @param nmsgs                Number of messages to transfer
  */
-int cros_ec_i2c_tunnel(struct udevice *dev, struct i2c_msg *msg, int nmsgs);
+int cros_ec_i2c_tunnel(struct udevice *dev, int port, struct i2c_msg *msg,
+                      int nmsgs);
 
 #endif