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>
master
Mario Six 7 years ago committed by Simon Glass
parent 147c607448
commit 29d11b8838
  1. 7
      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)

Loading…
Cancel
Save