Merge git://www.denx.de/git/u-boot-cfi-flash

[oweals/u-boot.git] / drivers / i2c / sandbox_i2c.c

diff --git a/drivers/i2c/sandbox_i2c.c b/drivers/i2c/sandbox_i2c.c
index d6adc0f721b85cb6b352d1993641da444aa62919..2c84c41643c8b442dea3634ac36367b97903b917 100644 (file)
--- a/drivers/i2c/sandbox_i2c.c
+++ b/drivers/i2c/sandbox_i2c.c
@@ -18,14 +18,15 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-struct dm_sandbox_i2c_emul_priv {
-       struct udevice *emul;
+struct sandbox_i2c_priv {
+       bool test_mode;
 };
 
 static int get_emul(struct udevice *dev, struct udevice **devp,
                    struct dm_i2c_ops **opsp)
 {
        struct dm_i2c_chip *plat;
+       struct udevice *child;
        int ret;
 
        *devp = NULL;
@@ -37,9 +38,22 @@ static int get_emul(struct udevice *dev, struct udevice **devp,
                if (ret)
                        return ret;
 
-               ret = device_get_child(dev, 0, &plat->emul);
-               if (ret)
-                       return ret;
+               for (device_find_first_child(dev, &child); child;
+                    device_find_next_child(&child)) {
+                       if (device_get_uclass_id(child) != UCLASS_I2C_EMUL)
+                               continue;
+
+                       ret = device_probe(child);
+                       if (ret)
+                               return ret;
+
+                       break;
+               }
+
+               if (child)
+                       plat->emul = child;
+               else
+                       return -ENODEV;
        }
        *devp = plat->emul;
        *opsp = i2c_get_ops(plat->emul);
@@ -47,17 +61,25 @@ static int get_emul(struct udevice *dev, struct udevice **devp,
        return 0;
 }
 
+void sandbox_i2c_set_test_mode(struct udevice *bus, bool test_mode)
+{
+       struct sandbox_i2c_priv *priv = dev_get_priv(bus);
+
+       priv->test_mode = test_mode;
+}
+
 static int sandbox_i2c_xfer(struct udevice *bus, struct i2c_msg *msg,
                            int nmsgs)
 {
        struct dm_i2c_bus *i2c = dev_get_uclass_priv(bus);
+       struct sandbox_i2c_priv *priv = dev_get_priv(bus);
        struct dm_i2c_ops *ops;
        struct udevice *emul, *dev;
        bool is_read;
        int ret;
 
        /* Special test code to return success but with no emulation */
-       if (msg->addr == SANDBOX_I2C_TEST_ADDR)
+       if (priv->test_mode && msg->addr == SANDBOX_I2C_TEST_ADDR)
                return 0;
 
        ret = i2c_get_chip(bus, msg->addr, 1, &dev);
@@ -68,13 +90,18 @@ static int sandbox_i2c_xfer(struct udevice *bus, struct i2c_msg *msg,
        if (ret)
                return ret;
 
-       /*
-        * For testing, don't allow writing above 100KHz for writes and
-        * 400KHz for reads
-        */
-       is_read = nmsgs > 1;
-       if (i2c->speed_hz > (is_read ? 400000 : 100000))
-               return -EINVAL;
+       if (priv->test_mode) {
+               /*
+               * For testing, don't allow writing above 100KHz for writes and
+               * 400KHz for reads.
+               */
+               is_read = nmsgs > 1;
+               if (i2c->speed_hz > (is_read ? 400000 : 100000)) {
+                       debug("%s: Max speed exceeded\n", __func__);
+                       return -EINVAL;
+               }
+       }
+
        return ops->xfer(emul, msg, nmsgs);
 }
 
@@ -92,4 +119,5 @@ U_BOOT_DRIVER(i2c_sandbox) = {
        .id     = UCLASS_I2C,
        .of_match = sandbox_i2c_ids,
        .ops    = &sandbox_i2c_ops,
+       .priv_auto_alloc_size = sizeof(struct sandbox_i2c_priv),
 };