diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2007-05-01 02:26:07 -0400 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2007-07-19 23:28:41 -0400 |
commit | 97e873e5c8ad8711ce4cca080cff4eb5d21b3aeb (patch) | |
tree | 7736415a2086522a083392f9ead34dac76c9560c /arch/sparc | |
parent | 76c1ce7870fd9b05431da1bbd47fdafcc029a25b (diff) |
Start split out of common open firmware code
This creates drivers/of/base.c (depending on CONFIG_OF) and puts
the first trivially common bits from the prom.c files into it.
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 'arch/sparc')
-rw-r--r-- | arch/sparc/Kconfig | 3 | ||||
-rw-r--r-- | arch/sparc/kernel/prom.c | 42 |
2 files changed, 3 insertions, 42 deletions
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index 603d83ad65c8..9d327ec59759 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig | |||
@@ -24,6 +24,9 @@ config GENERIC_ISA_DMA | |||
24 | config ARCH_NO_VIRT_TO_BUS | 24 | config ARCH_NO_VIRT_TO_BUS |
25 | def_bool y | 25 | def_bool y |
26 | 26 | ||
27 | config OF | ||
28 | def_bool y | ||
29 | |||
27 | source "init/Kconfig" | 30 | source "init/Kconfig" |
28 | 31 | ||
29 | menu "General machine setup" | 32 | menu "General machine setup" |
diff --git a/arch/sparc/kernel/prom.c b/arch/sparc/kernel/prom.c index eed140b3c739..ac3f3c29b174 100644 --- a/arch/sparc/kernel/prom.c +++ b/arch/sparc/kernel/prom.c | |||
@@ -168,18 +168,6 @@ struct property *of_find_property(const struct device_node *np, | |||
168 | } | 168 | } |
169 | EXPORT_SYMBOL(of_find_property); | 169 | EXPORT_SYMBOL(of_find_property); |
170 | 170 | ||
171 | /* | ||
172 | * Find a property with a given name for a given node | ||
173 | * and return the value. | ||
174 | */ | ||
175 | const void *of_get_property(const struct device_node *np, const char *name, | ||
176 | int *lenp) | ||
177 | { | ||
178 | struct property *pp = of_find_property(np,name,lenp); | ||
179 | return pp ? pp->value : NULL; | ||
180 | } | ||
181 | EXPORT_SYMBOL(of_get_property); | ||
182 | |||
183 | int of_getintprop_default(struct device_node *np, const char *name, int def) | 171 | int of_getintprop_default(struct device_node *np, const char *name, int def) |
184 | { | 172 | { |
185 | struct property *prop; | 173 | struct property *prop; |
@@ -193,36 +181,6 @@ int of_getintprop_default(struct device_node *np, const char *name, int def) | |||
193 | } | 181 | } |
194 | EXPORT_SYMBOL(of_getintprop_default); | 182 | EXPORT_SYMBOL(of_getintprop_default); |
195 | 183 | ||
196 | int of_n_addr_cells(struct device_node *np) | ||
197 | { | ||
198 | const int* ip; | ||
199 | do { | ||
200 | if (np->parent) | ||
201 | np = np->parent; | ||
202 | ip = of_get_property(np, "#address-cells", NULL); | ||
203 | if (ip != NULL) | ||
204 | return *ip; | ||
205 | } while (np->parent); | ||
206 | /* No #address-cells property for the root node, default to 2 */ | ||
207 | return 2; | ||
208 | } | ||
209 | EXPORT_SYMBOL(of_n_addr_cells); | ||
210 | |||
211 | int of_n_size_cells(struct device_node *np) | ||
212 | { | ||
213 | const int* ip; | ||
214 | do { | ||
215 | if (np->parent) | ||
216 | np = np->parent; | ||
217 | ip = of_get_property(np, "#size-cells", NULL); | ||
218 | if (ip != NULL) | ||
219 | return *ip; | ||
220 | } while (np->parent); | ||
221 | /* No #size-cells property for the root node, default to 1 */ | ||
222 | return 1; | ||
223 | } | ||
224 | EXPORT_SYMBOL(of_n_size_cells); | ||
225 | |||
226 | int of_set_property(struct device_node *dp, const char *name, void *val, int len) | 184 | int of_set_property(struct device_node *dp, const char *name, void *val, int len) |
227 | { | 185 | { |
228 | struct property **prevp; | 186 | struct property **prevp; |