Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=545c069ccd76a0f1f3ceacd8ba5bc8f5208eb727
Commit:     545c069ccd76a0f1f3ceacd8ba5bc8f5208eb727
Parent:     7f2814d229905c35d7c38798891adf00286fdca4
Author:     Josh Boyer <[EMAIL PROTECTED]>
AuthorDate: Fri Sep 7 07:51:24 2007 -0500
Committer:  Josh Boyer <[EMAIL PROTECTED]>
CommitDate: Fri Sep 7 07:51:24 2007 -0500

    [POWERPC] Walnut board support
    
    Board support for the PPC405 Walnut evaluation board
    
    Signed-off-by: Josh Boyer <[EMAIL PROTECTED]>
    Acked-by: David Gibson <[EMAIL PROTECTED]>
---
 arch/powerpc/platforms/40x/Kconfig  |   14 ++++----
 arch/powerpc/platforms/40x/Makefile |    2 +-
 arch/powerpc/platforms/40x/walnut.c |   68 +++++++++++++++++++++++++++++++++++
 arch/powerpc/platforms/Kconfig      |    2 +-
 arch/powerpc/platforms/Makefile     |    2 +-
 5 files changed, 78 insertions(+), 10 deletions(-)

diff --git a/arch/powerpc/platforms/40x/Kconfig 
b/arch/powerpc/platforms/40x/Kconfig
index 2cc7343..c3dce3b 100644
--- a/arch/powerpc/platforms/40x/Kconfig
+++ b/arch/powerpc/platforms/40x/Kconfig
@@ -53,13 +53,13 @@
 #      help
 #        This option enables support for the IBM PPC405GPr evaluation board.
 
-#config WALNUT
-#      bool "Walnut"
-#      depends on 40x
-#      default y
-#      select 405GP
-#      help
-#        This option enables support for the IBM PPC405GP evaluation board.
+config WALNUT
+       bool "Walnut"
+       depends on 40x
+       default y
+       select 405GP
+       help
+         This option enables support for the IBM PPC405GP evaluation board.
 
 #config XILINX_ML300
 #      bool "Xilinx-ML300"
diff --git a/arch/powerpc/platforms/40x/Makefile 
b/arch/powerpc/platforms/40x/Makefile
index 79ff6b1..e6c0bbd 100644
--- a/arch/powerpc/platforms/40x/Makefile
+++ b/arch/powerpc/platforms/40x/Makefile
@@ -1 +1 @@
-# empty makefile so make clean works
\ No newline at end of file
+obj-$(CONFIG_WALNUT) += walnut.o
diff --git a/arch/powerpc/platforms/40x/walnut.c 
b/arch/powerpc/platforms/40x/walnut.c
new file mode 100644
index 0000000..c17fdf2
--- /dev/null
+++ b/arch/powerpc/platforms/40x/walnut.c
@@ -0,0 +1,68 @@
+/*
+ * Architecture- / platform-specific boot-time initialization code for
+ * IBM PowerPC 4xx based boards. Adapted from original
+ * code by Gary Thomas, Cort Dougan <[EMAIL PROTECTED]>, and Dan Malek
+ * <[EMAIL PROTECTED]>.
+ *
+ * Copyright(c) 1999-2000 Grant Erickson <[EMAIL PROTECTED]>
+ *
+ * Rewritten and ported to the merged powerpc tree:
+ * Copyright 2007 IBM Corporation
+ * Josh Boyer <[EMAIL PROTECTED]>
+ *
+ * 2002 (c) MontaVista, Software, Inc.  This file is licensed under
+ * the terms of the GNU General Public License version 2.  This program
+ * is licensed "as is" without any warranty of any kind, whether express
+ * or implied.
+ */
+
+#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 walnut_of_bus[] = {
+       { .compatible = "ibm,plb3", },
+       { .compatible = "ibm,opb", },
+       { .compatible = "ibm,ebc", },
+       {},
+};
+
+static int __init walnut_device_probe(void)
+{
+       if (!machine_is(walnut))
+               return 0;
+
+       /* FIXME: do bus probe here */
+       of_platform_bus_probe(NULL, walnut_of_bus, NULL);
+
+       return 0;
+}
+device_initcall(walnut_device_probe);
+
+static int __init walnut_probe(void)
+{
+       unsigned long root = of_get_flat_dt_root();
+
+       if (!of_flat_dt_is_compatible(root, "ibm,walnut"))
+               return 0;
+
+       return 1;
+}
+
+static void __init walnut_setup_arch(void)
+{
+}
+
+define_machine(walnut) {
+       .name                   = "Walnut",
+       .probe                  = walnut_probe,
+       .setup_arch             = walnut_setup_arch,
+       .progress               = udbg_progress,
+       .init_IRQ               = uic_init_tree,
+       .get_irq                = uic_get_irq,
+       .calibrate_decr = generic_calibrate_decr,
+};
diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index 041df77..8eb8d40 100644
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@ -59,7 +59,7 @@ source "arch/powerpc/platforms/85xx/Kconfig"
 source "arch/powerpc/platforms/86xx/Kconfig"
 source "arch/powerpc/platforms/embedded6xx/Kconfig"
 source "arch/powerpc/platforms/44x/Kconfig"
-#source "arch/powerpc/platforms/4xx/Kconfig
+source "arch/powerpc/platforms/40x/Kconfig"
 
 config PPC_NATIVE
        bool
diff --git a/arch/powerpc/platforms/Makefile b/arch/powerpc/platforms/Makefile
index d44e832..6d9079d 100644
--- a/arch/powerpc/platforms/Makefile
+++ b/arch/powerpc/platforms/Makefile
@@ -9,7 +9,7 @@ obj-$(CONFIG_PPC_PMAC)          += powermac/
 endif
 endif
 obj-$(CONFIG_PPC_CHRP)         += chrp/
-#obj-$(CONFIG_4xx)             += 4xx/
+obj-$(CONFIG_40x)              += 40x/
 obj-$(CONFIG_44x)              += 44x/
 obj-$(CONFIG_PPC_MPC52xx)      += 52xx/
 obj-$(CONFIG_PPC_8xx)          += 8xx/
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to