diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/of_device.h | 13 | ||||
-rw-r--r-- | include/linux/of_fdt.h | 2 | ||||
-rw-r--r-- | include/linux/of_irq.h | 4 | ||||
-rw-r--r-- | include/linux/of_pdt.h | 45 |
4 files changed, 57 insertions, 7 deletions
diff --git a/include/linux/of_device.h b/include/linux/of_device.h index 835f85ecd2de..975d347079d9 100644 --- a/include/linux/of_device.h +++ b/include/linux/of_device.h | |||
@@ -27,20 +27,19 @@ static inline int of_driver_match_device(const struct device *dev, | |||
27 | extern struct platform_device *of_dev_get(struct platform_device *dev); | 27 | extern struct platform_device *of_dev_get(struct platform_device *dev); |
28 | extern void of_dev_put(struct platform_device *dev); | 28 | extern void of_dev_put(struct platform_device *dev); |
29 | 29 | ||
30 | extern int of_device_add(struct platform_device *pdev); | ||
30 | extern int of_device_register(struct platform_device *ofdev); | 31 | extern int of_device_register(struct platform_device *ofdev); |
31 | extern void of_device_unregister(struct platform_device *ofdev); | 32 | extern void of_device_unregister(struct platform_device *ofdev); |
32 | extern void of_release_dev(struct device *dev); | ||
33 | |||
34 | static inline void of_device_free(struct platform_device *dev) | ||
35 | { | ||
36 | of_release_dev(&dev->dev); | ||
37 | } | ||
38 | 33 | ||
39 | extern ssize_t of_device_get_modalias(struct device *dev, | 34 | extern ssize_t of_device_get_modalias(struct device *dev, |
40 | char *str, ssize_t len); | 35 | char *str, ssize_t len); |
41 | 36 | ||
42 | extern int of_device_uevent(struct device *dev, struct kobj_uevent_env *env); | 37 | extern int of_device_uevent(struct device *dev, struct kobj_uevent_env *env); |
43 | 38 | ||
39 | static inline void of_device_node_put(struct device *dev) | ||
40 | { | ||
41 | of_node_put(dev->of_node); | ||
42 | } | ||
44 | 43 | ||
45 | #else /* CONFIG_OF_DEVICE */ | 44 | #else /* CONFIG_OF_DEVICE */ |
46 | 45 | ||
@@ -56,6 +55,8 @@ static inline int of_device_uevent(struct device *dev, | |||
56 | return -ENODEV; | 55 | return -ENODEV; |
57 | } | 56 | } |
58 | 57 | ||
58 | static inline void of_device_node_put(struct device *dev) { } | ||
59 | |||
59 | #endif /* CONFIG_OF_DEVICE */ | 60 | #endif /* CONFIG_OF_DEVICE */ |
60 | 61 | ||
61 | #endif /* _LINUX_OF_DEVICE_H */ | 62 | #endif /* _LINUX_OF_DEVICE_H */ |
diff --git a/include/linux/of_fdt.h b/include/linux/of_fdt.h index 71e1a916d3fa..7bbf5b328438 100644 --- a/include/linux/of_fdt.h +++ b/include/linux/of_fdt.h | |||
@@ -72,7 +72,7 @@ extern void *of_get_flat_dt_prop(unsigned long node, const char *name, | |||
72 | unsigned long *size); | 72 | unsigned long *size); |
73 | extern int of_flat_dt_is_compatible(unsigned long node, const char *name); | 73 | extern int of_flat_dt_is_compatible(unsigned long node, const char *name); |
74 | extern unsigned long of_get_flat_dt_root(void); | 74 | extern unsigned long of_get_flat_dt_root(void); |
75 | extern void early_init_dt_scan_chosen_arch(unsigned long node); | 75 | |
76 | extern int early_init_dt_scan_chosen(unsigned long node, const char *uname, | 76 | extern int early_init_dt_scan_chosen(unsigned long node, const char *uname, |
77 | int depth, void *data); | 77 | int depth, void *data); |
78 | extern void early_init_dt_check_for_initrd(unsigned long node); | 78 | extern void early_init_dt_check_for_initrd(unsigned long node); |
diff --git a/include/linux/of_irq.h b/include/linux/of_irq.h index 5929781c104d..109e013b1772 100644 --- a/include/linux/of_irq.h +++ b/include/linux/of_irq.h | |||
@@ -5,6 +5,7 @@ | |||
5 | struct of_irq; | 5 | struct of_irq; |
6 | #include <linux/types.h> | 6 | #include <linux/types.h> |
7 | #include <linux/errno.h> | 7 | #include <linux/errno.h> |
8 | #include <linux/irq.h> | ||
8 | #include <linux/ioport.h> | 9 | #include <linux/ioport.h> |
9 | #include <linux/of.h> | 10 | #include <linux/of.h> |
10 | 11 | ||
@@ -64,6 +65,9 @@ extern unsigned int irq_create_of_mapping(struct device_node *controller, | |||
64 | unsigned int intsize); | 65 | unsigned int intsize); |
65 | extern int of_irq_to_resource(struct device_node *dev, int index, | 66 | extern int of_irq_to_resource(struct device_node *dev, int index, |
66 | struct resource *r); | 67 | struct resource *r); |
68 | extern int of_irq_count(struct device_node *dev); | ||
69 | extern int of_irq_to_resource_table(struct device_node *dev, | ||
70 | struct resource *res, int nr_irqs); | ||
67 | 71 | ||
68 | #endif /* CONFIG_OF_IRQ */ | 72 | #endif /* CONFIG_OF_IRQ */ |
69 | #endif /* CONFIG_OF */ | 73 | #endif /* CONFIG_OF */ |
diff --git a/include/linux/of_pdt.h b/include/linux/of_pdt.h new file mode 100644 index 000000000000..c65a18a0cfdf --- /dev/null +++ b/include/linux/of_pdt.h | |||
@@ -0,0 +1,45 @@ | |||
1 | /* | ||
2 | * Definitions for building a device tree by calling into the | ||
3 | * Open Firmware PROM. | ||
4 | * | ||
5 | * Copyright (C) 2010 Andres Salomon <dilinger@queued.net> | ||
6 | * | ||
7 | * This program is free software; you can redistribute it and/or | ||
8 | * modify it under the terms of the GNU General Public License | ||
9 | * as published by the Free Software Foundation; either version | ||
10 | * 2 of the License, or (at your option) any later version. | ||
11 | */ | ||
12 | |||
13 | #ifndef _LINUX_OF_PDT_H | ||
14 | #define _LINUX_OF_PDT_H | ||
15 | |||
16 | /* overridable operations for calling into the PROM */ | ||
17 | struct of_pdt_ops { | ||
18 | /* | ||
19 | * buf should be 32 bytes; return 0 on success. | ||
20 | * If prev is NULL, the first property will be returned. | ||
21 | */ | ||
22 | int (*nextprop)(phandle node, char *prev, char *buf); | ||
23 | |||
24 | /* for both functions, return proplen on success; -1 on error */ | ||
25 | int (*getproplen)(phandle node, const char *prop); | ||
26 | int (*getproperty)(phandle node, const char *prop, char *buf, | ||
27 | int bufsize); | ||
28 | |||
29 | /* phandles are 0 if no child or sibling exists */ | ||
30 | phandle (*getchild)(phandle parent); | ||
31 | phandle (*getsibling)(phandle node); | ||
32 | |||
33 | /* return 0 on success; fill in 'len' with number of bytes in path */ | ||
34 | int (*pkg2path)(phandle node, char *buf, const int buflen, int *len); | ||
35 | }; | ||
36 | |||
37 | extern void *prom_early_alloc(unsigned long size); | ||
38 | |||
39 | /* for building the device tree */ | ||
40 | extern void of_pdt_build_devicetree(phandle root_node, struct of_pdt_ops *ops); | ||
41 | |||
42 | extern void (*of_pdt_build_more)(struct device_node *dp, | ||
43 | struct device_node ***nextp); | ||
44 | |||
45 | #endif /* _LINUX_OF_PDT_H */ | ||