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

Commit 731581e6 authored by Grant Likely's avatar Grant Likely
Browse files

of: merge phandle, ihandle and struct property 



Merge of common code duplicated between Sparc, PowerPC and Microblaze

Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Acked-by: default avatarWolfram Sang <w.sang@pengutronix.de>
Acked-by: default avatarMichal Simek <monstr@monstr.eu>
Acked-by: default avatarStephen Neuendorffer <stephen.neuendorffer@xilinx.com>
Acked-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
parent 9d24c888

arch/microblaze/include/asm/prom.h

+0 −10
Original line number Diff line number Diff line
@@ -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;

arch/powerpc/include/asm/prom.h

+0 −12
Original line number Diff line number Diff line
@@ -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;

arch/sparc/include/asm/prom.h

+0 −12
Original line number Diff line number Diff line
@@ -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;

include/linux/of.h

+12 −0
Original line number Diff line number Diff line
@@ -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 */