Merge branch 'master' of git://git.denx.de/u-boot-samsung

[oweals/u-boot.git] / test / dm / bus.c

diff --git a/test/dm/bus.c b/test/dm/bus.c
index a215905add9b74be16c11f233e7e63d65c24833f..7006d4163db832632662c9214333d2cc939b46af 100644 (file)
--- a/test/dm/bus.c
+++ b/test/dm/bus.c
@@ -7,7 +7,6 @@
 #include <common.h>
 #include <dm.h>
 #include <dm/device-internal.h>
-#include <dm/root.h>
 #include <dm/test.h>
 #include <dm/uclass-internal.h>
 #include <dm/util.h>
@@ -30,7 +29,7 @@ static struct dm_test_state *test_state;
 
 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_dev(dev);
 }
 
 static int testbus_child_post_bind(struct udevice *dev)
@@ -46,7 +45,7 @@ static int testbus_child_post_bind(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_parent_priv(dev);
 
        parent_data->flag += FLAG_CHILD_PROBED;
 
@@ -64,7 +63,7 @@ static int testbus_child_pre_probe_uclass(struct udevice *dev)
 
 static int testbus_child_post_remove(struct udevice *dev)
 {
-       struct dm_test_parent_data *parent_data = dev_get_parentdata(dev);
+       struct dm_test_parent_data *parent_data = dev_get_parent_priv(dev);
        struct dm_test_state *dms = test_state;
 
        parent_data->flag += FLAG_CHILD_REMOVED;
@@ -161,16 +160,33 @@ static int dm_test_bus_children_funcs(struct unit_test_state *uts)
        node = fdt_path_offset(blob, "/d-test");
        ut_asserteq(-ENODEV, device_find_child_by_of_offset(bus, node, &dev));
 
+       return 0;
+}
+DM_TEST(dm_test_bus_children_funcs, DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT);
+
+static int dm_test_bus_children_of_offset(struct unit_test_state *uts)
+{
+       const void *blob = gd->fdt_blob;
+       struct udevice *bus, *dev;
+       int node;
+
+       ut_assertok(uclass_get_device(UCLASS_TEST_BUS, 0, &bus));
+       ut_assertnonnull(bus);
+
        /* Find a valid child */
        node = fdt_path_offset(blob, "/some-bus/c-test@1");
+       ut_assert(node > 0);
        ut_assertok(device_find_child_by_of_offset(bus, node, &dev));
+       ut_assertnonnull(dev);
        ut_assert(!(dev->flags & DM_FLAG_ACTIVATED));
        ut_assertok(device_get_child_by_of_offset(bus, node, &dev));
+       ut_assertnonnull(dev);
        ut_assert(dev->flags & DM_FLAG_ACTIVATED);
 
        return 0;
 }
-DM_TEST(dm_test_bus_children_funcs, DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT);
+DM_TEST(dm_test_bus_children_of_offset,
+       DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT | DM_TESTF_FLAT_TREE);
 
 /* Test that we can iterate through children */
 static int dm_test_bus_children_iterators(struct unit_test_state *uts)
@@ -215,20 +231,20 @@ static int test_bus_parent_data(struct unit_test_state *uts)
 
        /* Check that parent data is allocated */
        ut_assertok(device_find_child_by_seq(bus, 0, true, &dev));
-       ut_asserteq_ptr(NULL, dev_get_parentdata(dev));
+       ut_asserteq_ptr(NULL, dev_get_parent_priv(dev));
        ut_assertok(device_get_child_by_seq(bus, 0, &dev));
-       parent_data = dev_get_parentdata(dev);
+       parent_data = dev_get_parent_priv(dev);
        ut_assert(NULL != parent_data);
 
        /* Check that it starts at 0 and goes away when device is removed */
        parent_data->sum += 5;
        ut_asserteq(5, parent_data->sum);
-       device_remove(dev);
-       ut_asserteq_ptr(NULL, dev_get_parentdata(dev));
+       device_remove(dev, DM_REMOVE_NORMAL);
+       ut_asserteq_ptr(NULL, dev_get_parent_priv(dev));
 
        /* Check that we can do this twice */
        ut_assertok(device_get_child_by_seq(bus, 0, &dev));
-       parent_data = dev_get_parentdata(dev);
+       parent_data = dev_get_parent_priv(dev);
        ut_assert(NULL != parent_data);
        parent_data->sum += 5;
        ut_asserteq(5, parent_data->sum);
@@ -239,11 +255,11 @@ static int test_bus_parent_data(struct unit_test_state *uts)
        uclass_foreach_dev(dev, uc) {
                /* Ignore these if they are not on this bus */
                if (dev->parent != bus) {
-                       ut_asserteq_ptr(NULL, dev_get_parentdata(dev));
+                       ut_asserteq_ptr(NULL, dev_get_parent_priv(dev));
                        continue;
                }
                ut_assertok(device_probe(dev));
-               parent_data = dev_get_parentdata(dev);
+               parent_data = dev_get_parent_priv(dev);
 
                parent_data->sum = value;
                value += 5;
@@ -255,7 +271,7 @@ static int test_bus_parent_data(struct unit_test_state *uts)
                /* Ignore these if they are not on this bus */
                if (dev->parent != bus)
                        continue;
-               parent_data = dev_get_parentdata(dev);
+               parent_data = dev_get_parent_priv(dev);
 
                ut_asserteq(value, parent_data->sum);
                value += 5;
@@ -311,10 +327,10 @@ static int dm_test_bus_parent_ops(struct unit_test_state *uts)
                /* Ignore these if they are not on this bus */
                if (dev->parent != bus)
                        continue;
-               ut_asserteq_ptr(NULL, dev_get_parentdata(dev));
+               ut_asserteq_ptr(NULL, dev_get_parent_priv(dev));
 
                ut_assertok(device_probe(dev));
-               parent_data = dev_get_parentdata(dev);
+               parent_data = dev_get_parent_priv(dev);
                ut_asserteq(FLAG_CHILD_PROBED, parent_data->flag);
        }
 
@@ -322,10 +338,10 @@ static int dm_test_bus_parent_ops(struct unit_test_state *uts)
                /* Ignore these if they are not on this bus */
                if (dev->parent != bus)
                        continue;
-               parent_data = dev_get_parentdata(dev);
+               parent_data = dev_get_parent_priv(dev);
                ut_asserteq(FLAG_CHILD_PROBED, parent_data->flag);
-               ut_assertok(device_remove(dev));
-               ut_asserteq_ptr(NULL, dev_get_parentdata(dev));
+               ut_assertok(device_remove(dev, DM_REMOVE_NORMAL));
+               ut_asserteq_ptr(NULL, dev_get_parent_priv(dev));
                ut_asserteq_ptr(dms->removed, dev);
        }
        test_state = NULL;
@@ -361,7 +377,7 @@ static int test_bus_parent_platdata(struct unit_test_state *uts)
                plat->count++;
                ut_asserteq(1, plat->count);
                device_probe(dev);
-               device_remove(dev);
+               device_remove(dev, DM_REMOVE_NORMAL);
 
                ut_asserteq_ptr(plat, dev_get_parent_platdata(dev));
                ut_asserteq(1, plat->count);
@@ -371,7 +387,7 @@ static int test_bus_parent_platdata(struct unit_test_state *uts)
        ut_asserteq(3, child_count);
 
        /* Removing the bus should also have no effect (it is still bound) */
-       device_remove(bus);
+       device_remove(bus, DM_REMOVE_NORMAL);
        for (device_find_first_child(bus, &dev), child_count = 0;
             dev;
             device_find_next_child(&dev)) {