[SPARC]: Merge include/asm-sparc{,64}/prom.h

Signed-off-by: David S. Miller <davem@davemloft.net>

authored by David S. Miller and committed by David S. Miller 97b4872c 7b98ac24

+11 -104
+10 -1
include/asm-sparc/prom.h
··· 9 * Copyright (C) 1996-2005 Paul Mackerras. 10 * 11 * Updates for PPC64 by Peter Bergner & David Engebretsen, IBM Corp. 12 - * Updates for SPARC32 by David S. Miller 13 * 14 * This program is free software; you can redistribute it and/or 15 * modify it under the terms of the GNU General Public License ··· 39 unsigned int unique_id; 40 }; 41 42 struct device_node { 43 const char *name; 44 const char *type; ··· 59 unsigned long _flags; 60 void *data; 61 unsigned int unique_id; 62 }; 63 64 #define OF_IS_DYNAMIC(x) test_bit(OF_DYNAMIC, &x->_flags) 65 #define OF_MARK_DYNAMIC(x) set_bit(OF_DYNAMIC, &x->_flags) 66 67 extern int of_set_property(struct device_node *node, const char *name, void *val, int len); 68 extern int of_getintprop_default(struct device_node *np, 69 const char *name,
··· 9 * Copyright (C) 1996-2005 Paul Mackerras. 10 * 11 * Updates for PPC64 by Peter Bergner & David Engebretsen, IBM Corp. 12 + * Updates for SPARC by David S. Miller 13 * 14 * This program is free software; you can redistribute it and/or 15 * modify it under the terms of the GNU General Public License ··· 39 unsigned int unique_id; 40 }; 41 42 + struct of_irq_controller; 43 struct device_node { 44 const char *name; 45 const char *type; ··· 58 unsigned long _flags; 59 void *data; 60 unsigned int unique_id; 61 + 62 + struct of_irq_controller *irq_trans; 63 + }; 64 + 65 + struct of_irq_controller { 66 + unsigned int (*irq_build)(struct device_node *, unsigned int, void *); 67 + void *data; 68 }; 69 70 #define OF_IS_DYNAMIC(x) test_bit(OF_DYNAMIC, &x->_flags) 71 #define OF_MARK_DYNAMIC(x) set_bit(OF_DYNAMIC, &x->_flags) 72 73 + extern struct device_node *of_find_node_by_cpuid(int cpuid); 74 extern int of_set_property(struct device_node *node, const char *name, void *val, int len); 75 extern int of_getintprop_default(struct device_node *np, 76 const char *name,
+1 -103
include/asm-sparc64/prom.h
··· 1 - #ifndef _SPARC64_PROM_H 2 - #define _SPARC64_PROM_H 3 - #ifdef __KERNEL__ 4 - 5 - /* 6 - * Definitions for talking to the Open Firmware PROM on 7 - * Power Macintosh computers. 8 - * 9 - * Copyright (C) 1996-2005 Paul Mackerras. 10 - * 11 - * Updates for PPC64 by Peter Bergner & David Engebretsen, IBM Corp. 12 - * Updates for SPARC64 by David S. Miller 13 - * 14 - * This program is free software; you can redistribute it and/or 15 - * modify it under the terms of the GNU General Public License 16 - * as published by the Free Software Foundation; either version 17 - * 2 of the License, or (at your option) any later version. 18 - */ 19 - #include <linux/types.h> 20 - #include <linux/proc_fs.h> 21 - #include <asm/atomic.h> 22 - 23 - #define OF_ROOT_NODE_ADDR_CELLS_DEFAULT 2 24 - #define OF_ROOT_NODE_SIZE_CELLS_DEFAULT 1 25 - 26 - #define of_compat_cmp(s1, s2, l) strncmp((s1), (s2), (l)) 27 - #define of_prop_cmp(s1, s2) strcasecmp((s1), (s2)) 28 - #define of_node_cmp(s1, s2) strcmp((s1), (s2)) 29 - 30 - typedef u32 phandle; 31 - typedef u32 ihandle; 32 - 33 - struct property { 34 - char *name; 35 - int length; 36 - void *value; 37 - struct property *next; 38 - unsigned long _flags; 39 - unsigned int unique_id; 40 - }; 41 - 42 - struct of_irq_controller; 43 - struct device_node { 44 - const char *name; 45 - const char *type; 46 - phandle node; 47 - char *path_component_name; 48 - char *full_name; 49 - 50 - struct property *properties; 51 - struct property *deadprops; /* removed properties */ 52 - struct device_node *parent; 53 - struct device_node *child; 54 - struct device_node *sibling; 55 - struct device_node *next; /* next device of same type */ 56 - struct device_node *allnext; /* next in list of all nodes */ 57 - struct proc_dir_entry *pde; /* this node's proc directory */ 58 - struct kref kref; 59 - unsigned long _flags; 60 - void *data; 61 - unsigned int unique_id; 62 - 63 - struct of_irq_controller *irq_trans; 64 - }; 65 - 66 - struct of_irq_controller { 67 - unsigned int (*irq_build)(struct device_node *, unsigned int, void *); 68 - void *data; 69 - }; 70 - 71 - #define OF_IS_DYNAMIC(x) test_bit(OF_DYNAMIC, &x->_flags) 72 - #define OF_MARK_DYNAMIC(x) set_bit(OF_DYNAMIC, &x->_flags) 73 - 74 - extern struct device_node *of_find_node_by_cpuid(int cpuid); 75 - extern int of_set_property(struct device_node *node, const char *name, void *val, int len); 76 - extern int of_getintprop_default(struct device_node *np, 77 - const char *name, 78 - int def); 79 - extern int of_find_in_proplist(const char *list, const char *match, int len); 80 - 81 - extern void prom_build_devicetree(void); 82 - 83 - /* Dummy ref counting routines - to be implemented later */ 84 - static inline struct device_node *of_node_get(struct device_node *node) 85 - { 86 - return node; 87 - } 88 - static inline void of_node_put(struct device_node *node) 89 - { 90 - } 91 - 92 - /* 93 - * NB: This is here while we transition from using asm/prom.h 94 - * to linux/of.h 95 - */ 96 - #include <linux/of.h> 97 - 98 - extern struct device_node *of_console_device; 99 - extern char *of_console_path; 100 - extern char *of_console_options; 101 - 102 - #endif /* __KERNEL__ */ 103 - #endif /* _SPARC64_PROM_H */
··· 1 + #include <asm-sparc/prom.h>