]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
dm: core: Only include simple-bus devicetree id when needed
authorSimon Glass <sjg@chromium.org>
Wed, 23 Dec 2020 02:30:24 +0000 (19:30 -0700)
committerSimon Glass <sjg@chromium.org>
Tue, 5 Jan 2021 19:24:40 +0000 (12:24 -0700)
This is not needed when of-platdata is in use. Update it.

Signed-off-by: Simon Glass <sjg@chromium.org>
drivers/core/simple-bus.c

index c45212a0d3a3724413e365e2be08726d38aa2c70..7dbcbecd94808a4c83990ce8fefe30aa88ea8225 100644 (file)
@@ -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,
 };