diff mbox series

[12/18] dm: core: Only include simple-bus devicetree id when needed

Message ID 20201216152506.119900-8-sjg@chromium.org
State Superseded
Delegated to: Simon Glass
Headers show
Series dm: Preparation for enhanced of-platdata | expand

Commit Message

Simon Glass Dec. 16, 2020, 3:25 p.m. UTC 
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 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
diff mbox series

Patch

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,
 };