Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 82b2928c authored by Grant Likely's avatar Grant Likely
Browse files

of: merge other miscellaneous prototypes 



Merge common prototypes used by Microblaze and PowerPC

Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Acked-by: default avatarWolfram Sang <w.sang@pengutronix.de>
Acked-by: default avatarMichal Simek <monstr@monstr.eu>
Acked-by: default avatarStephen Neuendorffer <stephen.neuendorffer@xilinx.com>
Acked-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
parent 8482f568

arch/microblaze/include/asm/prom.h

+0 −12
Original line number Diff line number Diff line
@@ -45,19 +45,7 @@ extern void of_attach_node(struct device_node *); 
extern void of_detach_node(struct device_node *);



/* Other Prototypes */

extern void finish_device_tree(void);

extern void unflatten_device_tree(void);

extern int early_uartlite_console(void);

extern void early_init_devtree(void *);

extern int machine_is_compatible(const char *compat);

extern void print_properties(struct device_node *node);

extern int prom_n_intr_cells(struct device_node *np);

extern void prom_get_irq_senses(unsigned char *senses, int off, int max);

extern int prom_add_property(struct device_node *np, struct property *prop);

extern int prom_remove_property(struct device_node *np, struct property *prop);

extern int prom_update_property(struct device_node *np,

				struct property *newprop,

				struct property *oldprop);



extern struct resource *request_OF_resource(struct device_node *node,

				int index, const char *name_postfix);

arch/powerpc/include/asm/prom.h

+0 −14
Original line number Diff line number Diff line
@@ -38,20 +38,6 @@ extern struct device_node *of_chosen; 
extern void of_attach_node(struct device_node *);

extern void of_detach_node(struct device_node *);



/* Other Prototypes */

extern void finish_device_tree(void);

extern void unflatten_device_tree(void);

extern void early_init_devtree(void *);

extern int machine_is_compatible(const char *compat);

extern void print_properties(struct device_node *node);

extern int prom_n_intr_cells(struct device_node* np);

extern void prom_get_irq_senses(unsigned char *senses, int off, int max);

extern int prom_add_property(struct device_node* np, struct property* prop);

extern int prom_remove_property(struct device_node *np, struct property *prop);

extern int prom_update_property(struct device_node *np,

				struct property *newprop,

				struct property *oldprop);



#ifdef CONFIG_PPC32

/*

 * PCI <-> OF matching functions

include/linux/of_fdt.h

+14 −0
Original line number Diff line number Diff line
@@ -68,5 +68,19 @@ extern int __init of_flat_dt_is_compatible(unsigned long node, 
					   const char *name);

extern unsigned long __init of_get_flat_dt_root(void);



/* Other Prototypes */

extern void finish_device_tree(void);

extern void unflatten_device_tree(void);

extern void early_init_devtree(void *);

extern int machine_is_compatible(const char *compat);

extern void print_properties(struct device_node *node);

extern int prom_n_intr_cells(struct device_node* np);

extern void prom_get_irq_senses(unsigned char *senses, int off, int max);

extern int prom_add_property(struct device_node* np, struct property* prop);

extern int prom_remove_property(struct device_node *np, struct property *prop);

extern int prom_update_property(struct device_node *np,

				struct property *newprop,

				struct property *oldprop);



#endif /* __ASSEMBLY__ */

#endif /* _LINUX_OF_FDT_H */