openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

of/flattree: merge dt_mem_next_cell 

Merge common code between PowerPC and Microblaze

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Tested-by: Wolfram Sang <w.sang@pengutronix.de>
This commit is contained in:
Grant Likely 2009-11-24 03:37:56 -07:00
parent f00abd9491
commit 83f7a06eb4
4 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/microblaze/kernel/prom.c
View File

@ -155,14 +155,6 @@ static int __init early_init_dt_scan_chosen(unsigned long node,
return 1; 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, static int __init early_init_dt_scan_memory(unsigned long node,
const char *uname, int depth, void *data) const char *uname, int depth, void *data)
{ {

8
arch/powerpc/kernel/prom.c
View File

@ -432,14 +432,6 @@ static int __init early_init_dt_scan_chosen(unsigned long node,
return 1; 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 #ifdef CONFIG_PPC_PSERIES
/* /*
* Interpret the ibm,dynamic-memory property in the * Interpret the ibm,dynamic-memory property in the

8
drivers/of/fdt.c
View File

@ -432,6 +432,14 @@ int __init early_init_dt_scan_root(unsigned long node, const char *uname,
return 1; 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 * unflatten_device_tree - create tree of device_nodes from flat blob
* *

1
include/linux/of_fdt.h
View File

@ -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 int of_flat_dt_is_compatible(unsigned long node, const char *name);
extern unsigned long of_get_flat_dt_root(void); extern unsigned long of_get_flat_dt_root(void);
extern void early_init_dt_check_for_initrd(unsigned long node); 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 */ /* Early flat tree scan hooks */
extern int early_init_dt_scan_root(unsigned long node, const char *uname, extern int early_init_dt_scan_root(unsigned long node, const char *uname,