Skip to content

Commit

Permalink
sandbox: i2c: search child emul dev and check its uclass id
Browse files Browse the repository at this point in the history
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 <[email protected]>
Cc: Simon Glass <[email protected]>
Acked-by: Simon Glass <[email protected]>
Tested on sandbox:
Tested-by: Simon Glass <[email protected]>
  • Loading branch information
bobenstein authored and sjg20 committed May 15, 2015
1 parent 769c948 commit a989ec8
Showing 1 changed file with 17 additions and 3 deletions.
20 changes: 17 additions & 3 deletions drivers/i2c/sandbox_i2c.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
Expand Down

0 comments on commit a989ec8

Please sign in to comment.