diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2009-11-24 05:27:10 -0500 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2009-12-10 17:23:15 -0500 |
commit | f00abd94918c9780f9d2d961fc0e419c11457922 (patch) | |
tree | 47238d5fbfa609ecbf54edf3092eade902aa9ec6 /arch/microblaze | |
parent | f7b3a8355ba6cad251297844a0bdd08898ea36e0 (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/microblaze')
-rw-r--r-- | arch/microblaze/kernel/prom.c | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/arch/microblaze/kernel/prom.c b/arch/microblaze/kernel/prom.c index 7959495b1d00..189179a9b554 100644 --- a/arch/microblaze/kernel/prom.c +++ b/arch/microblaze/kernel/prom.c | |||
@@ -42,9 +42,6 @@ | |||
42 | #include <asm/sections.h> | 42 | #include <asm/sections.h> |
43 | #include <asm/pci-bridge.h> | 43 | #include <asm/pci-bridge.h> |
44 | 44 | ||
45 | static int __initdata dt_root_addr_cells; | ||
46 | static int __initdata dt_root_size_cells; | ||
47 | |||
48 | typedef u32 cell_t; | 45 | typedef u32 cell_t; |
49 | 46 | ||
50 | /* export that to outside world */ | 47 | /* export that to outside world */ |
@@ -158,26 +155,6 @@ static int __init early_init_dt_scan_chosen(unsigned long node, | |||
158 | return 1; | 155 | return 1; |
159 | } | 156 | } |
160 | 157 | ||
161 | static int __init early_init_dt_scan_root(unsigned long node, | ||
162 | const char *uname, int depth, void *data) | ||
163 | { | ||
164 | u32 *prop; | ||
165 | |||
166 | if (depth != 0) | ||
167 | return 0; | ||
168 | |||
169 | prop = of_get_flat_dt_prop(node, "#size-cells", NULL); | ||
170 | dt_root_size_cells = (prop == NULL) ? 1 : *prop; | ||
171 | pr_debug("dt_root_size_cells = %x\n", dt_root_size_cells); | ||
172 | |||
173 | prop = of_get_flat_dt_prop(node, "#address-cells", NULL); | ||
174 | dt_root_addr_cells = (prop == NULL) ? 2 : *prop; | ||
175 | pr_debug("dt_root_addr_cells = %x\n", dt_root_addr_cells); | ||
176 | |||
177 | /* break now */ | ||
178 | return 1; | ||
179 | } | ||
180 | |||
181 | static u64 __init dt_mem_next_cell(int s, cell_t **cellp) | 158 | static u64 __init dt_mem_next_cell(int s, cell_t **cellp) |
182 | { | 159 | { |
183 | cell_t *p = *cellp; | 160 | cell_t *p = *cellp; |