diff options
| author | Tom Rini <trini@konsulko.com> | 2021-03-26 12:15:26 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-03-26 12:15:26 -0400 |
| commit | 9c7335e4e68355a96bd5a411b2a5f85866823c58 (patch) | |
| tree | cbe17eb256a5e8078a1bd7793592ebd2de1470a5 /drivers/misc | |
| parent | 4be994b0e1f006c271e0791a60b6363137542090 (diff) | |
| parent | fcae6682a7929abf88d9f0b756f9d5f9725e4d14 (diff) | |
| download | u-boot-9c7335e4e68355a96bd5a411b2a5f85866823c58.zip u-boot-9c7335e4e68355a96bd5a411b2a5f85866823c58.tar.gz u-boot-9c7335e4e68355a96bd5a411b2a5f85866823c58.tar.bz2 | |
Merge tag 'dm-pull-26mar21-take2' of git://git.denx.de/u-boot-dm into nextWIP/26Mar2021-next
dtoc support for of-platdata-inst
driver model support for of-platdata-inst
support of-platdata-inst on x86 / coral
binman support for exapanded entries
binman convert docs to reST
ti-sysc fix for duplicate uclass driver
patman minor improvements
pylibfdt build only if needed
correct obscure CI error with OF_PLATDATA_INST
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/irq-uclass.c | 2 | ||||
| -rw-r--r-- | drivers/misc/test_drv.c | 11 |
2 files changed, 10 insertions, 3 deletions
diff --git a/drivers/misc/irq-uclass.c b/drivers/misc/irq-uclass.c index 24b2796..3aa26f6 100644 --- a/drivers/misc/irq-uclass.c +++ b/drivers/misc/irq-uclass.c @@ -69,7 +69,7 @@ int irq_get_by_driver_info(struct udevice *dev, { int ret; - ret = device_get_by_driver_info_idx(cells->idx, &irq->dev); + ret = device_get_by_ofplat_idx(cells->idx, &irq->dev); if (ret) return ret; irq->id = cells->arg[0]; diff --git a/drivers/misc/test_drv.c b/drivers/misc/test_drv.c index 827a50e..5d72982 100644 --- a/drivers/misc/test_drv.c +++ b/drivers/misc/test_drv.c @@ -86,7 +86,7 @@ static const struct udevice_id testbus_ids[] = { { } }; -U_BOOT_DRIVER(testbus_drv) = { +U_BOOT_DRIVER(denx_u_boot_test_bus) = { .name = "testbus_drv", .of_match = testbus_ids, .id = UCLASS_TEST_BUS, @@ -98,6 +98,7 @@ U_BOOT_DRIVER(testbus_drv) = { .per_child_plat_auto = sizeof(struct dm_test_parent_plat), .child_pre_probe = testbus_child_pre_probe, .child_post_remove = testbus_child_post_remove, + DM_HEADER(<test.h>) }; UCLASS_DRIVER(testbus) = { @@ -106,6 +107,9 @@ UCLASS_DRIVER(testbus) = { .flags = DM_UC_FLAG_SEQ_ALIAS, .child_pre_probe = testbus_child_pre_probe_uclass, .child_post_probe = testbus_child_post_probe_uclass, + + /* This is for dtoc testing only */ + .per_device_plat_auto = sizeof(struct dm_test_uclass_priv), }; static int testfdt_drv_ping(struct udevice *dev, int pingval, int *pingret) @@ -160,7 +164,9 @@ static const struct udevice_id testfdt_ids[] = { { } }; -U_BOOT_DRIVER(testfdt_drv) = { +DM_DRIVER_ALIAS(denx_u_boot_fdt_test, google_another_fdt_test) + +U_BOOT_DRIVER(denx_u_boot_fdt_test) = { .name = "testfdt_drv", .of_match = testfdt_ids, .id = UCLASS_TEST_FDT, @@ -203,6 +209,7 @@ UCLASS_DRIVER(testfdt) = { .name = "testfdt", .id = UCLASS_TEST_FDT, .flags = DM_UC_FLAG_SEQ_ALIAS, + .priv_auto = sizeof(struct dm_test_uc_priv), }; static const struct udevice_id testfdtm_ids[] = { |