On Mon, Jun 22, 2009 at 12:02:52PM +0200, konrad@xxxxxxxxxxx wrote:
> From: Konrad Eisele <konrad@xxxxxxxxxxx>
>
> The device is a AMBA bus if it is a child of prom node
> "ambapp" (AMBA plug and play). Two functions
> leon_trans_init() and leon_node_init() (defined in
> sparc/kernel/leon_kernel.c) are called in the prom_build_tree()
> path if CONFIG_SPARC_LEON is defined. leon_node_init() will
> build up the device tree using AMBA plug and play.
>
> Signed-off-by: Konrad Eisele <konrad@xxxxxxxxxxx>
> ---
> arch/sparc/kernel/of_device_32.c | 37 +++++++++++++++++++++++++++++++++++++
> arch/sparc/kernel/prom_32.c | 33 +++++++++++++++++++++++++++++++++
> arch/sparc/kernel/prom_common.c | 10 ++++++++--
> 3 files changed, 78 insertions(+), 2 deletions(-)
>
> diff --git a/arch/sparc/kernel/of_device_32.c b/arch/sparc/kernel/of_device_32.c
> index 9039670..87feba6 100644
> --- a/arch/sparc/kernel/of_device_32.c
> +++ b/arch/sparc/kernel/of_device_32.c
> @@ -9,6 +9,7 @@
> #include <linux/irq.h>
> #include <linux/of_device.h>
> #include <linux/of_platform.h>
> +#include <asm/leon.h>
Also include leon_amba so we get the externs in the headers
typechecked.
> diff --git a/arch/sparc/kernel/prom_common.c b/arch/sparc/kernel/prom_common.c
> index 0fb5789..522c17c 100644
> --- a/arch/sparc/kernel/prom_common.c
> +++ b/arch/sparc/kernel/prom_common.c
> @@ -22,9 +22,12 @@
> #include <linux/of.h>
> #include <asm/prom.h>
> #include <asm/oplib.h>
> +#include <asm/leon.h>
>
> #include "prom.h"
>
> +void (*prom_build_more)(struct device_node *dp, struct device_node ***nextp);
> +
> struct device_node *of_console_device;
> EXPORT_SYMBOL(of_console_device);
>
> @@ -161,7 +164,7 @@ static struct property * __init build_one_prop(phandle node, char *prev,
> name = prom_nextprop(node, prev, p->name);
> }
>
> - if (strlen(name) == 0) {
> + if (!name || strlen(name) == 0) {
Are this change justified in the chagelog?
If it is a bugfix submit it as a separate patch.
Sam
--
To unsubscribe from this list: send the line "unsubscribe sparclinux" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
