diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2009-10-15 12:57:49 -0400 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2009-10-15 12:57:49 -0400 |
commit | 6f1924928377bd035a9f64466f91a487c69271d2 (patch) | |
tree | 1a162237e621a0d6ebcc2fca305d2c96d284e5a3 /include/linux/of.h | |
parent | 731581e6a653f6a68a4d7ba9df6b886a85c7d080 (diff) |
of: merge struct device_node
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>
Diffstat (limited to 'include/linux/of.h')
-rw-r--r-- | include/linux/of.h | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/include/linux/of.h b/include/linux/of.h index 4668b298479a..65a158dc7257 100644 --- a/include/linux/of.h +++ b/include/linux/of.h | |||
@@ -17,6 +17,7 @@ | |||
17 | */ | 17 | */ |
18 | #include <linux/types.h> | 18 | #include <linux/types.h> |
19 | #include <linux/bitops.h> | 19 | #include <linux/bitops.h> |
20 | #include <linux/kref.h> | ||
20 | #include <linux/mod_devicetable.h> | 21 | #include <linux/mod_devicetable.h> |
21 | 22 | ||
22 | typedef u32 phandle; | 23 | typedef u32 phandle; |
@@ -31,6 +32,37 @@ struct property { | |||
31 | unsigned int unique_id; | 32 | unsigned int unique_id; |
32 | }; | 33 | }; |
33 | 34 | ||
35 | #if defined(CONFIG_SPARC) | ||
36 | struct of_irq_controller; | ||
37 | #endif | ||
38 | |||
39 | struct device_node { | ||
40 | const char *name; | ||
41 | const char *type; | ||
42 | phandle node; | ||
43 | #if !defined(CONFIG_SPARC) | ||
44 | phandle linux_phandle; | ||
45 | #endif | ||
46 | char *full_name; | ||
47 | |||
48 | struct property *properties; | ||
49 | struct property *deadprops; /* removed properties */ | ||
50 | struct device_node *parent; | ||
51 | struct device_node *child; | ||
52 | struct device_node *sibling; | ||
53 | struct device_node *next; /* next device of same type */ | ||
54 | struct device_node *allnext; /* next in list of all nodes */ | ||
55 | struct proc_dir_entry *pde; /* this node's proc directory */ | ||
56 | struct kref kref; | ||
57 | unsigned long _flags; | ||
58 | void *data; | ||
59 | #if defined(CONFIG_SPARC) | ||
60 | char *path_component_name; | ||
61 | unsigned int unique_id; | ||
62 | struct of_irq_controller *irq_trans; | ||
63 | #endif | ||
64 | }; | ||
65 | |||
34 | #include <asm/prom.h> | 66 | #include <asm/prom.h> |
35 | 67 | ||
36 | /* flag descriptions */ | 68 | /* flag descriptions */ |