diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2007-05-01 16:26:07 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2007-07-20 13:28:41 +1000 |
commit | 97e873e5c8ad8711ce4cca080cff4eb5d21b3aeb (patch) | |
tree | 7736415a2086522a083392f9ead34dac76c9560c /arch/powerpc | |
parent | 76c1ce7870fd9b05431da1bbd47fdafcc029a25b (diff) | |
download | op-kernel-dev-97e873e5c8ad8711ce4cca080cff4eb5d21b3aeb.zip op-kernel-dev-97e873e5c8ad8711ce4cca080cff4eb5d21b3aeb.tar.gz |
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/powerpc')
-rw-r--r-- | arch/powerpc/Kconfig | 3 | ||||
-rw-r--r-- | arch/powerpc/kernel/prom.c | 41 |
2 files changed, 3 insertions, 41 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index d860b64..853c282 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -92,6 +92,9 @@ config ARCH_MAY_HAVE_PC_FDC config PPC_OF def_bool y +config OF + def_bool y + config PPC_UDBG_16550 bool default n diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c index 37ff99b..6c9419a 100644 --- a/arch/powerpc/kernel/prom.c +++ b/arch/powerpc/kernel/prom.c @@ -1056,35 +1056,6 @@ void __init early_init_devtree(void *params) DBG(" <- early_init_devtree()\n"); } -int of_n_addr_cells(struct device_node* np) -{ - const int *ip; - do { - if (np->parent) - np = np->parent; - ip = of_get_property(np, "#address-cells", NULL); - if (ip != NULL) - return *ip; - } while (np->parent); - /* No #address-cells property for the root node, default to 1 */ - return 1; -} -EXPORT_SYMBOL(of_n_addr_cells); - -int of_n_size_cells(struct device_node* np) -{ - const int* ip; - do { - if (np->parent) - np = np->parent; - ip = of_get_property(np, "#size-cells", NULL); - if (ip != NULL) - return *ip; - } while (np->parent); - /* No #size-cells property for the root node, default to 1 */ - return 1; -} -EXPORT_SYMBOL(of_n_size_cells); /** Checks if the given "compat" string matches one of the strings in * the device's "compatible" property @@ -1563,18 +1534,6 @@ struct property *of_find_property(const struct device_node *np, EXPORT_SYMBOL(of_find_property); /* - * Find a property with a given name for a given node - * and return the value. - */ -const void *of_get_property(const struct device_node *np, const char *name, - int *lenp) -{ - struct property *pp = of_find_property(np,name,lenp); - return pp ? pp->value : NULL; -} -EXPORT_SYMBOL(of_get_property); - -/* * Add a property to a node */ int prom_add_property(struct device_node* np, struct property* prop) |