test: dm: Expand dm_test_ofnode_phandle(_ot) with new ofnode/tree_parse_phandle

Expand dm_test_ofnode_phandle(_ot) with new ofnode/tree_parse_phandle() op.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/sandbox/dts/other.dts b/arch/sandbox/dts/other.dts
index b32158c..515d634 100644 (file)
--- a/arch/sandbox/dts/other.dts
+++ b/arch/sandbox/dts/other.dts
@@ -32,6 +32,7 @@
                        <&other_gpio_b 5 GPIO_ACTIVE_HIGH 3 2 1>,
                        <0>, <&other_gpio_a 12>;
                other-phandle-value = <&other_gpio_c 10>, <0xFFFFFFFF 20>, <&other_gpio_a 30>;
+               other-phandle-nodes = <&other_phandle_node_1>, <&other_phandle_node_2>;
        };
 
        other_gpio_a: other-gpio-a {
@@ -46,6 +47,12 @@
                #gpio-cells = <2>;
        };
 
+       other_phandle_node_1: other-phandle-node-1 {
+       };
+
+       other_phandle_node_2: other-phandle-node-2 {
+       };
+
        target: target {
                compatible = "sandbox-other2";
                str-prop = "other";

diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts
index 3017b33..b8a4646 100644 (file)
--- a/arch/sandbox/dts/test.dts
+++ b/arch/sandbox/dts/test.dts
@@ -296,6 +296,12 @@
                compatible = "sandbox,dsi-host";
        };
 
+       phandle_node_1: phandle-node-1 {
+       };
+
+       phandle_node_2: phandle-node-2 {
+       };
+
        a-test {
                reg = <0 1>;
                compatible = "denx,u-boot-fdt-test";
@@ -334,6 +340,7 @@
                interrupts-extended = <&irq 3 0>;
                acpi,name = "GHIJ";
                phandle-value = <&gpio_c 10>, <0xFFFFFFFF 20>, <&gpio_a 30>;
+               phandle-nodes = <&phandle_node_1>, <&phandle_node_2>;
 
                mux-controls = <&muxcontroller0 0>, <&muxcontroller0 1>,
                               <&muxcontroller0 2>, <&muxcontroller0 3>,

diff --git a/test/dm/ofnode.c b/test/dm/ofnode.c
index 24b67bb..cf10e69 100644 (file)
--- a/test/dm/ofnode.c
+++ b/test/dm/ofnode.c
@@ -280,15 +280,16 @@ static int dm_test_ofnode_read_ot(struct unit_test_state *uts)
 }
 DM_TEST(dm_test_ofnode_read_ot, UTF_SCAN_FDT | UTF_OTHER_FDT);
 
-/* test ofnode_count_/parse_phandle_with_args() */
+/* test ofnode_count_/parse/_phandle_with_args() */
 static int dm_test_ofnode_phandle(struct unit_test_state *uts)
 {
        struct ofnode_phandle_args args;
-       ofnode node;
+       ofnode node, phandle, target;
        int ret;
        const char prop[] = "test-gpios";
        const char cell[] = "#gpio-cells";
        const char prop2[] = "phandle-value";
+       const char prop3[] = "phandle-nodes";
 
        node = ofnode_path("/a-test");
        ut_assert(ofnode_valid(node));
@@ -352,20 +353,38 @@ static int dm_test_ofnode_phandle(struct unit_test_state *uts)
        ret = ofnode_parse_phandle_with_args(node, prop2, NULL, 1, 3, &args);
        ut_asserteq(-ENOENT, ret);
 
+       /* Test ofnode_parse_phandle */
+       phandle = ofnode_parse_phandle(node, "missing", 0);
+       ut_assert(ofnode_equal(ofnode_null(), phandle));
+
+       target = ofnode_path("/phandle-node-1");
+       ut_assert(ofnode_valid(target));
+       phandle = ofnode_parse_phandle(node, prop3, 0);
+       ut_assert(ofnode_equal(target, phandle));
+
+       target = ofnode_path("/phandle-node-2");
+       ut_assert(ofnode_valid(target));
+       phandle = ofnode_parse_phandle(node, prop3, 1);
+       ut_assert(ofnode_equal(target, phandle));
+
+       phandle = ofnode_parse_phandle(node, prop3, 3);
+       ut_assert(ofnode_equal(ofnode_null(), phandle));
+
        return 0;
 }
 DM_TEST(dm_test_ofnode_phandle, UTF_SCAN_PDATA | UTF_SCAN_FDT);
 
-/* test oftree_count_/parse_phandle_with_args() with 'other' tree */
+/* test oftree_count_/parse/_phandle_with_args() with 'other' tree */
 static int dm_test_ofnode_phandle_ot(struct unit_test_state *uts)
 {
        oftree otree = get_other_oftree(uts);
        struct ofnode_phandle_args args;
-       ofnode node;
+       ofnode node, phandle, target;
        int ret;
        const char prop[] = "other-test-gpios";
        const char cell[] = "#gpio-cells";
        const char prop2[] = "other-phandle-value";
+       const char prop3[] = "other-phandle-nodes";
 
        node = oftree_path(otree, "/other-a-test");
        ut_assert(ofnode_valid(node));
@@ -429,6 +448,23 @@ static int dm_test_ofnode_phandle_ot(struct unit_test_state *uts)
        ret = oftree_parse_phandle_with_args(otree, node, prop2, NULL, 1, 3, &args);
        ut_asserteq(-ENOENT, ret);
 
+       /* Test oftree_parse_phandle */
+       phandle = oftree_parse_phandle(otree, node, "missing", 0);
+       ut_assert(ofnode_equal(ofnode_null(), phandle));
+
+       target = oftree_path(otree, "/other-phandle-node-1");
+       ut_assert(ofnode_valid(target));
+       phandle = oftree_parse_phandle(otree, node, prop3, 0);
+       ut_assert(ofnode_equal(target, phandle));
+
+       target = oftree_path(otree, "/other-phandle-node-2");
+       ut_assert(ofnode_valid(target));
+       phandle = oftree_parse_phandle(otree, node, prop3, 1);
+       ut_assert(ofnode_equal(target, phandle));
+
+       phandle = oftree_parse_phandle(otree, node, prop3, 3);
+       ut_assert(ofnode_equal(ofnode_null(), phandle));
+
        return 0;
 }
 DM_TEST(dm_test_ofnode_phandle_ot, UTF_OTHER_FDT);