diff options
| author | Tom Rini <[email protected]> | 2022-06-07 12:21:57 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2022-06-07 12:21:57 -0400 |
| commit | ed1cbbe2afe4d4c7c25316db4c2e15c4c579fc4e (patch) | |
| tree | a8315fd7fca59a0cff90ba0343d73c3f15e18c50 /drivers/core | |
| parent | 41e47b420d6b122f6eb21e6e4438b334cc983eb1 (diff) | |
| parent | b62450cf229c50ad2ce819dd02a09726909cc89a (diff) | |
Merge branch '2022-06-07-assorted-improvements' into next
- A wide ranging set of minor clean-ups and improvements
Diffstat (limited to 'drivers/core')
| -rw-r--r-- | drivers/core/Kconfig | 3 | ||||
| -rw-r--r-- | drivers/core/device.c | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/drivers/core/Kconfig b/drivers/core/Kconfig index 27d6578772a..9b9a7148a1a 100644 --- a/drivers/core/Kconfig +++ b/drivers/core/Kconfig @@ -89,8 +89,7 @@ config DM_DEVICE_REMOVE config DM_EVENT bool "Support events with driver model" - depends on DM - imply EVENT + depends on DM && EVENT default y if SANDBOX help This enables support for generating events related to driver model diff --git a/drivers/core/device.c b/drivers/core/device.c index 3ab2583df38..3199d6a1b73 100644 --- a/drivers/core/device.c +++ b/drivers/core/device.c @@ -1125,9 +1125,7 @@ bool device_is_compatible(const struct udevice *dev, const char *compat) bool of_machine_is_compatible(const char *compat) { - const void *fdt = gd->fdt_blob; - - return !fdt_node_check_compatible(fdt, 0, compat); + return ofnode_device_is_compatible(ofnode_root(), compat); } int dev_disable_by_path(const char *path) |