aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-sparc
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2007-05-01 02:49:51 -0400
committerStephen Rothwell <sfr@canb.auug.org.au>2007-07-19 23:41:56 -0400
commitf898f8dbcec4848cddb8c5be2d0affd75779ebe2 (patch)
tree3ebbce02c605d9fc49bec8b1f5b971facd2c2e67 /include/asm-sparc
parentf85ff3056cefdf4635ebf98b30e9a7d86521567f (diff)
Begin consolidation of of_device.h
This just moves the common stuff from the arch of_device.h files to linux/of_device.h. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Acked-by: Paul Mackerras <paulus@samba.org> Acked-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/asm-sparc')
-rw-r--r--include/asm-sparc/of_device.h15
1 files changed, 4 insertions, 11 deletions
diff --git a/include/asm-sparc/of_device.h b/include/asm-sparc/of_device.h
index 7cb00c1b09c6..b625261c9ec7 100644
--- a/include/asm-sparc/of_device.h
+++ b/include/asm-sparc/of_device.h
@@ -3,9 +3,9 @@
3#ifdef __KERNEL__ 3#ifdef __KERNEL__
4 4
5#include <linux/device.h> 5#include <linux/device.h>
6#include <linux/of.h>
6#include <linux/mod_devicetable.h> 7#include <linux/mod_devicetable.h>
7#include <asm/openprom.h> 8#include <asm/openprom.h>
8#include <asm/prom.h>
9 9
10extern struct bus_type ebus_bus_type; 10extern struct bus_type ebus_bus_type;
11extern struct bus_type sbus_bus_type; 11extern struct bus_type sbus_bus_type;
@@ -30,19 +30,12 @@ struct of_device
30 int portid; 30 int portid;
31 int clock_freq; 31 int clock_freq;
32}; 32};
33#define to_of_device(d) container_of(d, struct of_device, dev)
34 33
35extern void __iomem *of_ioremap(struct resource *res, unsigned long offset, unsigned long size, char *name); 34extern void __iomem *of_ioremap(struct resource *res, unsigned long offset, unsigned long size, char *name);
36extern void of_iounmap(struct resource *res, void __iomem *base, unsigned long size); 35extern void of_iounmap(struct resource *res, void __iomem *base, unsigned long size);
37 36
38extern struct of_device *of_find_device_by_node(struct device_node *); 37extern struct of_device *of_find_device_by_node(struct device_node *);
39 38
40extern const struct of_device_id *of_match_device(
41 const struct of_device_id *matches, const struct of_device *dev);
42
43extern struct of_device *of_dev_get(struct of_device *dev);
44extern void of_dev_put(struct of_device *dev);
45
46/* 39/*
47 * An of_platform_driver driver is attached to a basic of_device on 40 * An of_platform_driver driver is attached to a basic of_device on
48 * the ISA, EBUS, and SBUS busses on sparc64. 41 * the ISA, EBUS, and SBUS busses on sparc64.
@@ -67,13 +60,13 @@ struct of_platform_driver
67extern int of_register_driver(struct of_platform_driver *drv, 60extern int of_register_driver(struct of_platform_driver *drv,
68 struct bus_type *bus); 61 struct bus_type *bus);
69extern void of_unregister_driver(struct of_platform_driver *drv); 62extern void of_unregister_driver(struct of_platform_driver *drv);
70extern int of_device_register(struct of_device *ofdev);
71extern void of_device_unregister(struct of_device *ofdev);
72extern struct of_device *of_platform_device_create(struct device_node *np, 63extern struct of_device *of_platform_device_create(struct device_node *np,
73 const char *bus_id, 64 const char *bus_id,
74 struct device *parent, 65 struct device *parent,
75 struct bus_type *bus); 66 struct bus_type *bus);
76extern void of_release_dev(struct device *dev); 67
68/* This is just here during the transition */
69#include <linux/of_device.h>
77 70
78#endif /* __KERNEL__ */ 71#endif /* __KERNEL__ */
79#endif /* _ASM_SPARC_OF_DEVICE_H */ 72#endif /* _ASM_SPARC_OF_DEVICE_H */