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

Commit 83f7a06e authored by Grant Likely's avatar Grant Likely
Browse files

of/flattree: merge dt_mem_next_cell 



Merge common code between PowerPC and Microblaze

Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Acked-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tested-by: default avatarWolfram Sang <w.sang@pengutronix.de>
parent f00abd94

arch/microblaze/kernel/prom.c

+0 −8
Original line number Diff line number Diff line
@@ -155,14 +155,6 @@ static int __init early_init_dt_scan_chosen(unsigned long node, 
	return 1;

}



static u64 __init dt_mem_next_cell(int s, cell_t **cellp)

{

	cell_t *p = *cellp;



	*cellp = p + s;

	return of_read_number(p, s);

}



static int __init early_init_dt_scan_memory(unsigned long node,

				const char *uname, int depth, void *data)

{

arch/powerpc/kernel/prom.c

+0 −8
Original line number Diff line number Diff line
@@ -432,14 +432,6 @@ static int __init early_init_dt_scan_chosen(unsigned long node, 
	return 1;

}



static u64 __init dt_mem_next_cell(int s, cell_t **cellp)

{

	cell_t *p = *cellp;



	*cellp = p + s;

	return of_read_number(p, s);

}



#ifdef CONFIG_PPC_PSERIES

/*

 * Interpret the ibm,dynamic-memory property in the

drivers/of/fdt.c

+8 −0
Original line number Diff line number Diff line
@@ -432,6 +432,14 @@ int __init early_init_dt_scan_root(unsigned long node, const char *uname, 
	return 1;

}



u64 __init dt_mem_next_cell(int s, u32 **cellp)

{

	u32 *p = *cellp;



	*cellp = p + s;

	return of_read_number(p, s);

}



/**

 * unflatten_device_tree - create tree of device_nodes from flat blob

 *

include/linux/of_fdt.h

+1 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ extern void *of_get_flat_dt_prop(unsigned long node, const char *name, 
extern int of_flat_dt_is_compatible(unsigned long node, const char *name);

extern unsigned long of_get_flat_dt_root(void);

extern void early_init_dt_check_for_initrd(unsigned long node);

extern u64 dt_mem_next_cell(int s, u32 **cellp);



/* Early flat tree scan hooks */

extern int early_init_dt_scan_root(unsigned long node, const char *uname,