Message ID | 20201223023030.2023937-8-sjg@chromium.org |
---|---|
State | Accepted |
Commit | 79ea8f749d6cf779706f297fa2ffbc8f384c57de |
Delegated to: | Simon Glass |
Headers | show |
Series | dm: Preparation for enhanced of-platdata | expand |
This is not needed when of-platdata is in use. Update it.
Signed-off-by: Simon Glass <sjg@chromium.org>
---
(no changes since v1)
drivers/core/simple-bus.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
Applied to u-boot-dm/next, thanks!
diff --git a/drivers/core/simple-bus.c b/drivers/core/simple-bus.c index c45212a0d3a..7dbcbecd948 100644 --- a/drivers/core/simple-bus.c +++ b/drivers/core/simple-bus.c @@ -50,15 +50,17 @@ UCLASS_DRIVER(simple_bus) = { .per_device_plat_auto = sizeof(struct simple_bus_plat), }; +#if !CONFIG_IS_ENABLED(OF_PLATDATA) static const struct udevice_id generic_simple_bus_ids[] = { { .compatible = "simple-bus" }, { .compatible = "simple-mfd" }, { } }; +#endif U_BOOT_DRIVER(simple_bus) = { .name = "simple_bus", .id = UCLASS_SIMPLE_BUS, - .of_match = generic_simple_bus_ids, + .of_match = of_match_ptr(generic_simple_bus_ids), .flags = DM_FLAG_PRE_RELOC, };
This is not needed when of-platdata is in use. Update it. Signed-off-by: Simon Glass <sjg@chromium.org> --- (no changes since v1) drivers/core/simple-bus.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)