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/sparc64 | |
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/sparc64')
-rw-r--r-- | arch/sparc64/Kconfig | 3 | ||||
-rw-r--r-- | arch/sparc64/kernel/prom.c | 42 |
2 files changed, 3 insertions, 42 deletions
diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig index df6ee71894d1..f1cc55677ff2 100644 --- a/arch/sparc64/Kconfig +++ b/arch/sparc64/Kconfig | |||
@@ -65,6 +65,9 @@ config AUDIT_ARCH | |||
65 | config ARCH_NO_VIRT_TO_BUS | 65 | config ARCH_NO_VIRT_TO_BUS |
66 | def_bool y | 66 | def_bool y |
67 | 67 | ||
68 | config OF | ||
69 | def_bool y | ||
70 | |||
68 | choice | 71 | choice |
69 | prompt "Kernel page size" | 72 | prompt "Kernel page size" |
70 | default SPARC64_PAGE_SIZE_8KB | 73 | default SPARC64_PAGE_SIZE_8KB |
diff --git a/arch/sparc64/kernel/prom.c b/arch/sparc64/kernel/prom.c index 5d220302cd50..8f926d439c0f 100644 --- a/arch/sparc64/kernel/prom.c +++ b/arch/sparc64/kernel/prom.c | |||
@@ -173,18 +173,6 @@ struct property *of_find_property(const struct device_node *np, | |||
173 | } | 173 | } |
174 | EXPORT_SYMBOL(of_find_property); | 174 | EXPORT_SYMBOL(of_find_property); |
175 | 175 | ||
176 | /* | ||
177 | * Find a property with a given name for a given node | ||
178 | * and return the value. | ||
179 | */ | ||
180 | const void *of_get_property(const struct device_node *np, const char *name, | ||
181 | int *lenp) | ||
182 | { | ||
183 | struct property *pp = of_find_property(np,name,lenp); | ||
184 | return pp ? pp->value : NULL; | ||
185 | } | ||
186 | EXPORT_SYMBOL(of_get_property); | ||
187 | |||
188 | int of_getintprop_default(struct device_node *np, const char *name, int def) | 176 | int of_getintprop_default(struct device_node *np, const char *name, int def) |
189 | { | 177 | { |
190 | struct property *prop; | 178 | struct property *prop; |
@@ -198,36 +186,6 @@ int of_getintprop_default(struct device_node *np, const char *name, int def) | |||
198 | } | 186 | } |
199 | EXPORT_SYMBOL(of_getintprop_default); | 187 | EXPORT_SYMBOL(of_getintprop_default); |
200 | 188 | ||
201 | int of_n_addr_cells(struct device_node *np) | ||
202 | { | ||
203 | const int* ip; | ||
204 | do { | ||
205 | if (np->parent) | ||
206 | np = np->parent; | ||
207 | ip = of_get_property(np, "#address-cells", NULL); | ||
208 | if (ip != NULL) | ||
209 | return *ip; | ||
210 | } while (np->parent); | ||
211 | /* No #address-cells property for the root node, default to 2 */ | ||
212 | return 2; | ||
213 | } | ||
214 | EXPORT_SYMBOL(of_n_addr_cells); | ||
215 | |||
216 | int of_n_size_cells(struct device_node *np) | ||
217 | { | ||
218 | const int* ip; | ||
219 | do { | ||
220 | if (np->parent) | ||
221 | np = np->parent; | ||
222 | ip = of_get_property(np, "#size-cells", NULL); | ||
223 | if (ip != NULL) | ||
224 | return *ip; | ||
225 | } while (np->parent); | ||
226 | /* No #size-cells property for the root node, default to 1 */ | ||
227 | return 1; | ||
228 | } | ||
229 | EXPORT_SYMBOL(of_n_size_cells); | ||
230 | |||
231 | int of_set_property(struct device_node *dp, const char *name, void *val, int len) | 189 | int of_set_property(struct device_node *dp, const char *name, void *val, int len) |
232 | { | 190 | { |
233 | struct property **prevp; | 191 | struct property **prevp; |