diff options
| author |   Luca Boccassi <luca.boccassi@gmail.com> | 2018-09-03 10:48:52 +0100 |
|---|---|---|
| committer | Luca Boccassi <luca.boccassi@gmail.com> | 2018-09-03 10:49:31 +0100 |
| commit | cbcf3d44176009673fbcd7d15671bef56c021f6b (patch) | |
| tree | 03ac41bbf9f5f9f238e62de84d43dcce721b8dab /drivers/bus/dpaa/base/fman/of.c | |
| parent | 1d9284040a0ba38d86e6eeffdb25f36eeb7a44e1 (diff) | |
| parent | 6e7cbd63706f3435b9d9a2057a37db1da01db9a7 (diff) | |
Merge branch 'upstream-17.11-stable' into 17.11.x
Change-Id: Id5d87fa34325cf80217a1f633c9dc1808e931af8
Signed-off-by: Luca Boccassi <luca.boccassi@gmail.com>
Diffstat (limited to 'drivers/bus/dpaa/base/fman/of.c')
| -rw-r--r-- | drivers/bus/dpaa/base/fman/of.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/bus/dpaa/base/fman/of.c b/drivers/bus/dpaa/base/fman/of.c index b2d7c020..cada4124 100644 --- a/drivers/bus/dpaa/base/fman/of.c +++ b/drivers/bus/dpaa/base/fman/of.c @@ -215,6 +215,11 @@ linear_dir(struct dt_dir *d) DPAA_BUS_LOG(DEBUG, "Duplicate lphandle in %s", d->node.node.full_name); d->lphandle = f; + } else if (!strcmp(f->node.node.name, "phandle")) { + if (d->lphandle) + DPAA_BUS_LOG(DEBUG, "Duplicate lphandle in %s", + d->node.node.full_name); + d->lphandle = f; } else if (!strcmp(f->node.node.name, "#address-cells")) { if (d->a_cells) DPAA_BUS_LOG(DEBUG, "Duplicate a_cells in %s", |