Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc0bdae4 authored by Grant Likely's avatar Grant Likely
Browse files

of: move definition of of_chosen into common code. 



Rather than defining of_chosen in each arch, it can be defined for all
in driver/of/base.c

Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Acked-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: default avatarMichal Simek <monstr@monstr.eu>
parent 22d5579e

arch/microblaze/include/asm/prom.h

+0 −2
Original line number Diff line number Diff line
@@ -26,8 +26,6 @@ 
#include <asm/irq.h>

#include <asm/atomic.h>



extern struct device_node *of_chosen;



#define HAVE_ARCH_DEVTREE_FIXUPS



/* Other Prototypes */

arch/microblaze/kernel/prom.c

+0 −3
Original line number Diff line number Diff line
@@ -42,9 +42,6 @@ 
#include <asm/sections.h>

#include <asm/pci-bridge.h>



/* export that to outside world */

struct device_node *of_chosen;



void __init early_init_dt_scan_chosen_arch(unsigned long node)

{

	/* No Microblaze specific code here */

arch/powerpc/include/asm/prom.h

+0 −2
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ 
#include <asm/irq.h>

#include <asm/atomic.h>



extern struct device_node *of_chosen;



#define HAVE_ARCH_DEVTREE_FIXUPS



#ifdef CONFIG_PPC32

arch/powerpc/kernel/prom.c

+0 −3
Original line number Diff line number Diff line
@@ -67,9 +67,6 @@ int __initdata iommu_force_on; 
unsigned long tce_alloc_start, tce_alloc_end;

#endif



/* export that to outside world */

struct device_node *of_chosen;



static int __init early_parse_mem(char *p)

{

	if (!p)

drivers/of/base.c

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <linux/proc_fs.h>



struct device_node *allnodes;

struct device_node *of_chosen;



/* use when traversing tree through the allnext, child, sibling,

 * or parent members of struct device_node.