diff options
author | Josh Boyer <jwboyer@linux.vnet.ibm.com> | 2008-08-19 11:26:24 -0400 |
---|---|---|
committer | Josh Boyer <jwboyer@linux.vnet.ibm.com> | 2008-08-28 09:09:22 -0400 |
commit | 380c313ab301e9d35ead5cd9ead737682eba304b (patch) | |
tree | 5593b64245e2e4e943f2d04922111f2f0c999a8e /arch/powerpc/platforms/44x | |
parent | 775d5a110b8a0bc9a0ccf3b831a8991b6c1d84dd (diff) |
powerpc/44x: Migrate Bamboo support to ppc44x_simple
Migrate the AMCC Bamboo board to use the ppc44x_simple platform file.
Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
Diffstat (limited to 'arch/powerpc/platforms/44x')
-rw-r--r-- | arch/powerpc/platforms/44x/Kconfig | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/44x/Makefile | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/44x/bamboo.c | 62 |
3 files changed, 2 insertions, 64 deletions
diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig index 97c634c8f9da..0958285e110d 100644 --- a/arch/powerpc/platforms/44x/Kconfig +++ b/arch/powerpc/platforms/44x/Kconfig | |||
@@ -2,6 +2,7 @@ config BAMBOO | |||
2 | bool "Bamboo" | 2 | bool "Bamboo" |
3 | depends on 44x | 3 | depends on 44x |
4 | default n | 4 | default n |
5 | select PPC44x_SIMPLE | ||
5 | select 440EP | 6 | select 440EP |
6 | select PCI | 7 | select PCI |
7 | help | 8 | help |
@@ -90,6 +91,7 @@ config YOSEMITE | |||
90 | bool "Yosemite" | 91 | bool "Yosemite" |
91 | depends on 44x | 92 | depends on 44x |
92 | default n | 93 | default n |
94 | select PPC44x_SIMPLE | ||
93 | select 440EP | 95 | select 440EP |
94 | select PCI | 96 | select PCI |
95 | help | 97 | help |
diff --git a/arch/powerpc/platforms/44x/Makefile b/arch/powerpc/platforms/44x/Makefile index 73c1df5bc051..ca18a326f67a 100644 --- a/arch/powerpc/platforms/44x/Makefile +++ b/arch/powerpc/platforms/44x/Makefile | |||
@@ -2,8 +2,6 @@ obj-$(CONFIG_44x) := misc_44x.o idle.o | |||
2 | obj-$(CONFIG_PPC44x_SIMPLE) += ppc44x_simple.o | 2 | obj-$(CONFIG_PPC44x_SIMPLE) += ppc44x_simple.o |
3 | obj-$(CONFIG_EBONY) += ebony.o | 3 | obj-$(CONFIG_EBONY) += ebony.o |
4 | obj-$(CONFIG_TAISHAN) += taishan.o | 4 | obj-$(CONFIG_TAISHAN) += taishan.o |
5 | obj-$(CONFIG_BAMBOO) += bamboo.o | ||
6 | obj-$(CONFIG_YOSEMITE) += bamboo.o | ||
7 | obj-$(CONFIG_SAM440EP) += sam440ep.o | 5 | obj-$(CONFIG_SAM440EP) += sam440ep.o |
8 | obj-$(CONFIG_SEQUOIA) += sequoia.o | 6 | obj-$(CONFIG_SEQUOIA) += sequoia.o |
9 | obj-$(CONFIG_KATMAI) += katmai.o | 7 | obj-$(CONFIG_KATMAI) += katmai.o |
diff --git a/arch/powerpc/platforms/44x/bamboo.c b/arch/powerpc/platforms/44x/bamboo.c deleted file mode 100644 index cef169e95156..000000000000 --- a/arch/powerpc/platforms/44x/bamboo.c +++ /dev/null | |||
@@ -1,62 +0,0 @@ | |||
1 | /* | ||
2 | * Bamboo board specific routines | ||
3 | * | ||
4 | * Wade Farnsworth <wfarnsworth@mvista.com> | ||
5 | * Copyright 2004 MontaVista Software Inc. | ||
6 | * | ||
7 | * Rewritten and ported to the merged powerpc tree: | ||
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 | #include <asm/pci-bridge.h> | ||
25 | #include <asm/ppc4xx.h> | ||
26 | |||
27 | static __initdata struct of_device_id bamboo_of_bus[] = { | ||
28 | { .compatible = "ibm,plb4", }, | ||
29 | { .compatible = "ibm,opb", }, | ||
30 | { .compatible = "ibm,ebc", }, | ||
31 | {}, | ||
32 | }; | ||
33 | |||
34 | static int __init bamboo_device_probe(void) | ||
35 | { | ||
36 | of_platform_bus_probe(NULL, bamboo_of_bus, NULL); | ||
37 | |||
38 | return 0; | ||
39 | } | ||
40 | machine_device_initcall(bamboo, bamboo_device_probe); | ||
41 | |||
42 | static int __init bamboo_probe(void) | ||
43 | { | ||
44 | unsigned long root = of_get_flat_dt_root(); | ||
45 | |||
46 | if (!of_flat_dt_is_compatible(root, "amcc,bamboo")) | ||
47 | return 0; | ||
48 | |||
49 | ppc_pci_flags = PPC_PCI_REASSIGN_ALL_RSRC; | ||
50 | |||
51 | return 1; | ||
52 | } | ||
53 | |||
54 | define_machine(bamboo) { | ||
55 | .name = "Bamboo", | ||
56 | .probe = bamboo_probe, | ||
57 | .progress = udbg_progress, | ||
58 | .init_IRQ = uic_init_tree, | ||
59 | .get_irq = uic_get_irq, | ||
60 | .restart = ppc4xx_reset_system, | ||
61 | .calibrate_decr = generic_calibrate_decr, | ||
62 | }; | ||