Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=15fc993e31293f9b179eb5f08b18a4a4f2ca648a
Commit:     15fc993e31293f9b179eb5f08b18a4a4f2ca648a
Parent:     38a5d6c9e79c2dbf3b23fb6fe8c2b51551bc9ee3
Author:     Valentine Barshak <[EMAIL PROTECTED]>
AuthorDate: Wed Aug 29 17:40:30 2007 +0400
Committer:  Josh Boyer <[EMAIL PROTECTED]>
CommitDate: Fri Sep 7 07:49:13 2007 -0500

    [POWERPC] PowerPC 440EPx: Sequoia board support
    
    AMCC PPC440EPx Sequoia board support.
    
    Signed-off-by: Valentine Barshak <[EMAIL PROTECTED]>
    Acked-by: David Gibson <[EMAIL PROTECTED]>
    Signed-off-by: Josh Boyer <[EMAIL PROTECTED]>
---
 arch/powerpc/kernel/cputable.c       |   18 +++++++++
 arch/powerpc/kernel/head_44x.S       |    2 +-
 arch/powerpc/platforms/44x/Kconfig   |   17 ++++++++-
 arch/powerpc/platforms/44x/Makefile  |    1 +
 arch/powerpc/platforms/44x/sequoia.c |   66 ++++++++++++++++++++++++++++++++++
 5 files changed, 102 insertions(+), 2 deletions(-)

diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c
index b1f8000..5873073 100644
--- a/arch/powerpc/kernel/cputable.c
+++ b/arch/powerpc/kernel/cputable.c
@@ -1132,6 +1132,24 @@ static struct cpu_spec cpu_specs[] = {
                .dcache_bsize           = 32,
                .platform               = "ppc440",
        },
+       { /* 440EPX */
+               .pvr_mask               = 0xf0000ffb,
+               .pvr_value              = 0x200008D0,
+               .cpu_name               = "440EPX",
+               .cpu_features           = CPU_FTRS_44X,
+               .cpu_user_features      = COMMON_USER_BOOKE | 
PPC_FEATURE_HAS_FPU,
+               .icache_bsize           = 32,
+               .dcache_bsize           = 32,
+       },
+       { /* 440GRX */
+               .pvr_mask               = 0xf0000ffb,
+               .pvr_value              = 0x200008D8,
+               .cpu_name               = "440GRX",
+               .cpu_features           = CPU_FTRS_44X,
+               .cpu_user_features      = COMMON_USER_BOOKE,
+               .icache_bsize           = 32,
+               .dcache_bsize           = 32,
+       },
        {       /* 440GP Rev. B */
                .pvr_mask               = 0xf0000fff,
                .pvr_value              = 0x40000440,
diff --git a/arch/powerpc/kernel/head_44x.S b/arch/powerpc/kernel/head_44x.S
index 8869596..e26d26e 100644
--- a/arch/powerpc/kernel/head_44x.S
+++ b/arch/powerpc/kernel/head_44x.S
@@ -217,7 +217,7 @@ skpinv:     addi    r4,r4,1                         /* 
Increment */
        lis     r4,[EMAIL PROTECTED]    /* IVPR only uses the high 16-bits */
        mtspr   SPRN_IVPR,r4
 
-#ifdef CONFIG_440EP
+#if defined(CONFIG_440EP) || defined(CONFIG_440EPX)
        /* Clear DAPUIB flag in CCR0 (enable APU between CPU and FPU) */
        mfspr   r2,SPRN_CCR0
        lis     r3,0xffef
diff --git a/arch/powerpc/platforms/44x/Kconfig 
b/arch/powerpc/platforms/44x/Kconfig
index c7cc12a..f28acdc 100644
--- a/arch/powerpc/platforms/44x/Kconfig
+++ b/arch/powerpc/platforms/44x/Kconfig
@@ -14,6 +14,14 @@ config EBONY
        help
          This option enables support for the IBM PPC440GP evaluation board.
 
+config SEQUOIA
+       bool "Sequoia"
+       depends on 44x
+       default n
+       select 440EPX
+       help
+         This option enables support for the AMCC PPC440EPX evaluation board.
+
 #config LUAN
 #      bool "Luan"
 #      depends on 44x
@@ -37,6 +45,13 @@ config 440EP
        select IBM440EP_ERR42
 #      select IBM_NEW_EMAC_ZMII
 
+config 440EPX
+       bool
+       select PPC_FPU
+# Disabled until the new EMAC Driver is merged.
+#      select IBM_NEW_EMAC_EMAC4
+#      select IBM_NEW_EMAC_ZMII
+
 config 440GP
        bool
 # Disabled until the new EMAC Driver is merged.
@@ -50,7 +65,7 @@ config 440SP
 
 config 440A
        bool
-       depends on 440GX
+       depends on 440GX || 440EPX
        default y
 
 # 44x errata/workaround config symbols, selected by the CPU models above
diff --git a/arch/powerpc/platforms/44x/Makefile 
b/arch/powerpc/platforms/44x/Makefile
index 47ccc36..10ce674 100644
--- a/arch/powerpc/platforms/44x/Makefile
+++ b/arch/powerpc/platforms/44x/Makefile
@@ -1,3 +1,4 @@
 obj-$(CONFIG_44x)      := misc_44x.o
 obj-$(CONFIG_EBONY)    += ebony.o
 obj-$(CONFIG_BAMBOO) += bamboo.o
+obj-$(CONFIG_SEQUOIA)  += sequoia.o
diff --git a/arch/powerpc/platforms/44x/sequoia.c 
b/arch/powerpc/platforms/44x/sequoia.c
new file mode 100644
index 0000000..7d0d9d5
--- /dev/null
+++ b/arch/powerpc/platforms/44x/sequoia.c
@@ -0,0 +1,66 @@
+/*
+ * Sequoia 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 <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>
+#include "44x.h"
+
+static struct of_device_id sequoia_of_bus[] = {
+       { .compatible = "ibm,plb4", },
+       { .compatible = "ibm,opb", },
+       { .compatible = "ibm,ebc", },
+       {},
+};
+
+static int __init sequoia_device_probe(void)
+{
+       if (!machine_is(sequoia))
+               return 0;
+
+       of_platform_bus_probe(NULL, sequoia_of_bus, NULL);
+
+       return 0;
+}
+device_initcall(sequoia_device_probe);
+
+static int __init sequoia_probe(void)
+{
+       unsigned long root = of_get_flat_dt_root();
+
+       if (!of_flat_dt_is_compatible(root, "amcc,sequoia"))
+               return 0;
+
+       return 1;
+}
+
+static void __init sequoia_setup_arch(void)
+{
+}
+
+define_machine(sequoia) {
+       .name                           = "Sequoia",
+       .probe                          = sequoia_probe,
+       .setup_arch                     = sequoia_setup_arch,
+       .progress                       = udbg_progress,
+       .init_IRQ                       = uic_init_tree,
+       .get_irq                        = uic_get_irq,
+       .restart                        = ppc44x_reset_system,
+       .calibrate_decr                 = generic_calibrate_decr,
+};
-
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