sandbox: i2c: search child emul dev and check its uclass id
authorPrzemyslaw Marczak <p.marczak@samsung.com>
Wed, 13 May 2015 11:38:31 +0000 (13:38 +0200)
committerSimon Glass <sjg@chromium.org>
Fri, 15 May 2015 01:58:34 +0000 (19:58 -0600)
The function get_emul() in sandbox i2c bus driver, always returns
first child as i2c emul device. This may only work for i2c devices
with a single child, which is an only i2c emul device.

In case when i2c device has more than one child (e.g. PMIC), and
one is i2c emul, then the function should search it by check uclass
id for each child. This patch add this change to the get_emul().

Signed-off-by: Przemyslaw Marczak <p.marczak@samsung.com>
Cc: Simon Glass <sjg@chromium.org>
Acked-by: Simon Glass <sjg@chromium.org>
Tested on sandbox:
Tested-by: Simon Glass <sjg@chromium.org>
drivers/i2c/sandbox_i2c.c

index dd1c7e59e4b886fcb638d7e270cdfc78dcf34f23..2c84c41643c8b442dea3634ac36367b97903b917 100644 (file)
@@ -26,6 +26,7 @@ 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);