qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UPSTREAM: 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>
Change-Id: I892142d611ab5068d4ec6bdb51666a673b679794
Signed-off-by: Mario Six <mario.six@gdsys.cc>
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
(cherry picked from commit 29d11b8838bb2aa324b8873159cbd7088870a75b)
This commit is contained in:
Mario Six 2018-01-15 11:07:20 +01:00 committed by Kever Yang
parent 822b9c09c1
commit 18aa8da9a4
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/core/device.c
View File

@ -17,6 +17,7 @@
#include <dm/device.h> #include <dm/device.h>
#include <dm/device-internal.h> #include <dm/device-internal.h>
#include <dm/lists.h> #include <dm/lists.h>
#include <dm/of_access.h>
#include <dm/pinctrl.h> #include <dm/pinctrl.h>
#include <dm/platdata.h> #include <dm/platdata.h>
#include <dm/read.h> #include <dm/read.h>
@ -712,8 +713,12 @@ int device_set_name(struct udevice *dev, const char *name)
bool device_is_compatible(struct udevice *dev, const char *compat) bool device_is_compatible(struct udevice *dev, const char *compat)
{ {
const void *fdt = gd->fdt_blob; 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) bool of_machine_is_compatible(const char *compat)