Merge branch 'sandbox' of git://git.denx.de/u-boot-x86

[u-boot] / test / dm / test-fdt.c

diff --git a/test/dm/test-fdt.c b/test/dm/test-fdt.c
index 7980a683b5445bfc3835ee7a5f316b999ef9f185..b8ee9599a22a67c999bb8cd066226cf63237f324 100644 (file)
--- a/test/dm/test-fdt.c
+++ b/test/dm/test-fdt.c
@@ -51,6 +51,13 @@ static int testfdt_drv_probe(struct udevice *dev)
 
        priv->ping_total += DM_TEST_START_TOTAL;
 
+       /*
+        * If this device is on a bus, the uclass_flag will be set before
+        * calling this function. This is used by
+        * dm_test_bus_child_pre_probe_uclass().
+        */
+       priv->uclass_total += priv->uclass_flag;
+
        return 0;
 }
 
@@ -89,39 +96,20 @@ int testfdt_ping(struct udevice *dev, int pingval, int *pingret)
 UCLASS_DRIVER(testfdt) = {
        .name           = "testfdt",
        .id             = UCLASS_TEST_FDT,
+       .flags          = DM_UC_FLAG_SEQ_ALIAS,
 };
 
-/* Test that FDT-based binding works correctly */
-static int dm_test_fdt(struct dm_test_state *dms)
+int dm_check_devices(struct dm_test_state *dms, int num_devices)
 {
-       const int num_drivers = 4;
        struct udevice *dev;
-       struct uclass *uc;
        int ret;
        int i;
 
-       ret = dm_scan_fdt(gd->fdt_blob, false);
-       ut_assert(!ret);
-
-       ret = uclass_get(UCLASS_TEST_FDT, &uc);
-       ut_assert(!ret);
-
-       /* These are num_drivers compatible root-level device tree nodes */
-       ut_asserteq(num_drivers, list_count_items(&uc->dev_head));
-
-       /* Each should have no platdata / priv */
-       for (i = 0; i < num_drivers; i++) {
-               ret = uclass_find_device(UCLASS_TEST_FDT, i, &dev);
-               ut_assert(!ret);
-               ut_assert(!dev_get_priv(dev));
-               ut_assert(!dev->platdata);
-       }
-
        /*
         * Now check that the ping adds are what we expect. This is using the
         * ping-add property in each node.
         */
-       for (i = 0; i < num_drivers; i++) {
+       for (i = 0; i < num_devices; i++) {
                uint32_t base;
 
                ret = uclass_get_device(UCLASS_TEST_FDT, i, &dev);
@@ -144,6 +132,37 @@ static int dm_test_fdt(struct dm_test_state *dms)
 
        return 0;
 }
+
+/* Test that FDT-based binding works correctly */
+static int dm_test_fdt(struct dm_test_state *dms)
+{
+       const int num_devices = 6;
+       struct udevice *dev;
+       struct uclass *uc;
+       int ret;
+       int i;
+
+       ret = dm_scan_fdt(gd->fdt_blob, false);
+       ut_assert(!ret);
+
+       ret = uclass_get(UCLASS_TEST_FDT, &uc);
+       ut_assert(!ret);
+
+       /* These are num_devices compatible root-level device tree nodes */
+       ut_asserteq(num_devices, list_count_items(&uc->dev_head));
+
+       /* Each should have platform data but no private data */
+       for (i = 0; i < num_devices; i++) {
+               ret = uclass_find_device(UCLASS_TEST_FDT, i, &dev);
+               ut_assert(!ret);
+               ut_assert(!dev_get_priv(dev));
+               ut_assert(dev->platdata);
+       }
+
+       ut_assertok(dm_check_devices(dms, num_devices));
+
+       return 0;
+}
 DM_TEST(dm_test_fdt, 0);
 
 static int dm_test_fdt_pre_reloc(struct dm_test_state *dms)
@@ -173,7 +192,7 @@ static int dm_test_fdt_uclass_seq(struct dm_test_state *dms)
        ut_assertok(uclass_find_device_by_seq(UCLASS_TEST_FDT, 3, true, &dev));
        ut_asserteq_str("b-test", dev->name);
 
-       ut_assertok(uclass_find_device_by_seq(UCLASS_TEST_FDT, 0, true, &dev));
+       ut_assertok(uclass_find_device_by_seq(UCLASS_TEST_FDT, 8, true, &dev));
        ut_asserteq_str("a-test", dev->name);
 
        ut_asserteq(-ENODEV, uclass_find_device_by_seq(UCLASS_TEST_FDT, 5,
@@ -187,7 +206,10 @@ static int dm_test_fdt_uclass_seq(struct dm_test_state *dms)
        ut_asserteq(-ENODEV, uclass_find_device_by_seq(UCLASS_TEST_FDT, 7,
                                                       true, &dev));
 
-       /* Note that c-test is not probed since it is not a top-level node */
+       /*
+        * Note that c-test nodes are not probed since it is not a top-level
+        * node
+        */
        ut_assertok(uclass_get_device_by_seq(UCLASS_TEST_FDT, 3, &dev));
        ut_asserteq_str("b-test", dev->name);
 
@@ -206,11 +228,11 @@ static int dm_test_fdt_uclass_seq(struct dm_test_state *dms)
        ut_asserteq(-ENODEV, uclass_get_device_by_seq(UCLASS_TEST_FDT, 1,
                                                      &dev));
        ut_assertok(uclass_get_device(UCLASS_TEST_FDT, 0, &dev));
-       ut_assertok(uclass_get_device(UCLASS_TEST_FDT, 1, &dev));
+       ut_assertok(uclass_get_device(UCLASS_TEST_FDT, 4, &dev));
 
        /* But now that it is probed, we can find it */
        ut_assertok(uclass_get_device_by_seq(UCLASS_TEST_FDT, 1, &dev));
-       ut_asserteq_str("a-test", dev->name);
+       ut_asserteq_str("f-test", dev->name);
 
        return 0;
 }
@@ -236,12 +258,11 @@ static int dm_test_fdt_offset(struct dm_test_state *dms)
                                                            node, &dev));
 
        /* This is not a top level node so should not be probed */
-       node = fdt_path_offset(blob, "/some-bus/c-test");
+       node = fdt_path_offset(blob, "/some-bus/c-test@5");
        ut_assert(node > 0);
        ut_asserteq(-ENODEV, uclass_get_device_by_of_offset(UCLASS_TEST_FDT,
                                                            node, &dev));
 
        return 0;
 }
-
 DM_TEST(dm_test_fdt_offset, DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT);