Skip to content

Commit

Permalink
of: merge phandle, ihandle and struct property
Browse files Browse the repository at this point in the history
Merge of common code duplicated between Sparc, PowerPC and Microblaze

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: David S. Miller <davem@davemloft.net>
Acked-by: Wolfram Sang <w.sang@pengutronix.de>
Acked-by: Michal Simek <monstr@monstr.eu>
Acked-by: Stephen Neuendorffer <stephen.neuendorffer@xilinx.com>
Acked-by: Stephen Rothwell <sfr@canb.auug.org.au>
  • Loading branch information
Grant Likely committed Oct 15, 2009
1 parent 9d24c88 commit 731581e
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 34 deletions.
10 changes: 0 additions & 10 deletions arch/microblaze/include/asm/prom.h
Original file line number Diff line number Diff line change
Expand Up @@ -73,16 +73,6 @@ struct boot_param_header {
u32 dt_struct_size; /* size of the DT structure block */
};

typedef u32 phandle;
typedef u32 ihandle;

struct property {
char *name;
int length;
void *value;
struct property *next;
};

struct device_node {
const char *name;
const char *type;
Expand Down
12 changes: 0 additions & 12 deletions arch/powerpc/include/asm/prom.h
Original file line number Diff line number Diff line change
Expand Up @@ -71,18 +71,6 @@ struct boot_param_header
u32 dt_struct_size; /* size of the DT structure block */
};



typedef u32 phandle;
typedef u32 ihandle;

struct property {
char *name;
int length;
void *value;
struct property *next;
};

struct device_node {
const char *name;
const char *type;
Expand Down
12 changes: 0 additions & 12 deletions arch/sparc/include/asm/prom.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,6 @@
#define of_prop_cmp(s1, s2) strcasecmp((s1), (s2))
#define of_node_cmp(s1, s2) strcmp((s1), (s2))

typedef u32 phandle;
typedef u32 ihandle;

struct property {
char *name;
int length;
void *value;
struct property *next;
unsigned long _flags;
unsigned int unique_id;
};

struct of_irq_controller;
struct device_node {
const char *name;
Expand Down
12 changes: 12 additions & 0 deletions include/linux/of.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,18 @@
#include <linux/bitops.h>
#include <linux/mod_devicetable.h>

typedef u32 phandle;
typedef u32 ihandle;

struct property {
char *name;
int length;
void *value;
struct property *next;
unsigned long _flags;
unsigned int unique_id;
};

#include <asm/prom.h>

/* flag descriptions */
Expand Down

0 comments on commit 731581e

Please sign in to comment.