aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/prom.c
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2009-11-24 05:27:10 -0500
committerGrant Likely <grant.likely@secretlab.ca>2009-12-10 17:23:15 -0500
commitf00abd94918c9780f9d2d961fc0e419c11457922 (patch)
tree47238d5fbfa609ecbf54edf3092eade902aa9ec6 /arch/powerpc/kernel/prom.c
parentf7b3a8355ba6cad251297844a0bdd08898ea36e0 (diff)
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 'arch/powerpc/kernel/prom.c')
-rw-r--r--arch/powerpc/kernel/prom.c24
1 files changed, 0 insertions, 24 deletions
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index 1ecd6c6ecabd..78f65a4d8b03 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -61,10 +61,6 @@
61#define DBG(fmt...) 61#define DBG(fmt...)
62#endif 62#endif
63 63
64
65static int __initdata dt_root_addr_cells;
66static int __initdata dt_root_size_cells;
67
68#ifdef CONFIG_PPC64 64#ifdef CONFIG_PPC64
69int __initdata iommu_is_off; 65int __initdata iommu_is_off;
70int __initdata iommu_force_on; 66int __initdata iommu_force_on;
@@ -436,26 +432,6 @@ static int __init early_init_dt_scan_chosen(unsigned long node,
436 return 1; 432 return 1;
437} 433}
438 434
439static int __init early_init_dt_scan_root(unsigned long node,
440 const char *uname, int depth, void *data)
441{
442 u32 *prop;
443
444 if (depth != 0)
445 return 0;
446
447 prop = of_get_flat_dt_prop(node, "#size-cells", NULL);
448 dt_root_size_cells = (prop == NULL) ? 1 : *prop;
449 DBG("dt_root_size_cells = %x\n", dt_root_size_cells);
450
451 prop = of_get_flat_dt_prop(node, "#address-cells", NULL);
452 dt_root_addr_cells = (prop == NULL) ? 2 : *prop;
453 DBG("dt_root_addr_cells = %x\n", dt_root_addr_cells);
454
455 /* break now */
456 return 1;
457}
458
459static u64 __init dt_mem_next_cell(int s, cell_t **cellp) 435static u64 __init dt_mem_next_cell(int s, cell_t **cellp)
460{ 436{
461 cell_t *p = *cellp; 437 cell_t *p = *cellp;