diff options
| author | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2018-03-04 14:33:50 +0300 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2018-03-07 18:59:20 +0300 |
| commit | 94aae1d9ff2eb05003f3c8043a3d7e5f2314a989 (patch) | |
| tree | 27b18d4b55be3141a36b6958ca6c9849532e17d7 /include/linux | |
| parent | f073d78eeb8efd85718e611c15f9a78647751dea (diff) | |
| parent | e547c0031697a0cb5ff7f4a66754fb3e082754ff (diff) | |
| download | linux-94aae1d9ff2eb05003f3c8043a3d7e5f2314a989.tar.xz | |
Merge tag 'overlay_apply_fdt_v7-for-4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/frowand/linux into drm/next/du
- DT overlay applying rework (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')
| -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 da1ee95241c1..ebf22dd0860c 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -1359,8 +1359,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); @@ -1369,7 +1369,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; } |