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: Grant Likely <grant.likely@secretlab.ca> Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Acked-by: Michal Simek <monstr@monstr.eu>
This commit is contained in:
parent
22d5579e66
commit
fc0bdae49d
|
@ -26,8 +26,6 @@
|
||||||
#include <asm/irq.h>
|
#include <asm/irq.h>
|
||||||
#include <asm/atomic.h>
|
#include <asm/atomic.h>
|
||||||
|
|
||||||
extern struct device_node *of_chosen;
|
|
||||||
|
|
||||||
#define HAVE_ARCH_DEVTREE_FIXUPS
|
#define HAVE_ARCH_DEVTREE_FIXUPS
|
||||||
|
|
||||||
/* Other Prototypes */
|
/* Other Prototypes */
|
||||||
|
|
|
@ -42,9 +42,6 @@
|
||||||
#include <asm/sections.h>
|
#include <asm/sections.h>
|
||||||
#include <asm/pci-bridge.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)
|
void __init early_init_dt_scan_chosen_arch(unsigned long node)
|
||||||
{
|
{
|
||||||
/* No Microblaze specific code here */
|
/* No Microblaze specific code here */
|
||||||
|
|
|
@ -23,8 +23,6 @@
|
||||||
#include <asm/irq.h>
|
#include <asm/irq.h>
|
||||||
#include <asm/atomic.h>
|
#include <asm/atomic.h>
|
||||||
|
|
||||||
extern struct device_node *of_chosen;
|
|
||||||
|
|
||||||
#define HAVE_ARCH_DEVTREE_FIXUPS
|
#define HAVE_ARCH_DEVTREE_FIXUPS
|
||||||
|
|
||||||
#ifdef CONFIG_PPC32
|
#ifdef CONFIG_PPC32
|
||||||
|
|
|
@ -67,9 +67,6 @@ int __initdata iommu_force_on;
|
||||||
unsigned long tce_alloc_start, tce_alloc_end;
|
unsigned long tce_alloc_start, tce_alloc_end;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* export that to outside world */
|
|
||||||
struct device_node *of_chosen;
|
|
||||||
|
|
||||||
static int __init early_parse_mem(char *p)
|
static int __init early_parse_mem(char *p)
|
||||||
{
|
{
|
||||||
if (!p)
|
if (!p)
|
||||||
|
|
|
@ -23,6 +23,7 @@
|
||||||
#include <linux/proc_fs.h>
|
#include <linux/proc_fs.h>
|
||||||
|
|
||||||
struct device_node *allnodes;
|
struct device_node *allnodes;
|
||||||
|
struct device_node *of_chosen;
|
||||||
|
|
||||||
/* use when traversing tree through the allnext, child, sibling,
|
/* use when traversing tree through the allnext, child, sibling,
|
||||||
* or parent members of struct device_node.
|
* or parent members of struct device_node.
|
||||||
|
|
|
@ -66,6 +66,7 @@ struct device_node {
|
||||||
|
|
||||||
/* Pointer for first entry in chain of all nodes. */
|
/* Pointer for first entry in chain of all nodes. */
|
||||||
extern struct device_node *allnodes;
|
extern struct device_node *allnodes;
|
||||||
|
extern struct device_node *of_chosen;
|
||||||
|
|
||||||
static inline int of_node_check_flag(struct device_node *n, unsigned long flag)
|
static inline int of_node_check_flag(struct device_node *n, unsigned long flag)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue