diff options
| author | Simon Glass <sjg@chromium.org> | 2017-05-17 17:18:10 -0600 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2017-06-01 07:03:04 -0600 |
| commit | 4984de2baaaf82bfc9416e9cdbd3040b97856950 (patch) | |
| tree | a3922476dddd7da5aae226a8eb5c16fc405bcca1 /drivers/core | |
| parent | da409ccc4ae62a0bf7111e2f4419fdbfd1ba3d89 (diff) | |
| download | u-boot-4984de2baaaf82bfc9416e9cdbd3040b97856950.tar.gz | |
dm: core: Add ofnode to represent device tree nodes
With live tree we need a struct device_node * to reference a node. With
the existing flat tree, we need an int offset. We need to unify these into
a single value which can represent both.
Add an ofnode union for this and adjust existing code to move to this.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'drivers/core')
| -rw-r--r-- | drivers/core/device.c | 2 | ||||
| -rw-r--r-- | drivers/core/root.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/core/device.c b/drivers/core/device.c index 483f8368f7..2738685092 100644 --- a/drivers/core/device.c +++ b/drivers/core/device.c @@ -60,7 +60,7 @@ static int device_bind_common(struct udevice *parent, const struct driver *drv, dev->platdata = platdata; dev->driver_data = driver_data; dev->name = name; - dev->of_offset = of_offset; + dev->node = offset_to_ofnode(of_offset); dev->parent = parent; dev->driver = drv; dev->uclass = uc; diff --git a/drivers/core/root.c b/drivers/core/root.c index 4bb71f3cac..570b4d855f 100644 --- a/drivers/core/root.c +++ b/drivers/core/root.c @@ -167,7 +167,7 @@ int dm_init(void) if (ret) return ret; #if CONFIG_IS_ENABLED(OF_CONTROL) - DM_ROOT_NON_CONST->of_offset = 0; + DM_ROOT_NON_CONST->node = offset_to_ofnode(0); #endif ret = device_probe(DM_ROOT_NON_CONST); if (ret) |