Add a number after the node name so that it is clear which controller is
being used.
Signed-off-by: Simon Glass <s...@chromium.org>
---
arch/sandbox/dts/test.dts | 4 ++--
test/boot/bootdev.c | 12 ++++++------
test/boot/bootflow.c | 6 +++---
test/dm/usb.c | 4 ++--
4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts
index 060c48eaefd..caec8c8fd01 100644
--- a/arch/sandbox/dts/test.dts
+++ b/arch/sandbox/dts/test.dts
@@ -1495,7 +1495,7 @@
usb_0: usb@0 {
compatible = "sandbox,usb";
status = "disabled";
- hub {
+ hub0 {
compatible = "sandbox,usb-hub";
#address-cells = <1>;
#size-cells = <0>;
@@ -1509,7 +1509,7 @@
usb_1: usb@1 {
compatible = "sandbox,usb";
iommus = <&iommu>;
- hub {
+ hub1 {
compatible = "usb-hub";
usb,device-class = <9>;
#address-cells = <1>;
diff --git a/test/boot/bootdev.c b/test/boot/bootdev.c
index 7ef724f65bb..0ace3d0699c 100644
--- a/test/boot/bootdev.c
+++ b/test/boot/bootdev.c
@@ -231,7 +231,7 @@ static int bootdev_test_order(struct unit_test_state *uts)
ut_asserteq(6, iter.num_devs);
ut_asserteq_str("mmc1.bootdev", iter.dev_used[0]->name);
ut_asserteq_str("mmc2.bootdev", iter.dev_used[1]->name);
- ut_asserteq_str("hub.p1.usb_mass_storage.lun0.bootdev",
+ ut_asserteq_str("hub1.p1.usb_mass_storage.lun0.bootdev",
iter.dev_used[2]->name);
bootflow_iter_uninit(&iter);
@@ -277,7 +277,7 @@ static int bootdev_test_order(struct unit_test_state *uts)
ut_asserteq_str("mmc2.bootdev", iter.dev_used[0]->name);
ut_asserteq_str("mmc1.bootdev", iter.dev_used[1]->name);
ut_asserteq_str("mmc0.bootdev", iter.dev_used[2]->name);
- ut_asserteq_str("hub.p1.usb_mass_storage.lun0.bootdev",
+ ut_asserteq_str("hub1.p1.usb_mass_storage.lun0.bootdev",
iter.dev_used[3]->name);
bootflow_iter_uninit(&iter);
@@ -343,11 +343,11 @@ static int bootdev_test_prio(struct unit_test_state *uts)
ut_asserteq(-ENODEV, bootflow_scan_next(&iter, &bflow));
ut_asserteq(7, iter.num_devs);
ut_asserteq_str("mmc2.bootdev", iter.dev_used[0]->name);
- ut_asserteq_str("hub.p1.usb_mass_storage.lun0.bootdev",
+ ut_asserteq_str("hub1.p1.usb_mass_storage.lun0.bootdev",
iter.dev_used[3]->name);
ut_assertok(bootdev_get_sibling_blk(iter.dev_used[3], &blk));
- ut_asserteq_str("hub.p1.usb_mass_storage.lun0", blk->name);
+ ut_asserteq_str("hub1.p1.usb_mass_storage.lun0", blk->name);
/* adjust the priority of the first USB bootdev to the highest */
ucp = dev_get_uclass_plat(iter.dev_used[3]);
@@ -366,7 +366,7 @@ static int bootdev_test_prio(struct unit_test_state *uts)
ut_asserteq(-ENODEV, bootflow_scan_next(&iter, &bflow));
ut_asserteq(8, iter.num_devs);
- ut_asserteq_str("hub.p1.usb_mass_storage.lun0.bootdev",
+ ut_asserteq_str("hub1.p1.usb_mass_storage.lun0.bootdev",
iter.dev_used[0]->name);
ut_asserteq_str("mmc2.bootdev", iter.dev_used[1]->name);
@@ -612,7 +612,7 @@ static int bootdev_test_hunt_label(struct unit_test_state
*uts)
test_set_skip_delays(true);
ut_assertok(bootdev_hunt_and_find_by_label("usb", &dev, &mflags));
ut_assertnonnull(dev);
- ut_asserteq_str("hub.p1.usb_mass_storage.lun0.bootdev", dev->name);
+ ut_asserteq_str("hub1.p1.usb_mass_storage.lun0.bootdev", dev->name);
ut_asserteq(BOOTFLOW_METHF_SINGLE_UCLASS, mflags);
ut_assert_nextlinen("Bus usb@1: scanning bus usb@1");
ut_assert_console_end();
diff --git a/test/boot/bootflow.c b/test/boot/bootflow.c
index f1341312dac..cbb5bcc0cf3 100644
--- a/test/boot/bootflow.c
+++ b/test/boot/bootflow.c
@@ -1307,9 +1307,9 @@ static int bootflow_efi(struct unit_test_state *uts)
ut_assert_nextlinen("---");
ut_assert_nextlinen(" 0 extlinux");
ut_assert_nextlinen(
- " 1 efi ready usb_mass_ 1
hub.p2.usb_mass_storage.l /EFI/BOOT/BOOTSBOX.EFI");
+ " 1 efi ready usb_mass_ 1
hub1.p2.usb_mass_storage. /EFI/BOOT/BOOTSBOX.EFI");
ut_assert_nextlinen(
- " 2 extlinux ready usb_mass_ 1
hub.p4.usb_mass_storage.l /extlinux/extlinux.conf");
+ " 2 extlinux ready usb_mass_ 1
hub1.p4.usb_mass_storage. /extlinux/extlinux.conf");
ut_assert_nextlinen("---");
ut_assert_skip_to_line("(3 bootflows, 3 valid)");
ut_assert_console_end();
@@ -1325,7 +1325,7 @@ static int bootflow_efi(struct unit_test_state *uts)
ut_asserteq(1, run_command("bootflow boot", 0));
ut_assert_nextline(
- "** Booting bootflow
'hub.p2.usb_mass_storage.lun0.bootdev.part_1' with efi");
+ "** Booting bootflow
'hub1.p2.usb_mass_storage.lun0.bootdev.part_1' with efi");
if (IS_ENABLED(CONFIG_LOGF_FUNC))
ut_assert_skip_to_line(" efi_run_image() Booting
/\\EFI\\BOOT\\BOOTSBOX.EFI");
else
diff --git a/test/dm/usb.c b/test/dm/usb.c
index d89d436d269..66777b5ef00 100644
--- a/test/dm/usb.c
+++ b/test/dm/usb.c
@@ -109,12 +109,12 @@ static int dm_test_usb_fdt_node(struct unit_test_state
*uts)
state_set_skip_delays(true);
ut_assertok(usb_init());
ut_assertok(uclass_get_device(UCLASS_MASS_STORAGE, 0, &dev));
- node = ofnode_path("/usb@1/hub/usbstor@1");
+ node = ofnode_path("/usb@1/hub1/usbstor@1");
ut_asserteq(1, ofnode_equal(node, dev_ofnode(dev)));
ut_assertok(uclass_get_device(UCLASS_MASS_STORAGE, 1, &dev));
ut_asserteq(1, ofnode_equal(ofnode_null(), dev_ofnode(dev)));
ut_assertok(uclass_get_device(UCLASS_MASS_STORAGE, 2, &dev));
- node = ofnode_path("/usb@1/hub/usbstor@3");
+ node = ofnode_path("/usb@1/hub1/usbstor@3");
ut_asserteq(1, ofnode_equal(node, dev_ofnode(dev)));
ut_assertok(usb_stop());
--
2.43.0
