| Message ID | 20180115100720.20298-4-mario.six@gdsys.cc |
|---|---|
| State | Accepted |
| Delegated to: | Simon Glass |
| Headers | show |
| Series | None | expand |
On 15 January 2018 at 03:07, Mario Six <mario.six@gdsys.cc> wrote: > 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> > --- > > v1 -> v2: > None > > --- > drivers/core/device.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) Applied to u-boot-dm, thanks!
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)