diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2009-11-23 21:44:23 -0500 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2009-11-23 21:44:23 -0500 |
commit | 819d2819303654c6829d572e698e2d0021c08599 (patch) | |
tree | 8e98224edfc837a630625b9e05c74121c7fa9b3f /arch/microblaze/kernel/prom.c | |
parent | c8cb7a59842c0b512b44f6f818cdb0b5a3ddc89e (diff) |
of/flattree: merge of_get_flat_dt_root
Merge common code between PowerPC and MicroBlaze
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Reviewed-by: Wolfram Sang <w.sang@pengutronix.de>
Tested-by: Michal Simek <monstr@monstr.eu>
Diffstat (limited to 'arch/microblaze/kernel/prom.c')
-rw-r--r-- | arch/microblaze/kernel/prom.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/microblaze/kernel/prom.c b/arch/microblaze/kernel/prom.c index 0db8ee64ffe6..7eb6f8bdb81a 100644 --- a/arch/microblaze/kernel/prom.c +++ b/arch/microblaze/kernel/prom.c | |||
@@ -50,18 +50,6 @@ typedef u32 cell_t; | |||
50 | /* export that to outside world */ | 50 | /* export that to outside world */ |
51 | struct device_node *of_chosen; | 51 | struct device_node *of_chosen; |
52 | 52 | ||
53 | unsigned long __init of_get_flat_dt_root(void) | ||
54 | { | ||
55 | unsigned long p = ((unsigned long)initial_boot_params) + | ||
56 | initial_boot_params->off_dt_struct; | ||
57 | |||
58 | while (*((u32 *)p) == OF_DT_NOP) | ||
59 | p += 4; | ||
60 | BUG_ON(*((u32 *)p) != OF_DT_BEGIN_NODE); | ||
61 | p += 4; | ||
62 | return _ALIGN(p + strlen((char *)p) + 1, 4); | ||
63 | } | ||
64 | |||
65 | /** | 53 | /** |
66 | * This function can be used within scan_flattened_dt callback to get | 54 | * This function can be used within scan_flattened_dt callback to get |
67 | * access to properties | 55 | * access to properties |