[PATCH 2/3] [POWERPC] Add AMCC Kilauea eval board support to platforms/40x

[PATCH 2/3] [POWERPC] Add AMCC Kilauea eval board support to platforms/40x

[Stefan Roese]

This patch adds basic support for the new 405EX and the AMCC eval board
Kilauea to arch/powerpc.

Signed-off-by: Stefan Roese <sr@denx.de>
---
 arch/powerpc/platforms/40x/Kconfig   |   17 +++++++--
 arch/powerpc/platforms/40x/Makefile  |    5 ++-
 arch/powerpc/platforms/40x/kilauea.c |   63 ++++++++++++++++++++++++++++++++++
 3 files changed, 80 insertions(+), 5 deletions(-)
 create mode 100644 arch/powerpc/platforms/40x/kilauea.c

diff --git a/arch/powerpc/platforms/40x/Kconfig b/arch/powerpc/platforms/40x/Kconfig
index a0a50b1..da8d02d 100644
--- a/arch/powerpc/platforms/40x/Kconfig
+++ b/arch/powerpc/platforms/40x/Kconfig
@@ -29,6 +29,14 @@
 #	help
 #	  This option enables support for the extra features of the EP405PC board.
 
+config KILAUEA
+	bool "Kilauea"
+	depends on 40x
+	default y
+	select 405EX
+	help
+	  This option enables support for the AMCC PPC405EX evaluation board.
+
 #config REDWOOD_5
 #	bool "Redwood-5"
 #	depends on 40x
@@ -89,14 +97,17 @@ config 403GCX
 	#depends on OAK
 	select IBM405_ERR51
 
+config 405EP
+	bool
+
+config 405EX
+	bool
+
 config 405GP
 	bool
 	select IBM405_ERR77
 	select IBM405_ERR51
 
-config 405EP
-	bool
-
 config 405GPR
 	bool
 
diff --git a/arch/powerpc/platforms/40x/Makefile b/arch/powerpc/platforms/40x/Makefile
index 0a3cfe9..51dadee 100644
--- a/arch/powerpc/platforms/40x/Makefile
+++ b/arch/powerpc/platforms/40x/Makefile
@@ -1,2 +1,3 @@
-obj-$(CONFIG_WALNUT) += walnut.o
-obj-$(CONFIG_XILINX_VIRTEX_GENERIC_BOARD) += virtex.o
+obj-$(CONFIG_KILAUEA)				+= kilauea.o
+obj-$(CONFIG_WALNUT)				+= walnut.o
+obj-$(CONFIG_XILINX_VIRTEX_GENERIC_BOARD)	+= virtex.o
diff --git a/arch/powerpc/platforms/40x/kilauea.c b/arch/powerpc/platforms/40x/kilauea.c
new file mode 100644
index 0000000..6cbd528
--- /dev/null
+++ b/arch/powerpc/platforms/40x/kilauea.c
@@ -0,0 +1,63 @@
+/*
+ * Kilauea board specific routines
+ *
+ * Copyright 2007 DENX Software Engineering, Stefan Roese <sr@denx.de>
+ *
+ * Based on the Walnut code by
+ * Josh Boyer <jwboyer@linux.vnet.ibm.com>
+ * Copyright 2007 IBM Corporation
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+#include <linux/init.h>
+#include <asm/machdep.h>
+#include <asm/prom.h>
+#include <asm/udbg.h>
+#include <asm/time.h>
+#include <asm/uic.h>
+#include <asm/of_platform.h>
+
+static struct of_device_id kilauea_of_bus[] = {
+	{ .compatible = "ibm,plb4", },
+	{ .compatible = "ibm,opb", },
+	{ .compatible = "ibm,ebc", },
+	{},
+};
+
+static int __init kilauea_device_probe(void)
+{
+	if (!machine_is(kilauea))
+		return 0;
+
+	of_platform_bus_probe(NULL, kilauea_of_bus, NULL);
+
+	return 0;
+}
+device_initcall(kilauea_device_probe);
+
+static int __init kilauea_probe(void)
+{
+	unsigned long root = of_get_flat_dt_root();
+
+	if (!of_flat_dt_is_compatible(root, "amcc,kilauea"))
+		return 0;
+
+	return 1;
+}
+
+static void __init kilauea_setup_arch(void)
+{
+}
+
+define_machine(kilauea) {
+	.name 				= "Kilauea",
+	.probe 				= kilauea_probe,
+	.setup_arch			= kilauea_setup_arch,
+	.progress 			= udbg_progress,
+	.init_IRQ 			= uic_init_tree,
+	.get_irq 			= uic_get_irq,
+	.calibrate_decr			= generic_calibrate_decr,
+};
-- 
1.5.3.4

Re: [PATCH 2/3] [POWERPC] Add AMCC Kilauea eval board support to platforms/40x

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 315 bytes --]

On Mon, 8 Oct 2007 11:08:51 +0200 Stefan Roese <sr@denx.de> wrote:
>
> +++ b/arch/powerpc/platforms/40x/kilauea.c
>
> +#include <asm/of_platform.h>

Here I go again :-)

linux/of_platform.h please

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

Re: [PATCH 2/3] [POWERPC] Add AMCC Kilauea eval board support to platforms/40x

[Stefan Roese]

On Monday 08 October 2007, Stephen Rothwell wrote:
> > +#include <asm/of_platform.h>
>
> Here I go again :-)
>
> linux/of_platform.h please

Right. I was watching all your reviews lately and wanted not to make this 
error. Didn't work out as it seems. :-)

I'll wait a while for further comments and send a fixed version soon.

Thanks.

Best regards,
Stefan

Re: [PATCH 2/3] [POWERPC] Add AMCC Kilauea eval board support to platforms/40x

[Olof Johansson]

Hi,

On Mon, Oct 08, 2007 at 11:08:51AM +0200, Stefan Roese wrote:
> This patch adds basic support for the new 405EX and the AMCC eval board
> Kilauea to arch/powerpc.

[...]

> +config KILAUEA
> +	bool "Kilauea"
> +	depends on 40x
> +	default y
> +	select 405EX
> +	help
> +	  This option enables support for the AMCC PPC405EX evaluation board.
> +
>  #config REDWOOD_5
>  #	bool "Redwood-5"
>  #	depends on 40x
> @@ -89,14 +97,17 @@ config 403GCX
>  	#depends on OAK
>  	select IBM405_ERR51
>  
> +config 405EP
> +	bool
> +
> +config 405EX
> +	bool
> +

Do you really need config options for 405EP/EX? I don't seem them used anywhere
else in the code (and it's also contradictory to the whole new multiplatform way
of looking at stuff :).

I know the 405/440 is still somewhat #ifdef:ed on the cpu here and there, but since
this doesn't add any such code I don't see a need for the config options?


-Olof

Re: [PATCH 2/3] [POWERPC] Add AMCC Kilauea eval board support to platforms/40x

[Stefan Roese]

Hi Olof,

On Monday 08 October 2007, Olof Johansson wrote:
> > +config KILAUEA
> > +	bool "Kilauea"
> > +	depends on 40x
> > +	default y
> > +	select 405EX
> > +	help
> > +	  This option enables support for the AMCC PPC405EX evaluation board.
> > +
> >  #config REDWOOD_5
> >  #	bool "Redwood-5"
> >  #	depends on 40x
> > @@ -89,14 +97,17 @@ config 403GCX
> >  	#depends on OAK
> >  	select IBM405_ERR51
> >
> > +config 405EP
> > +	bool
> > +
> > +config 405EX
> > +	bool
> > +
>
> Do you really need config options for 405EP/EX? I don't seem them used
> anywhere else in the code (and it's also contradictory to the whole new
> multiplatform way of looking at stuff :).
>
> I know the 405/440 is still somewhat #ifdef:ed on the cpu here and there,
> but since this doesn't add any such code I don't see a need for the config
> options?

Yes, I'm still used to needing these defines from arch/ppc (for example for 
the 4xx EMAC driver). But its possible, that we really don't need it at all 
in arch/powerpc with all the device tree information. Not sure though.

Josh, what do you think? Should I remove the 405EX define completely?

Best regards,
Stefan

Re: [PATCH 2/3] [POWERPC] Add AMCC Kilauea eval board support to platforms/40x

[Josh Boyer]

On Tue, 2007-10-09 at 13:34 +0200, Stefan Roese wrote:
> Hi Olof,
> 
> On Monday 08 October 2007, Olof Johansson wrote:
> > > +config KILAUEA
> > > +	bool "Kilauea"
> > > +	depends on 40x
> > > +	default y
> > > +	select 405EX
> > > +	help
> > > +	  This option enables support for the AMCC PPC405EX evaluation board.
> > > +
> > >  #config REDWOOD_5
> > >  #	bool "Redwood-5"
> > >  #	depends on 40x
> > > @@ -89,14 +97,17 @@ config 403GCX
> > >  	#depends on OAK
> > >  	select IBM405_ERR51
> > >
> > > +config 405EP
> > > +	bool
> > > +
> > > +config 405EX
> > > +	bool
> > > +
> >
> > Do you really need config options for 405EP/EX? I don't seem them used
> > anywhere else in the code (and it's also contradictory to the whole new
> > multiplatform way of looking at stuff :).
> >
> > I know the 405/440 is still somewhat #ifdef:ed on the cpu here and there,
> > but since this doesn't add any such code I don't see a need for the config
> > options?
> 
> Yes, I'm still used to needing these defines from arch/ppc (for example for 
> the 4xx EMAC driver). But its possible, that we really don't need it at all 
> in arch/powerpc with all the device tree information. Not sure though.
> 
> Josh, what do you think? Should I remove the 405EX define completely?

If it's not needed, it can go.  As Olof said, it doesn't appear to be
used anywhere in the code so I think it's fine.

One question I do have is if 405EX and 405EP need any of the 405GP
errata config options selected.  I would like to think those don't apply
because the hardware is fixed, but I haven't checked to be sure.

josh

Re: [PATCH 2/3] [POWERPC] Add AMCC Kilauea eval board support to platforms/40x

[Josh Boyer]

On Mon, 2007-10-08 at 11:08 +0200, Stefan Roese wrote:
> This patch adds basic support for the new 405EX and the AMCC eval board
> Kilauea to arch/powerpc.
> 
> Signed-off-by: Stefan Roese <sr@denx.de>
> ---
>  arch/powerpc/platforms/40x/Kconfig   |   17 +++++++--
>  arch/powerpc/platforms/40x/Makefile  |    5 ++-
>  arch/powerpc/platforms/40x/kilauea.c |   63 ++++++++++++++++++++++++++++++++++
>  3 files changed, 80 insertions(+), 5 deletions(-)
>  create mode 100644 arch/powerpc/platforms/40x/kilauea.c
> 
> diff --git a/arch/powerpc/platforms/40x/Kconfig b/arch/powerpc/platforms/40x/Kconfig
> index a0a50b1..da8d02d 100644
> --- a/arch/powerpc/platforms/40x/Kconfig
> +++ b/arch/powerpc/platforms/40x/Kconfig
> @@ -29,6 +29,14 @@
>  #	help
>  #	  This option enables support for the extra features of the EP405PC board.
> 
> +config KILAUEA
> +	bool "Kilauea"
> +	depends on 40x
> +	default y

I think we decided to say default n here.  I need to fix the Walnut
example, I know.

> +	select 405EX
> +	help
> +	  This option enables support for the AMCC PPC405EX evaluation board.
> +
>  #config REDWOOD_5
>  #	bool "Redwood-5"
>  #	depends on 40x
> @@ -89,14 +97,17 @@ config 403GCX
>  	#depends on OAK
>  	select IBM405_ERR51
> 
> +config 405EP
> +	bool
> +
> +config 405EX
> +	bool
> +
>  config 405GP
>  	bool
>  	select IBM405_ERR77
>  	select IBM405_ERR51
> 
> -config 405EP
> -	bool
> -
>  config 405GPR
>  	bool
> 
> diff --git a/arch/powerpc/platforms/40x/Makefile b/arch/powerpc/platforms/40x/Makefile
> index 0a3cfe9..51dadee 100644
> --- a/arch/powerpc/platforms/40x/Makefile
> +++ b/arch/powerpc/platforms/40x/Makefile
> @@ -1,2 +1,3 @@
> -obj-$(CONFIG_WALNUT) += walnut.o
> -obj-$(CONFIG_XILINX_VIRTEX_GENERIC_BOARD) += virtex.o
> +obj-$(CONFIG_KILAUEA)				+= kilauea.o
> +obj-$(CONFIG_WALNUT)				+= walnut.o
> +obj-$(CONFIG_XILINX_VIRTEX_GENERIC_BOARD)	+= virtex.o
> diff --git a/arch/powerpc/platforms/40x/kilauea.c b/arch/powerpc/platforms/40x/kilauea.c
> new file mode 100644
> index 0000000..6cbd528
> --- /dev/null
> +++ b/arch/powerpc/platforms/40x/kilauea.c
> @@ -0,0 +1,63 @@
> +/*
> + * Kilauea board specific routines
> + *
> + * Copyright 2007 DENX Software Engineering, Stefan Roese <sr@denx.de>
> + *
> + * Based on the Walnut code by
> + * Josh Boyer <jwboyer@linux.vnet.ibm.com>
> + * Copyright 2007 IBM Corporation
> + *
> + * This program is free software; you can redistribute  it and/or modify it
> + * under  the terms of  the GNU General  Public License as published by the
> + * Free Software Foundation;  either version 2 of the  License, or (at your
> + * option) any later version.
> + */
> +#include <linux/init.h>
> +#include <asm/machdep.h>
> +#include <asm/prom.h>
> +#include <asm/udbg.h>
> +#include <asm/time.h>
> +#include <asm/uic.h>
> +#include <asm/of_platform.h>
> +
> +static struct of_device_id kilauea_of_bus[] = {
> +	{ .compatible = "ibm,plb4", },
> +	{ .compatible = "ibm,opb", },
> +	{ .compatible = "ibm,ebc", },
> +	{},
> +};
> +
> +static int __init kilauea_device_probe(void)
> +{
> +	if (!machine_is(kilauea))
> +		return 0;
> +
> +	of_platform_bus_probe(NULL, kilauea_of_bus, NULL);
> +
> +	return 0;
> +}
> +device_initcall(kilauea_device_probe);
> +
> +static int __init kilauea_probe(void)
> +{
> +	unsigned long root = of_get_flat_dt_root();
> +
> +	if (!of_flat_dt_is_compatible(root, "amcc,kilauea"))
> +		return 0;
> +
> +	return 1;
> +}
> +
> +static void __init kilauea_setup_arch(void)
> +{
> +}

Assuming Grant's patch to make setup_arch optional gets applied, this
can go too.

> +
> +define_machine(kilauea) {
> +	.name 				= "Kilauea",
> +	.probe 				= kilauea_probe,
> +	.setup_arch			= kilauea_setup_arch,
> +	.progress 			= udbg_progress,
> +	.init_IRQ 			= uic_init_tree,
> +	.get_irq 			= uic_get_irq,
> +	.calibrate_decr			= generic_calibrate_decr,
> +};

Other than those two comments, looks good.

josh

Re: [PATCH 2/3] [POWERPC] Add AMCC Kilauea eval board support to platforms/40x

[Stefan Roese]

On Wednesday 10 October 2007, Josh Boyer wrote:
> > > Do you really need config options for 405EP/EX? I don't seem them used
> > > anywhere else in the code (and it's also contradictory to the whole new
> > > multiplatform way of looking at stuff :).
> > >
> > > I know the 405/440 is still somewhat #ifdef:ed on the cpu here and
> > > there, but since this doesn't add any such code I don't see a need for
> > > the config options?
> >
> > Yes, I'm still used to needing these defines from arch/ppc (for example
> > for the 4xx EMAC driver). But its possible, that we really don't need it
> > at all in arch/powerpc with all the device tree information. Not sure
> > though.
> >
> > Josh, what do you think? Should I remove the 405EX define completely?
>
> If it's not needed, it can go.  As Olof said, it doesn't appear to be
> used anywhere in the code so I think it's fine.

OK, I'll remove it. If we later see that we need it, we can always add it 
again.

> One question I do have is if 405EX and 405EP need any of the 405GP
> errata config options selected.  I would like to think those don't apply
> because the hardware is fixed, but I haven't checked to be sure.

Yes, the 2 405 errata's IBM405_ERR51 and IBM405_ERR77 do not apply to "newer" 
405 cores. Only 405GP (and 405CR I assume) are affected.

Best regards,
Stefan