Commit 5c8495d2 authored by Josh Boyer's avatar Josh Boyer
Browse files

powerpc/44x: Migrate Rainier support to ppc44x_simple 



Migrate the AMCC Rainier board to use the ppc44x_simple platform file.

Signed-off-by: default avatarJosh Boyer <jwboyer@linux.vnet.ibm.com>
parent cfcf81ba

arch/powerpc/platforms/44x/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -60,6 +60,7 @@ config RAINIER 
	bool "Rainier"

	bool "Rainier"

	depends on 44x

	depends on 44x

	default n

	default n

	select PPC44x_SIMPLE

	select 440GRX

	select 440GRX

	select PCI

	select PCI

	help

	help

arch/powerpc/platforms/44x/Makefile

+0 −1
Original line number Original line Diff line number Diff line
@@ -4,7 +4,6 @@ obj-$(CONFIG_EBONY) += ebony.o 
obj-$(CONFIG_TAISHAN)	+= taishan.o

obj-$(CONFIG_TAISHAN)	+= taishan.o

obj-$(CONFIG_SAM440EP) 	+= sam440ep.o

obj-$(CONFIG_SAM440EP) 	+= sam440ep.o

obj-$(CONFIG_SEQUOIA)	+= sequoia.o

obj-$(CONFIG_SEQUOIA)	+= sequoia.o

obj-$(CONFIG_RAINIER)	+= rainier.o

obj-$(CONFIG_WARP)	+= warp.o

obj-$(CONFIG_WARP)	+= warp.o

obj-$(CONFIG_WARP)	+= warp-nand.o

obj-$(CONFIG_WARP)	+= warp-nand.o

obj-$(CONFIG_XILINX_VIRTEX_5_FXT) += virtex.o
 
obj-$(CONFIG_XILINX_VIRTEX_5_FXT) += virtex.o

arch/powerpc/platforms/44x/rainier.c

deleted100644 → 0
+0 −62
Original line number Original line Diff line number Diff line 
/*

 * Rainier board specific routines

 *

 * Valentine Barshak <vbarshak@ru.mvista.com>

 * Copyright 2007 MontaVista Software Inc.

 *

 * 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 <asm/pci-bridge.h>

#include <asm/ppc4xx.h>



static __initdata struct of_device_id rainier_of_bus[] = {

	{ .compatible = "ibm,plb4", },

	{ .compatible = "ibm,opb", },

	{ .compatible = "ibm,ebc", },

	{},

};



static int __init rainier_device_probe(void)

{

	of_platform_bus_probe(NULL, rainier_of_bus, NULL);



	return 0;

}

machine_device_initcall(rainier, rainier_device_probe);



static int __init rainier_probe(void)

{

	unsigned long root = of_get_flat_dt_root();



	if (!of_flat_dt_is_compatible(root, "amcc,rainier"))

		return 0;



	ppc_pci_flags = PPC_PCI_REASSIGN_ALL_RSRC;



	return 1;

}



define_machine(rainier) {

	.name 				= "Rainier",

	.probe 				= rainier_probe,

	.progress 			= udbg_progress,

	.init_IRQ 			= uic_init_tree,

	.get_irq 			= uic_get_irq,

	.restart			= ppc4xx_reset_system,

	.calibrate_decr			= generic_calibrate_decr,

};