diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2009-11-24 03:27:10 -0700 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2009-12-10 15:23:15 -0700 |
| commit | f00abd94918c9780f9d2d961fc0e419c11457922 (patch) | |
| tree | 47238d5fbfa609ecbf54edf3092eade902aa9ec6 /drivers/of | |
| parent | f7b3a8355ba6cad251297844a0bdd08898ea36e0 (diff) | |
| download | kernel_goldelico_gta04-f00abd94918c9780f9d2d961fc0e419c11457922.zip kernel_goldelico_gta04-f00abd94918c9780f9d2d961fc0e419c11457922.tar.gz kernel_goldelico_gta04-f00abd94918c9780f9d2d961fc0e419c11457922.tar.bz2 | |
of/flattree: Merge earlyinit_dt_scan_root()
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>
Diffstat (limited to 'drivers/of')
| -rw-r--r-- | drivers/of/fdt.c | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index 6ad98e8..be200be 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -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) @@ -407,6 +410,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 * * unflattens the device-tree passed by the firmware, creating the |