lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

powerpc/44x: Migrate Taishan support to ppc44x_simple

Browse Source 
Migrate the AMCC Taishan board to use the ppc44x_simple platform file.

Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
This commit is contained in:
Josh Boyer
2008-08-19 11:26:53 -04:00
parent 427e817df4
commit 4f19a897c7
3 changed files with 1 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/powerpc/platforms/44x/Kconfig
View File

@@ -40,6 +40,7 @@ config TAISHAN
bool "Taishan" bool "Taishan"
depends on 44x depends on 44x
default n default n
select PPC44x_SIMPLE
select 440GX select 440GX
select PCI select PCI
help help

1
arch/powerpc/platforms/44x/Makefile
View File

@@ -1,7 +1,6 @@
obj-$(CONFIG_44x) := misc_44x.o idle.o obj-$(CONFIG_44x) := misc_44x.o idle.o
obj-$(CONFIG_PPC44x_SIMPLE) += ppc44x_simple.o obj-$(CONFIG_PPC44x_SIMPLE) += ppc44x_simple.o
obj-$(CONFIG_EBONY) += ebony.o obj-$(CONFIG_EBONY) += ebony.o
obj-$(CONFIG_TAISHAN) += taishan.o
obj-$(CONFIG_SAM440EP) += sam440ep.o obj-$(CONFIG_SAM440EP) += sam440ep.o
obj-$(CONFIG_WARP) += warp.o obj-$(CONFIG_WARP) += warp.o
obj-$(CONFIG_WARP) += warp-nand.o obj-$(CONFIG_WARP) += warp-nand.o

72
arch/powerpc/platforms/44x/taishan.c
View File

@@ -1,72 +0,0 @@
/*
* Taishan board specific routines based off ebony.c code
* original copyrights below
*
* Matt Porter <mporter@kernel.crashing.org>
* Copyright 2002-2005 MontaVista Software Inc.
*
* Eugene Surovegin <eugene.surovegin@zultys.com> or <ebs@ebshome.net>
* Copyright (c) 2003-2005 Zultys Technologies
*
* Rewritten and ported to the merged powerpc tree:
* Copyright 2007 David Gibson <dwg@au1.ibm.com>, IBM Corporation.
*
* Modified from ebony.c for taishan:
* Copyright 2007 Hugh Blemings <hugh@au.ibm.com>, 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 taishan_of_bus[] = {
{ .compatible = "ibm,plb4", },
{ .compatible = "ibm,opb", },
{ .compatible = "ibm,ebc", },
{},
};
static int __init taishan_device_probe(void)
{
of_platform_bus_probe(NULL, taishan_of_bus, NULL);
return 0;
}
machine_device_initcall(taishan, taishan_device_probe);
/*
* Called very early, MMU is off, device-tree isn't unflattened
*/
static int __init taishan_probe(void)
{
unsigned long root = of_get_flat_dt_root();
if (!of_flat_dt_is_compatible(root, "amcc,taishan"))
return 0;
ppc_pci_flags = PPC_PCI_REASSIGN_ALL_RSRC;
return 1;
}
define_machine(taishan) {
.name = "Taishan",
.probe = taishan_probe,
.progress = udbg_progress,
.init_IRQ = uic_init_tree,
.get_irq = uic_get_irq,
.restart = ppc4xx_reset_system,
.calibrate_decr = generic_calibrate_decr,
};