Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-28 15:41:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

dm: core: Add a post_bind method for parents

Browse source 
Allow parent drivers to be called when a new child is bound to them. This
allows a bus to set up information it needs for that child.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
This commit is contained in:
Simon Glass 2015-01-25 08:27:03 -07:00
parent ba8da9dc43
commit 0118ce7957
3 changed files with 49 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/core/device.c
View file

@ -111,12 +111,24 @@ int device_bind(struct udevice *parent, struct driver *drv, const char *name,
if (ret) if (ret)
goto fail_bind; goto fail_bind;
} }
if (parent && parent->driver->child_post_bind) {
ret = parent->driver->child_post_bind(dev);
if (ret)
goto fail_child_post_bind;
}
if (parent) if (parent)
dm_dbg("Bound device %s to %s\n", dev->name, parent->name); dm_dbg("Bound device %s to %s\n", dev->name, parent->name);
*devp = dev; *devp = dev;
return 0; return 0;
fail_child_post_bind:
if (drv->unbind && drv->unbind(dev)) {
dm_warn("unbind() method failed on dev '%s' on error path\n",
dev->name);
}
fail_bind: fail_bind:
if (uclass_unbind_device(dev)) { if (uclass_unbind_device(dev)) {
dm_warn("Failed to unbind dev '%s' on error path\n", dm_warn("Failed to unbind dev '%s' on error path\n",

2
include/dm/device.h
View file

@ -132,6 +132,7 @@ struct udevice_id {
* @remove: Called to remove a device, i.e. de-activate it * @remove: Called to remove a device, i.e. de-activate it
* @unbind: Called to unbind a device from its driver * @unbind: Called to unbind a device from its driver
* @ofdata_to_platdata: Called before probe to decode device tree data * @ofdata_to_platdata: Called before probe to decode device tree data
* @child_post_bind: Called after a new child has been bound
* @child_pre_probe: Called before a child device is probed. The device has * @child_pre_probe: Called before a child device is probed. The device has
* memory allocated but it has not yet been probed. * memory allocated but it has not yet been probed.
* @child_post_remove: Called after a child device is removed. The device * @child_post_remove: Called after a child device is removed. The device
@ -168,6 +169,7 @@ struct driver {
int (*remove)(struct udevice *dev); int (*remove)(struct udevice *dev);
int (*unbind)(struct udevice *dev); int (*unbind)(struct udevice *dev);
int (*ofdata_to_platdata)(struct udevice *dev); int (*ofdata_to_platdata)(struct udevice *dev);
int (*child_post_bind)(struct udevice *dev);
int (*child_pre_probe)(struct udevice *dev); int (*child_pre_probe)(struct udevice *dev);
int (*child_post_remove)(struct udevice *dev); int (*child_post_remove)(struct udevice *dev);
int priv_auto_alloc_size; int priv_auto_alloc_size;

35
test/dm/bus.c
View file

@ -17,6 +17,7 @@ DECLARE_GLOBAL_DATA_PTR;
struct dm_test_parent_platdata { struct dm_test_parent_platdata {
int count; int count;
int bind_flag;
}; };
enum { enum {
@ -31,6 +32,16 @@ static int testbus_drv_probe(struct udevice *dev)
return dm_scan_fdt_node(dev, gd->fdt_blob, dev->of_offset, false); return dm_scan_fdt_node(dev, gd->fdt_blob, dev->of_offset, false);
} }
static int testbus_child_post_bind(struct udevice *dev)
{
struct dm_test_parent_platdata *plat;
plat = dev_get_parent_platdata(dev);
plat->bind_flag = 1;
return 0;
}
static int testbus_child_pre_probe(struct udevice *dev) static int testbus_child_pre_probe(struct udevice *dev)
{ {
struct dm_test_parent_data *parent_data = dev_get_parentdata(dev); struct dm_test_parent_data *parent_data = dev_get_parentdata(dev);
@ -64,6 +75,7 @@ U_BOOT_DRIVER(testbus_drv) = {
.of_match = testbus_ids, .of_match = testbus_ids,
.id = UCLASS_TEST_BUS, .id = UCLASS_TEST_BUS,
.probe = testbus_drv_probe, .probe = testbus_drv_probe,
.child_post_bind = testbus_child_post_bind,
.priv_auto_alloc_size = sizeof(struct dm_test_priv), .priv_auto_alloc_size = sizeof(struct dm_test_priv),
.platdata_auto_alloc_size = sizeof(struct dm_test_pdata), .platdata_auto_alloc_size = sizeof(struct dm_test_pdata),
.per_child_auto_alloc_size = sizeof(struct dm_test_parent_data), .per_child_auto_alloc_size = sizeof(struct dm_test_parent_data),
@ -380,3 +392,26 @@ static int dm_test_bus_parent_platdata_uclass(struct dm_test_state *dms)
} }
DM_TEST(dm_test_bus_parent_platdata_uclass, DM_TEST(dm_test_bus_parent_platdata_uclass,
DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT); DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT);
/* Test that the child post_bind method is called */
static int dm_test_bus_child_post_bind(struct dm_test_state *dms)
{
struct dm_test_parent_platdata *plat;
struct udevice *bus, *dev;
int child_count;
ut_assertok(uclass_get_device(UCLASS_TEST_BUS, 0, &bus));
for (device_find_first_child(bus, &dev), child_count = 0;
dev;
device_find_next_child(&dev)) {
/* Check that platform data is allocated */
plat = dev_get_parent_platdata(dev);
ut_assert(plat != NULL);
ut_asserteq(1, plat->bind_flag);
child_count++;
}
ut_asserteq(3, child_count);
return 0;
}
DM_TEST(dm_test_bus_child_post_bind, DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT);