[POWERPC] 4xx: Base support for 440SPe "Katmai" eval board

This adds base support for the Katmai board, including PCI-X and PCI-Express (but no RTC, nvram, etc... yet). Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Acked-by: Stefan Roese <sr@denx.de> Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
author: Benjamin Herrenschmidt <benh@kernel.crashing.org> 2007-12-20 23:39:34 -0500
committer: Josh Boyer <jwboyer@linux.vnet.ibm.com> 2007-12-23 14:14:57 -0500
commit: 3de9c9cd22c69c6aa2e17d4dcf55dcf1260b5718 (patch)
tree: 1bb1665e7eda052017cd4b0c53a699883aa30691 /arch/powerpc/platforms/44x
parent: 190de005384204ba4dc339c3d05f8d40f6b16643 (diff)
3 files changed, 79 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig
index f9f65f90c9c2..3700c6aca782 100644
--- a/arch/powerpc/platforms/44x/Kconfig
+++ b/arch/powerpc/platforms/44x/Kconfig
@@ -34,6 +34,16 @@ config TAISHAN
          This option enables support for the AMCC PPC440GX "Taishan"
          evaluation board.
+config KATMAI
+        bool "Katmai"
+        depends on 44x
+        default n
+        select 440SPe
+        select PCI
+        select PPC4xx_PCI_EXPRESS
+        help
+          This option enables support for the AMCC PPC440SPe evaluation board.
 #config LUAN
 #       bool "Luan"
 #       depends on 44x
@@ -78,6 +88,10 @@ config 440GX
 config 440SP
        bool
+config 440SPe
+        select IBM_NEW_EMAC_EMAC4
+        bool
 # 44x errata/workaround config symbols, selected by the CPU models above
 config IBM440EP_ERR42
        bool
diff --git a/arch/powerpc/platforms/44x/Makefile b/arch/powerpc/platforms/44x/Makefile
index 8b05589471d2..6f77034f421e 100644
--- a/arch/powerpc/platforms/44x/Makefile
+++ b/arch/powerpc/platforms/44x/Makefile
@@ -1,5 +1,6 @@
 obj-$(CONFIG_44x)       := misc_44x.o
 obj-$(CONFIG_EBONY)     += ebony.o
 obj-$(CONFIG_TAISHAN)   += taishan.o
-obj-$(CONFIG_BAMBOO) += bamboo.o
+obj-$(CONFIG_BAMBOO)    += bamboo.o
 obj-$(CONFIG_SEQUOIA)   += sequoia.o
+obj-$(CONFIG_KATMAI)    += katmai.o
diff --git a/arch/powerpc/platforms/44x/katmai.c b/arch/powerpc/platforms/44x/katmai.c
new file mode 100644
index 000000000000..fd737d10f6e4
--- /dev/null
+++ b/arch/powerpc/platforms/44x/katmai.c
@@ -0,0 +1,63 @@
+/*
+ * Katmai board specific routines
+ *
+ * Benjamin Herrenschmidt <benh@kernel.crashing.org>
+ * Copyright 2007 IBM Corp.
+ *
+ * Based on the Bamboo 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 <linux/of_platform.h>
+#include <asm/machdep.h>
+#include <asm/prom.h>
+#include <asm/udbg.h>
+#include <asm/time.h>
+#include <asm/uic.h>
+#include "44x.h"
+static struct of_device_id katmai_of_bus[] = {
+        { .compatible = "ibm,plb4", },
+        { .compatible = "ibm,opb", },
+        { .compatible = "ibm,ebc", },
+        {},
+};
+static int __init katmai_device_probe(void)
+{
+        if (!machine_is(katmai))
+                return 0;
+        of_platform_bus_probe(NULL, katmai_of_bus, NULL);
+        return 0;
+}
+device_initcall(katmai_device_probe);
+static int __init katmai_probe(void)
+{
+        unsigned long root = of_get_flat_dt_root();
+        if (!of_flat_dt_is_compatible(root, "amcc,katmai"))
+                return 0;
+        return 1;
+}
+define_machine(katmai) {
+        .name                           = "Katmai",
+        .probe                          = katmai_probe,
+        .progress                       = udbg_progress,
+        .init_IRQ                       = uic_init_tree,
+        .get_irq                        = uic_get_irq,
+        .restart                        = ppc44x_reset_system,
+        .calibrate_decr                 = generic_calibrate_decr,
+};
author	Benjamin Herrenschmidt <benh@kernel.crashing.org>	2007-12-20 23:39:34 -0500
committer	Josh Boyer <jwboyer@linux.vnet.ibm.com>	2007-12-23 14:14:57 -0500
commit	3de9c9cd22c69c6aa2e17d4dcf55dcf1260b5718 (patch)
tree	1bb1665e7eda052017cd4b0c53a699883aa30691 /arch/powerpc/platforms/44x
parent	190de005384204ba4dc339c3d05f8d40f6b16643 (diff)

diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig index f9f65f90c9c2..3700c6aca782 100644 --- a/arch/powerpc/platforms/44x/Kconfig +++ b/arch/powerpc/platforms/44x/Kconfig
@@ -34,6 +34,16 @@ config TAISHAN
34	This option enables support for the AMCC PPC440GX "Taishan"	34	This option enables support for the AMCC PPC440GX "Taishan"
35	evaluation board.	35	evaluation board.
36		36
		37	config KATMAI
		38	bool "Katmai"
		39	depends on 44x
		40	default n
		41	select 440SPe
		42	select PCI
		43	select PPC4xx_PCI_EXPRESS
		44	help
		45	This option enables support for the AMCC PPC440SPe evaluation board.
		46
37	#config LUAN	47	#config LUAN
38	# bool "Luan"	48	# bool "Luan"
39	# depends on 44x	49	# depends on 44x
@@ -78,6 +88,10 @@ config 440GX
78	config 440SP	88	config 440SP
79	bool	89	bool
80		90
		91	config 440SPe
		92	select IBM_NEW_EMAC_EMAC4
		93	bool
		94
81	# 44x errata/workaround config symbols, selected by the CPU models above	95	# 44x errata/workaround config symbols, selected by the CPU models above
82	config IBM440EP_ERR42	96	config IBM440EP_ERR42
83	bool	97	bool


diff --git a/arch/powerpc/platforms/44x/Makefile b/arch/powerpc/platforms/44x/Makefile index 8b05589471d2..6f77034f421e 100644 --- a/arch/powerpc/platforms/44x/Makefile +++ b/arch/powerpc/platforms/44x/Makefile
@@ -1,5 +1,6 @@
1	obj-$(CONFIG_44x) := misc_44x.o	1	obj-$(CONFIG_44x) := misc_44x.o
2	obj-$(CONFIG_EBONY) += ebony.o	2	obj-$(CONFIG_EBONY) += ebony.o
3	obj-$(CONFIG_TAISHAN) += taishan.o	3	obj-$(CONFIG_TAISHAN) += taishan.o
4	obj-$(CONFIG_BAMBOO) += bamboo.o	4	obj-$(CONFIG_BAMBOO) += bamboo.o
5	obj-$(CONFIG_SEQUOIA) += sequoia.o	5	obj-$(CONFIG_SEQUOIA) += sequoia.o
		6	obj-$(CONFIG_KATMAI) += katmai.o


diff --git a/arch/powerpc/platforms/44x/katmai.c b/arch/powerpc/platforms/44x/katmai.c new file mode 100644 index 000000000000..fd737d10f6e4 --- /dev/null +++ b/arch/powerpc/platforms/44x/katmai.c
@@ -0,0 +1,63 @@
		1	/*
		2	* Katmai board specific routines
		3	*
		4	* Benjamin Herrenschmidt <benh@kernel.crashing.org>
		5	* Copyright 2007 IBM Corp.
		6	*
		7	* Based on the Bamboo code by
		8	* Josh Boyer <jwboyer@linux.vnet.ibm.com>
		9	* Copyright 2007 IBM Corporation
		10	*
		11	* This program is free software; you can redistribute it and/or modify it
		12	* under the terms of the GNU General Public License as published by the
		13	* Free Software Foundation; either version 2 of the License, or (at your
		14	* option) any later version.
		15	*/
		16	#include <linux/init.h>
		17	#include <linux/of_platform.h>
		18
		19	#include <asm/machdep.h>
		20	#include <asm/prom.h>
		21	#include <asm/udbg.h>
		22	#include <asm/time.h>
		23	#include <asm/uic.h>
		24
		25	#include "44x.h"
		26
		27	static struct of_device_id katmai_of_bus[] = {
		28	{ .compatible = "ibm,plb4", },
		29	{ .compatible = "ibm,opb", },
		30	{ .compatible = "ibm,ebc", },
		31	{},
		32	};
		33
		34	static int __init katmai_device_probe(void)
		35	{
		36	if (!machine_is(katmai))
		37	return 0;
		38
		39	of_platform_bus_probe(NULL, katmai_of_bus, NULL);
		40
		41	return 0;
		42	}
		43	device_initcall(katmai_device_probe);
		44
		45	static int __init katmai_probe(void)
		46	{
		47	unsigned long root = of_get_flat_dt_root();
		48
		49	if (!of_flat_dt_is_compatible(root, "amcc,katmai"))
		50	return 0;
		51
		52	return 1;
		53	}
		54
		55	define_machine(katmai) {
		56	.name = "Katmai",
		57	.probe = katmai_probe,
		58	.progress = udbg_progress,
		59	.init_IRQ = uic_init_tree,
		60	.get_irq = uic_get_irq,
		61	.restart = ppc44x_reset_system,
		62	.calibrate_decr = generic_calibrate_decr,
		63	};