diff options
author | David S. Miller <davem@sunset.davemloft.net> | 2006-06-22 19:18:54 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-06-24 02:15:26 -0400 |
commit | de8d28b16f5614aeb12bb69c8f9a38578b8d3ada (patch) | |
tree | 152f0930dc099606342e9cc6d9a3892cd9f3f192 /include/asm-sparc64 | |
parent | 765b5f32730cfd2608291e679060b0391570c8b3 (diff) |
[SPARC64]: Convert sparc64 PCI layer to in-kernel device tree.
One thing this change pointed out was that we really should
pull the "get 'local-mac-address' property" logic into a helper
function all the network drivers can call.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/asm-sparc64')
-rw-r--r-- | include/asm-sparc64/pbm.h | 3 | ||||
-rw-r--r-- | include/asm-sparc64/prom.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/asm-sparc64/pbm.h b/include/asm-sparc64/pbm.h index 142cc4028bb..cebe80b1da6 100644 --- a/include/asm-sparc64/pbm.h +++ b/include/asm-sparc64/pbm.h | |||
@@ -227,8 +227,7 @@ struct pci_controller_info { | |||
227 | */ | 227 | */ |
228 | struct pcidev_cookie { | 228 | struct pcidev_cookie { |
229 | struct pci_pbm_info *pbm; | 229 | struct pci_pbm_info *pbm; |
230 | char prom_name[64]; | 230 | struct device_node *prom_node; |
231 | int prom_node; | ||
232 | struct linux_prom_pci_registers prom_regs[PROMREG_MAX]; | 231 | struct linux_prom_pci_registers prom_regs[PROMREG_MAX]; |
233 | int num_prom_regs; | 232 | int num_prom_regs; |
234 | struct linux_prom_pci_registers prom_assignments[PROMREG_MAX]; | 233 | struct linux_prom_pci_registers prom_assignments[PROMREG_MAX]; |
diff --git a/include/asm-sparc64/prom.h b/include/asm-sparc64/prom.h index d0187b3a0ec..062ae6e1212 100644 --- a/include/asm-sparc64/prom.h +++ b/include/asm-sparc64/prom.h | |||
@@ -76,12 +76,15 @@ extern struct device_node *of_find_node_by_type(struct device_node *from, | |||
76 | for (dn = of_find_node_by_type(NULL, type); dn; \ | 76 | for (dn = of_find_node_by_type(NULL, type); dn; \ |
77 | dn = of_find_node_by_type(dn, type)) | 77 | dn = of_find_node_by_type(dn, type)) |
78 | extern struct device_node *of_find_node_by_path(const char *path); | 78 | extern struct device_node *of_find_node_by_path(const char *path); |
79 | extern struct device_node *of_find_node_by_phandle(phandle handle); | ||
79 | extern struct device_node *of_get_parent(const struct device_node *node); | 80 | extern struct device_node *of_get_parent(const struct device_node *node); |
80 | extern struct device_node *of_get_next_child(const struct device_node *node, | 81 | extern struct device_node *of_get_next_child(const struct device_node *node, |
81 | struct device_node *prev); | 82 | struct device_node *prev); |
82 | extern struct property *of_find_property(struct device_node *np, | 83 | extern struct property *of_find_property(struct device_node *np, |
83 | const char *name, | 84 | const char *name, |
84 | int *lenp); | 85 | int *lenp); |
86 | extern void *of_get_property(struct device_node *node, const char *name, | ||
87 | int *lenp); | ||
85 | extern int of_getintprop_default(struct device_node *np, | 88 | extern int of_getintprop_default(struct device_node *np, |
86 | const char *name, | 89 | const char *name, |
87 | int def); | 90 | int def); |