diff options
| author | Mario Six <mario.six@gdsys.cc> | 2018-01-15 11:07:20 +0100 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2018-01-21 10:01:02 -0700 |
| commit | 29d11b8838bb2aa324b8873159cbd7088870a75b (patch) | |
| tree | 983f741df02aed97f33a814124dbc796d5eedbd4 | |
| parent | 147c6074482ed57fe43348ce15fc3dbc3e2c9db7 (diff) | |
core: Make device_is_compatible live-tree compatible
Judging from its name and parameters, device_is_compatible looks like it
is compatible with a live device tree, but it actually isn't.
Make it compatible with a live device tree.
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Mario Six <mario.six@gdsys.cc>
| -rw-r--r-- | drivers/core/device.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/core/device.c b/drivers/core/device.c index 9a46a7bbe5..144ac2a991 100644 --- a/drivers/core/device.c +++ b/drivers/core/device.c @@ -17,6 +17,7 @@ #include <dm/device.h> #include <dm/device-internal.h> #include <dm/lists.h> +#include <dm/of_access.h> #include <dm/pinctrl.h> #include <dm/platdata.h> #include <dm/read.h> @@ -703,8 +704,12 @@ int device_set_name(struct udevice *dev, const char *name) bool device_is_compatible(struct udevice *dev, const char *compat) { const void *fdt = gd->fdt_blob; + ofnode node = dev_ofnode(dev); - return !fdt_node_check_compatible(fdt, dev_of_offset(dev), compat); + if (ofnode_is_np(node)) + return of_device_is_compatible(ofnode_to_np(node), compat, NULL, NULL); + else + return !fdt_node_check_compatible(fdt, ofnode_to_offset(node), compat); } bool of_machine_is_compatible(const char *compat) |