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 /include/linux/of.h | |
| parent | c11e6f0f04dbc5e0384e7d530b024b2e3ae4bb17 (diff) | |
| parent | e547c0031697a0cb5ff7f4a66754fb3e082754ff (diff) | |
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 'include/linux/of.h')
| -rw-r--r-- | include/linux/of.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/of.h b/include/linux/of.h index 7258bbc85e4e..4d25e4f952d9 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -1371,8 +1371,8 @@ struct of_overlay_notify_data { #ifdef CONFIG_OF_OVERLAY -/* ID based overlays; the API for external users */ -int of_overlay_apply(struct device_node *tree, int *ovcs_id); +int of_overlay_fdt_apply(const void *overlay_fdt, u32 overlay_fdt_size, + int *ovcs_id); int of_overlay_remove(int *ovcs_id); int of_overlay_remove_all(void); @@ -1381,7 +1381,7 @@ int of_overlay_notifier_unregister(struct notifier_block *nb); #else -static inline int of_overlay_apply(struct device_node *tree, int *ovcs_id) +static inline int of_overlay_fdt_apply(void *overlay_fdt, int *ovcs_id) { return -ENOTSUPP; } |