git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
powerpc/44x: Migrate Sequoia support to ppc44x_simple
[pandora-kernel.git]
/
arch
/
powerpc
/
platforms
/
44x
/
taishan.c
diff --git
a/arch/powerpc/platforms/44x/taishan.c
b/arch/powerpc/platforms/44x/taishan.c
index
ca71666
..
49c78b2
100644
(file)
--- a/
arch/powerpc/platforms/44x/taishan.c
+++ b/
arch/powerpc/platforms/44x/taishan.c
@@
-29,10
+29,9
@@
#include <asm/time.h>
#include <asm/uic.h>
#include <asm/pci-bridge.h>
#include <asm/time.h>
#include <asm/uic.h>
#include <asm/pci-bridge.h>
+#include <asm/ppc4xx.h>
-#include "44x.h"
-
-static struct of_device_id taishan_of_bus[] = {
+static __initdata struct of_device_id taishan_of_bus[] = {
{ .compatible = "ibm,plb4", },
{ .compatible = "ibm,opb", },
{ .compatible = "ibm,ebc", },
{ .compatible = "ibm,plb4", },
{ .compatible = "ibm,opb", },
{ .compatible = "ibm,ebc", },
@@
-41,14
+40,11
@@
static struct of_device_id taishan_of_bus[] = {
static int __init taishan_device_probe(void)
{
static int __init taishan_device_probe(void)
{
- if (!machine_is(taishan))
- return 0;
-
of_platform_bus_probe(NULL, taishan_of_bus, NULL);
return 0;
}
of_platform_bus_probe(NULL, taishan_of_bus, NULL);
return 0;
}
-
device_initcall(
taishan_device_probe);
+
machine_device_initcall(taishan,
taishan_device_probe);
/*
* Called very early, MMU is off, device-tree isn't unflattened
/*
* Called very early, MMU is off, device-tree isn't unflattened
@@
-71,6
+67,6
@@
define_machine(taishan) {
.progress = udbg_progress,
.init_IRQ = uic_init_tree,
.get_irq = uic_get_irq,
.progress = udbg_progress,
.init_IRQ = uic_init_tree,
.get_irq = uic_get_irq,
- .restart = ppc4
4
x_reset_system,
+ .restart = ppc4
x
x_reset_system,
.calibrate_decr = generic_calibrate_decr,
};
.calibrate_decr = generic_calibrate_decr,
};