From 1ca7e2062b4e8c3b211753dcb19c063b5b9b73ca Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Wed, 23 Jul 2014 06:55:18 -0600 Subject: dm: Provide a function to scan child FDT nodes At present only root nodes in the device tree are scanned for devices. But some devices can have children. For example a SPI bus may have several children for each of its chip selects. Add a function which scans subnodes and binds devices for each one. This can be used for the root node scan also, so change it. A device can call this function in its bind() or probe() methods to bind its children. Signed-off-by: Simon Glass --- test/dm/Makefile | 1 + test/dm/bus.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ test/dm/test-fdt.c | 63 ++++++++++++++++++++++++++++++++---------------------- test/dm/test.dts | 16 +++++++++++++- 4 files changed, 117 insertions(+), 26 deletions(-) create mode 100644 test/dm/bus.c (limited to 'test') diff --git a/test/dm/Makefile b/test/dm/Makefile index c0f21351d7..5c2415e3d2 100644 --- a/test/dm/Makefile +++ b/test/dm/Makefile @@ -5,6 +5,7 @@ # obj-$(CONFIG_CMD_DM) += cmd_dm.o +obj-$(CONFIG_DM_TEST) += bus.o obj-$(CONFIG_DM_TEST) += test-driver.o obj-$(CONFIG_DM_TEST) += test-fdt.o obj-$(CONFIG_DM_TEST) += test-main.o diff --git a/test/dm/bus.c b/test/dm/bus.c new file mode 100644 index 0000000000..cfb993440c --- /dev/null +++ b/test/dm/bus.c @@ -0,0 +1,63 @@ +/* + * Copyright (c) 2014 Google, Inc + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include +#include +#include +#include +#include +#include + +DECLARE_GLOBAL_DATA_PTR; + +static int testbus_drv_probe(struct udevice *dev) +{ + return dm_scan_fdt_node(dev, gd->fdt_blob, dev->of_offset, false); +} + +static const struct udevice_id testbus_ids[] = { + { + .compatible = "denx,u-boot-test-bus", + .data = DM_TEST_TYPE_FIRST }, + { } +}; + +U_BOOT_DRIVER(testbus_drv) = { + .name = "testbus_drv", + .of_match = testbus_ids, + .id = UCLASS_TEST_BUS, + .probe = testbus_drv_probe, + .priv_auto_alloc_size = sizeof(struct dm_test_priv), + .platdata_auto_alloc_size = sizeof(struct dm_test_pdata), +}; + +UCLASS_DRIVER(testbus) = { + .name = "testbus", + .id = UCLASS_TEST_BUS, +}; + +/* Test that we can probe for children */ +static int dm_test_bus_children(struct dm_test_state *dms) +{ + int num_devices = 4; + struct udevice *bus; + struct uclass *uc; + + ut_assertok(uclass_get(UCLASS_TEST_FDT, &uc)); + ut_asserteq(num_devices, list_count_items(&uc->dev_head)); + + /* Probe the bus, which should yield 3 more devices */ + ut_assertok(uclass_get_device(UCLASS_TEST_BUS, 0, &bus)); + num_devices += 3; + + ut_assertok(uclass_get(UCLASS_TEST_FDT, &uc)); + ut_asserteq(num_devices, list_count_items(&uc->dev_head)); + + ut_assert(!dm_check_devices(dms, num_devices)); + + return 0; +} +DM_TEST(dm_test_bus_children, DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT); diff --git a/test/dm/test-fdt.c b/test/dm/test-fdt.c index 7980a683b5..cd2c38995e 100644 --- a/test/dm/test-fdt.c +++ b/test/dm/test-fdt.c @@ -91,37 +91,17 @@ UCLASS_DRIVER(testfdt) = { .id = UCLASS_TEST_FDT, }; -/* 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 +124,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 = 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_devices compatible root-level device tree nodes */ + ut_asserteq(num_devices, list_count_items(&uc->dev_head)); + + /* Each should have no platdata / priv */ + 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) @@ -187,7 +198,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); @@ -236,12 +250,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); diff --git a/test/dm/test.dts b/test/dm/test.dts index 60503f1da3..8489595155 100644 --- a/test/dm/test.dts +++ b/test/dm/test.dts @@ -43,14 +43,28 @@ some-bus { #address-cells = <1>; #size-cells = <0>; + compatible = "denx,u-boot-test-bus"; reg = <3>; ping-expect = <4>; ping-add = <4>; - c-test { + c-test@5 { compatible = "denx,u-boot-fdt-test"; reg = <5>; + ping-expect = <5>; ping-add = <5>; }; + c-test@0 { + compatible = "denx,u-boot-fdt-test"; + reg = <0>; + ping-expect = <6>; + ping-add = <6>; + }; + c-test@1 { + compatible = "denx,u-boot-fdt-test"; + reg = <1>; + ping-expect = <7>; + ping-add = <7>; + }; }; d-test { -- cgit v1.2.1