GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-04-14 10:21:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

dm: core: Adjust device_bind_common() to take an ofnode

Browse source 
This core function will need to work with a live tree also. Update it to
accept an ofnode instead of an offset.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2017-05-17 17:18:11 -06:00
parent 4984de2baa
commit 7a61b0b58f
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
drivers/core/device.c
View file

@ -29,7 +29,7 @@ DECLARE_GLOBAL_DATA_PTR;
static int device_bind_common(struct udevice *parent, const struct driver *drv, static int device_bind_common(struct udevice *parent, const struct driver *drv,
const char *name, void *platdata, const char *name, void *platdata,
ulong driver_data, int of_offset, ulong driver_data, ofnode node,
uint of_platdata_size, struct udevice **devp) uint of_platdata_size, struct udevice **devp)
{ {
struct udevice *dev; struct udevice *dev;
@ -60,7 +60,7 @@ static int device_bind_common(struct udevice *parent, const struct driver *drv,
dev->platdata = platdata; dev->platdata = platdata;
dev->driver_data = driver_data; dev->driver_data = driver_data;
dev->name = name; dev->name = name;
dev->node = offset_to_ofnode(of_offset); dev->node = node;
dev->parent = parent; dev->parent = parent;
dev->driver = drv; dev->driver = drv;
dev->uclass = uc; dev->uclass = uc;
@ -76,9 +76,10 @@ static int device_bind_common(struct udevice *parent, const struct driver *drv,
* resolved (and ->seq updated) when the device is probed. * resolved (and ->seq updated) when the device is probed.
*/ */
if (uc->uc_drv->flags & DM_UC_FLAG_SEQ_ALIAS) { if (uc->uc_drv->flags & DM_UC_FLAG_SEQ_ALIAS) {
if (uc->uc_drv->name && of_offset != -1) { if (uc->uc_drv->name && ofnode_valid(node)) {
fdtdec_get_alias_seq(gd->fdt_blob, fdtdec_get_alias_seq(gd->fdt_blob,
uc->uc_drv->name, of_offset, uc->uc_drv->name,
ofnode_to_offset(node),
&dev->req_seq); &dev->req_seq);
} }
} }
@ -219,15 +220,15 @@ int device_bind_with_driver_data(struct udevice *parent,
struct udevice **devp) struct udevice **devp)
{ {
return device_bind_common(parent, drv, name, NULL, driver_data, return device_bind_common(parent, drv, name, NULL, driver_data,
of_offset, 0, devp); offset_to_ofnode(of_offset), 0, devp);
} }
int device_bind(struct udevice *parent, const struct driver *drv, int device_bind(struct udevice *parent, const struct driver *drv,
const char *name, void *platdata, int of_offset, const char *name, void *platdata, int of_offset,
struct udevice **devp) struct udevice **devp)
{ {
return device_bind_common(parent, drv, name, platdata, 0, of_offset, 0, return device_bind_common(parent, drv, name, platdata, 0,
devp); offset_to_ofnode(of_offset), 0, devp);
} }
int device_bind_by_name(struct udevice *parent, bool pre_reloc_only, int device_bind_by_name(struct udevice *parent, bool pre_reloc_only,
@ -246,7 +247,8 @@ int device_bind_by_name(struct udevice *parent, bool pre_reloc_only,
platdata_size = info->platdata_size; platdata_size = info->platdata_size;
#endif #endif
return device_bind_common(parent, drv, info->name, return device_bind_common(parent, drv, info->name,
(void *)info->platdata, 0, -1, platdata_size, devp); (void *)info->platdata, 0, offset_to_ofnode(-1),
platdata_size, devp);
} }
static void *alloc_priv(int size, uint flags) static void *alloc_priv(int size, uint flags)