powerpc/44x: Migrate Canyonlands support to ppc44x_simple
Migrate the AMCC Canyonlands board to use the ppc44x_simple platform file. Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
This commit is contained in:
parent
380c313ab3
commit
aaf136c29d
@ -81,6 +81,7 @@ config CANYONLANDS
|
||||
bool "Canyonlands"
|
||||
depends on 44x
|
||||
default n
|
||||
select PPC44x_SIMPLE
|
||||
select 460EX
|
||||
select PCI
|
||||
select PPC4xx_PCI_EXPRESS
|
||||
|
@ -8,5 +8,4 @@ obj-$(CONFIG_KATMAI) += katmai.o
|
||||
obj-$(CONFIG_RAINIER) += rainier.o
|
||||
obj-$(CONFIG_WARP) += warp.o
|
||||
obj-$(CONFIG_WARP) += warp-nand.o
|
||||
obj-$(CONFIG_CANYONLANDS) += canyonlands.o
|
||||
obj-$(CONFIG_XILINX_VIRTEX_5_FXT) += virtex.o
|
||||
|
@ -1,63 +0,0 @@
|
||||
/*
|
||||
* Canyonlands board specific routines
|
||||
*
|
||||
* Copyright 2008 DENX Software Engineering, Stefan Roese <sr@denx.de>
|
||||
*
|
||||
* Based on the Katmai code by
|
||||
* Benjamin Herrenschmidt <benh@kernel.crashing.org>
|
||||
* Copyright 2007 IBM Corp.
|
||||
* 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 <asm/pci-bridge.h>
|
||||
#include <asm/ppc4xx.h>
|
||||
|
||||
static __initdata struct of_device_id canyonlands_of_bus[] = {
|
||||
{ .compatible = "ibm,plb4", },
|
||||
{ .compatible = "ibm,opb", },
|
||||
{ .compatible = "ibm,ebc", },
|
||||
{},
|
||||
};
|
||||
|
||||
static int __init canyonlands_device_probe(void)
|
||||
{
|
||||
of_platform_bus_probe(NULL, canyonlands_of_bus, NULL);
|
||||
|
||||
return 0;
|
||||
}
|
||||
machine_device_initcall(canyonlands, canyonlands_device_probe);
|
||||
|
||||
static int __init canyonlands_probe(void)
|
||||
{
|
||||
unsigned long root = of_get_flat_dt_root();
|
||||
|
||||
if (!of_flat_dt_is_compatible(root, "amcc,canyonlands"))
|
||||
return 0;
|
||||
|
||||
ppc_pci_flags = PPC_PCI_REASSIGN_ALL_RSRC;
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
define_machine(canyonlands) {
|
||||
.name = "Canyonlands",
|
||||
.probe = canyonlands_probe,
|
||||
.progress = udbg_progress,
|
||||
.init_IRQ = uic_init_tree,
|
||||
.get_irq = uic_get_irq,
|
||||
.restart = ppc4xx_reset_system,
|
||||
.calibrate_decr = generic_calibrate_decr,
|
||||
};
|
Loading…
Reference in New Issue
Block a user