Re: [PATCH 3/4] PowerPC: 440GRx Rainier board support.

2007-10-31 Thread Valentine Barshak
Stephen Rothwell wrote:
> On Tue, 30 Oct 2007 19:57:39 +0300 Valentine Barshak <[EMAIL PROTECTED]> 
> wrote:
>> +++ linux-2.6/arch/powerpc/platforms/44x/rainier.c   2007-10-30 
>> 18:00:15.0 +0300
>> +#include 
>> +#include 
>> +#include 
>> +#include 
>> +#include 
>> +#include 
>> +#include 
> 
> You want 
> 
Oops, apparently this got here from the old sequoia.c
Will correct both.
Thanks,
Valentine.
___
Linuxppc-dev mailing list
Linuxppc-dev@ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-dev


Re: [PATCH 3/4] PowerPC: 440GRx Rainier board support.

2007-10-30 Thread Stephen Rothwell
On Tue, 30 Oct 2007 19:57:39 +0300 Valentine Barshak <[EMAIL PROTECTED]> wrote:
>
> +++ linux-2.6/arch/powerpc/platforms/44x/rainier.c2007-10-30 
> 18:00:15.0 +0300
> +#include 
> +#include 
> +#include 
> +#include 
> +#include 
> +#include 
> +#include 

You want 

-- 
Cheers,
Stephen Rothwell[EMAIL PROTECTED]
http://www.canb.auug.org.au/~sfr/


pgpLSdUhmE65u.pgp
Description: PGP signature
___
Linuxppc-dev mailing list
Linuxppc-dev@ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-dev

Re: [PATCH 3/4] PowerPC: 440GRx Rainier board support.

2007-10-30 Thread Arnd Bergmann
On Tuesday 30 October 2007, Valentine Barshak wrote:
> +static struct of_device_id rainier_of_bus[] = {
> +   { .compatible = "ibm,plb4", },
> +   { .compatible = "ibm,opb", },
> +   { .compatible = "ibm,ebc", },
> +   {},
> +};
> +
> +static int __init rainier_device_probe(void)
> +{
> +   if (!machine_is(rainier))
> +   return 0;
> +
> +   of_platform_bus_probe(NULL, rainier_of_bus, NULL);
> +
> +   return 0;
> +}
> +device_initcall(rainier_device_probe);
> +
> +static int __init rainier_probe(void)
> +{
> +   unsigned long root = of_get_flat_dt_root();
> +
> +   if (!of_flat_dt_is_compatible(root, "amcc,rainier"))
> +   return 0;
> +
> +   return 1;
> +}
> +
> +define_machine(rainier) {
> +   .name   = "Rainier",
> +   .probe  = rainier_probe,
> +   .progress   = udbg_progress,
> +   .init_IRQ   = uic_init_tree,
> +   .get_irq    = uic_get_irq,
> +   .restart= ppc44x_reset_system,
> +   .calibrate_decr = generic_calibrate_decr,
> +};

Wow, this is getting really small these days. I wonder if we should add two
more generic helpers to turn this into just

define_machine(rainier) {
   .name   = "Rainier",
   .compatible = "amcc,rainier", /* new */
   .probe_buses= &4xx_generic_bus_probe, /* new */
   .progress   = udbg_progress,
   .init_IRQ   = uic_init_tree,
   .get_irq= uic_get_irq,
   .restart= ppc44x_reset_system,
   .calibrate_decr = generic_calibrate_decr,
};

Arnd <><
___
Linuxppc-dev mailing list
Linuxppc-dev@ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-dev


[PATCH 3/4] PowerPC: 440GRx Rainier board support.

2007-10-30 Thread Valentine Barshak
PowerPC 440GRx Rainier board support.

Signed-off-by: Valentine Barshak <[EMAIL PROTECTED]>
---
 arch/powerpc/platforms/44x/Kconfig   |   16 -
 arch/powerpc/platforms/44x/Makefile  |3 +
 arch/powerpc/platforms/44x/rainier.c |   61 +++
 3 files changed, 78 insertions(+), 2 deletions(-)

diff -pruN linux-2.6.orig/arch/powerpc/platforms/44x/Kconfig 
linux-2.6/arch/powerpc/platforms/44x/Kconfig
--- linux-2.6.orig/arch/powerpc/platforms/44x/Kconfig   2007-10-30 
17:44:42.0 +0300
+++ linux-2.6/arch/powerpc/platforms/44x/Kconfig2007-10-30 
18:04:28.0 +0300
@@ -22,6 +22,14 @@ config SEQUOIA
help
  This option enables support for the AMCC PPC440EPX evaluation board.
 
+config RAINIER
+   bool "Rainier"
+   depends on 44x
+   default n
+   select 440GRX
+   help
+ This option enables support for the AMCC PPC440GRX evaluation board.
+
 #config LUAN
 #  bool "Luan"
 #  depends on 44x
@@ -52,6 +60,12 @@ config 440EPX
select IBM_NEW_EMAC_RGMII
select IBM_NEW_EMAC_ZMII
 
+config 440GRX
+   bool
+   select IBM_NEW_EMAC_EMAC4
+   select IBM_NEW_EMAC_RGMII
+   select IBM_NEW_EMAC_ZMII
+
 config 440GP
bool
select IBM_NEW_EMAC_ZMII
@@ -64,7 +78,7 @@ config 440SP
 
 config 440A
bool
-   depends on 440GX || 440EPX
+   depends on 440GX || 440EPX || 440GRX
default y
 
 # 44x errata/workaround config symbols, selected by the CPU models above
diff -pruN linux-2.6.orig/arch/powerpc/platforms/44x/Makefile 
linux-2.6/arch/powerpc/platforms/44x/Makefile
--- linux-2.6.orig/arch/powerpc/platforms/44x/Makefile  2007-10-30 
17:44:42.0 +0300
+++ linux-2.6/arch/powerpc/platforms/44x/Makefile   2007-10-30 
18:00:15.0 +0300
@@ -1,4 +1,5 @@
 obj-$(CONFIG_44x)  := misc_44x.o
 obj-$(CONFIG_EBONY)+= ebony.o
-obj-$(CONFIG_BAMBOO) += bamboo.o
+obj-$(CONFIG_BAMBOO)   += bamboo.o
 obj-$(CONFIG_SEQUOIA)  += sequoia.o
+obj-$(CONFIG_RAINIER)  += rainier.o
diff -pruN linux-2.6.orig/arch/powerpc/platforms/44x/rainier.c 
linux-2.6/arch/powerpc/platforms/44x/rainier.c
--- linux-2.6.orig/arch/powerpc/platforms/44x/rainier.c 1970-01-01 
03:00:00.0 +0300
+++ linux-2.6/arch/powerpc/platforms/44x/rainier.c  2007-10-30 
18:00:15.0 +0300
@@ -0,0 +1,61 @@
+/*
+ * Rainier board specific routines
+ *
+ * Valentine Barshak <[EMAIL PROTECTED]>
+ * Copyright 2007 MontaVista Software Inc.
+ *
+ * Based on the Bamboo code by
+ * Josh Boyer <[EMAIL PROTECTED]>
+ * 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 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include "44x.h"
+
+static struct of_device_id rainier_of_bus[] = {
+   { .compatible = "ibm,plb4", },
+   { .compatible = "ibm,opb", },
+   { .compatible = "ibm,ebc", },
+   {},
+};
+
+static int __init rainier_device_probe(void)
+{
+   if (!machine_is(rainier))
+   return 0;
+
+   of_platform_bus_probe(NULL, rainier_of_bus, NULL);
+
+   return 0;
+}
+device_initcall(rainier_device_probe);
+
+static int __init rainier_probe(void)
+{
+   unsigned long root = of_get_flat_dt_root();
+
+   if (!of_flat_dt_is_compatible(root, "amcc,rainier"))
+   return 0;
+
+   return 1;
+}
+
+define_machine(rainier) {
+   .name   = "Rainier",
+   .probe  = rainier_probe,
+   .progress   = udbg_progress,
+   .init_IRQ   = uic_init_tree,
+   .get_irq= uic_get_irq,
+   .restart= ppc44x_reset_system,
+   .calibrate_decr = generic_calibrate_decr,
+};
___
Linuxppc-dev mailing list
Linuxppc-dev@ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-dev