diff options
| author | Rob Herring <robh@kernel.org> | 2018-03-05 13:29:46 -0600 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2018-03-05 13:29:46 -0600 |
| commit | b46c78661c42cb8b07eb213104c79cbab8ea7e0d (patch) | |
| tree | 332c5b04b1d8c64831780b2188833720b4f3c1ac /drivers/of/resolver.c | |
| parent | c11e6f0f04dbc5e0384e7d530b024b2e3ae4bb17 (diff) | |
| parent | e547c0031697a0cb5ff7f4a66754fb3e082754ff (diff) | |
| download | op-kernel-dev-b46c78661c42cb8b07eb213104c79cbab8ea7e0d.zip op-kernel-dev-b46c78661c42cb8b07eb213104c79cbab8ea7e0d.tar.gz | |
Merge tag 'overlay_apply_fdt_v7-for-4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/frowand/linux into dt/next
DT overlay applying rework from Frank Rowand:
"Move duplicating and unflattening of an overlay flattened devicetree
(FDT) into the overlay application code. To accomplish this,
of_overlay_apply() is replaced by of_overlay_fdt_apply()."
Diffstat (limited to 'drivers/of/resolver.c')
| -rw-r--r-- | drivers/of/resolver.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/of/resolver.c b/drivers/of/resolver.c index 740d19b..b2f6451 100644 --- a/drivers/of/resolver.c +++ b/drivers/of/resolver.c @@ -269,17 +269,11 @@ int of_resolve_phandles(struct device_node *overlay) goto out; } -#if 0 - Temporarily disable check so that old style overlay unittests - do not fail when of_resolve_phandles() is moved into - of_overlay_apply(). - if (!of_node_check_flag(overlay, OF_DETACHED)) { pr_err("overlay not detached\n"); err = -EINVAL; goto out; } -#endif phandle_delta = live_tree_max_phandle() + 1; adjust_overlay_phandles(overlay, phandle_delta); |
