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()."
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
Reference in New Issue
Block a user