Commit 819d2819 authored by Grant Likely's avatar Grant Likely
Browse files

of/flattree: merge of_get_flat_dt_root 



Merge common code between PowerPC and MicroBlaze

Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Reviewed-by: default avatarWolfram Sang <w.sang@pengutronix.de>
Tested-by: default avatarMichal Simek <monstr@monstr.eu>
parent c8cb7a59

arch/microblaze/kernel/prom.c

+0 −12
Original line number Diff line number Diff line
@@ -50,18 +50,6 @@ typedef u32 cell_t; 
/* export that to outside world */

struct device_node *of_chosen;



unsigned long __init of_get_flat_dt_root(void)

{

	unsigned long p = ((unsigned long)initial_boot_params) +

		initial_boot_params->off_dt_struct;



	while (*((u32 *)p) == OF_DT_NOP)

		p += 4;

	BUG_ON(*((u32 *)p) != OF_DT_BEGIN_NODE);

	p += 4;

	return _ALIGN(p + strlen((char *)p) + 1, 4);

}



/**

 * This function can be used within scan_flattened_dt callback to get

 * access to properties

arch/powerpc/kernel/prom.c

+0 −12
Original line number Diff line number Diff line
@@ -80,18 +80,6 @@ extern rwlock_t devtree_lock; /* temporary while merging */ 
/* export that to outside world */

struct device_node *of_chosen;



unsigned long __init of_get_flat_dt_root(void)

{

	unsigned long p = ((unsigned long)initial_boot_params) +

		initial_boot_params->off_dt_struct;



	while(*((u32 *)p) == OF_DT_NOP)

		p += 4;

	BUG_ON (*((u32 *)p) != OF_DT_BEGIN_NODE);

	p += 4;

	return _ALIGN(p + strlen((char *)p) + 1, 4);

}



/**

 * This  function can be used within scan_flattened_dt callback to get

 * access to properties

drivers/of/fdt.c

+16 −0
Original line number Diff line number Diff line
@@ -83,3 +83,19 @@ int __init of_scan_flat_dt(int (*it)(unsigned long node, 


	return rc;

}



/**

 * of_get_flat_dt_root - find the root node in the flat blob

 */

unsigned long __init of_get_flat_dt_root(void)

{

	unsigned long p = ((unsigned long)initial_boot_params) +

		initial_boot_params->off_dt_struct;



	while (*((u32 *)p) == OF_DT_NOP)

		p += 4;

	BUG_ON(*((u32 *)p) != OF_DT_BEGIN_NODE);

	p += 4;

	return _ALIGN(p + strlen((char *)p) + 1, 4);

}