diff options
author | Tom Rini <trini@konsulko.com> | 2019-09-07 13:49:39 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2019-09-07 13:49:39 -0400 |
commit | 2f760735c170c854ffca76be5607cec5c56fdc4f (patch) | |
tree | 50cfd63bf25f0106c0ffa622cd4c9285dc36fc31 /drivers/core/device.c | |
parent | ba83753289f5ad99f64e72fd0ee141c647aeda0f (diff) | |
parent | eaae4ee2bd349797a69f74240abd8329e18d5dbd (diff) |
Merge branch 'master' of git://git.denx.de/u-boot-sh
- Initial DM conversion
Diffstat (limited to 'drivers/core/device.c')
-rw-r--r-- | drivers/core/device.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/core/device.c b/drivers/core/device.c index 474c1642ee..05dadf98f9 100644 --- a/drivers/core/device.c +++ b/drivers/core/device.c @@ -526,6 +526,7 @@ static int device_get_device_tail(struct udevice *dev, int ret, return 0; } +#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) /** * device_find_by_ofnode() - Return device associated with given ofnode * @@ -552,6 +553,7 @@ static int device_find_by_ofnode(ofnode node, struct udevice **devp) return -ENODEV; } +#endif int device_get_child(struct udevice *parent, int index, struct udevice **devp) { @@ -817,6 +819,7 @@ int device_set_name(struct udevice *dev, const char *name) return 0; } +#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA) bool device_is_compatible(struct udevice *dev, const char *compat) { return ofnode_device_is_compatible(dev_ofnode(dev), compat); @@ -879,3 +882,4 @@ int dev_enable_by_path(const char *path) return lists_bind_fdt(parent, node, NULL, false); } +#endif |