Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-11 22:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

of/flattree: Merge earlyinit_dt_scan_root()

Browse Source 
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:27:10 -07:00
parent f7b3a8355b
commit f00abd9491
4 changed files with 32 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,9 +42,6 @@
#include <asm/sections.h>
#include <asm/pci-bridge.h>
static int __initdata dt_root_addr_cells;
static int __initdata dt_root_size_cells;
typedef u32 cell_t;
/* export that to outside world */
@ -158,26 +155,6 @@ static int __init early_init_dt_scan_chosen(unsigned long node,
return 1;
}
static int __init early_init_dt_scan_root(unsigned long node,
const char *uname, int depth, void *data)
{
u32 *prop;
if (depth != 0)
return 0;
prop = of_get_flat_dt_prop(node, "#size-cells", NULL);
dt_root_size_cells = (prop == NULL) ? 1 : *prop;
pr_debug("dt_root_size_cells = %x\n", dt_root_size_cells);
prop = of_get_flat_dt_prop(node, "#address-cells", NULL);
dt_root_addr_cells = (prop == NULL) ? 2 : *prop;
pr_debug("dt_root_addr_cells = %x\n", dt_root_addr_cells);
/* break now */
return 1;
}
static u64 __init dt_mem_next_cell(int s, cell_t **cellp)
{
cell_t *p = *cellp;

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

@ -61,10 +61,6 @@
#define DBG(fmt...)
#endif
static int __initdata dt_root_addr_cells;
static int __initdata dt_root_size_cells;
#ifdef CONFIG_PPC64
int __initdata iommu_is_off;
int __initdata iommu_force_on;
@ -436,26 +432,6 @@ static int __init early_init_dt_scan_chosen(unsigned long node,
return 1;
}
static int __init early_init_dt_scan_root(unsigned long node,
const char *uname, int depth, void *data)
{
u32 *prop;
if (depth != 0)
return 0;
prop = of_get_flat_dt_prop(node, "#size-cells", NULL);
dt_root_size_cells = (prop == NULL) ? 1 : *prop;
DBG("dt_root_size_cells = %x\n", dt_root_size_cells);
prop = of_get_flat_dt_prop(node, "#address-cells", NULL);
dt_root_addr_cells = (prop == NULL) ? 2 : *prop;
DBG("dt_root_addr_cells = %x\n", dt_root_addr_cells);
/* break now */
return 1;
}
static u64 __init dt_mem_next_cell(int s, cell_t **cellp)
{
cell_t *p = *cellp;

26
drivers/of/fdt.c
View File

@ -15,6 +15,9 @@
#include <linux/of.h>
#include <linux/of_fdt.h>
int __initdata dt_root_addr_cells;
int __initdata dt_root_size_cells;
struct boot_param_header *initial_boot_params;
char *find_flat_dt_string(u32 offset)
@ -406,6 +409,29 @@ inline void early_init_dt_check_for_initrd(unsigned long node)
}
#endif /* CONFIG_BLK_DEV_INITRD */
/**
* early_init_dt_scan_root - fetch the top level address and size cells
*/
int __init early_init_dt_scan_root(unsigned long node, const char *uname,
int depth, void *data)
{
u32 *prop;
if (depth != 0)
return 0;
prop = of_get_flat_dt_prop(node, "#size-cells", NULL);
dt_root_size_cells = (prop == NULL) ? 1 : *prop;
pr_debug("dt_root_size_cells = %x\n", dt_root_size_cells);
prop = of_get_flat_dt_prop(node, "#address-cells", NULL);
dt_root_addr_cells = (prop == NULL) ? 2 : *prop;
pr_debug("dt_root_addr_cells = %x\n", dt_root_addr_cells);
/* break now */
return 1;
}
/**
* unflatten_device_tree - create tree of device_nodes from flat blob
*

6
include/linux/of_fdt.h
View File

@ -58,6 +58,8 @@ struct boot_param_header {
};
/* TBD: Temporary export of fdt globals - remove when code fully merged */
extern int __initdata dt_root_addr_cells;
extern int __initdata dt_root_size_cells;
extern struct boot_param_header *initial_boot_params;
/* For scanning the flat device-tree at boot time */
@ -71,6 +73,10 @@ 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);
/* Early flat tree scan hooks */
extern int early_init_dt_scan_root(unsigned long node, const char *uname,
int depth, void *data);
/* Other Prototypes */
extern void finish_device_tree(void);
extern void unflatten_device_tree(void);