Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 380c313a authored by Josh Boyer's avatar Josh Boyer
Browse files

powerpc/44x: Migrate Bamboo support to ppc44x_simple 



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

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

arch/powerpc/platforms/44x/Kconfig

+2 −0
Original line number Original line Diff line number Diff line
@@ -2,6 +2,7 @@ config BAMBOO 
	bool "Bamboo"

	bool "Bamboo"

	depends on 44x

	depends on 44x

	default n

	default n

	select PPC44x_SIMPLE

	select 440EP

	select 440EP

	select PCI

	select PCI

	help

	help
@@ -90,6 +91,7 @@ config YOSEMITE 
	bool "Yosemite"

	bool "Yosemite"

	depends on 44x

	depends on 44x

	default n

	default n

	select PPC44x_SIMPLE

	select 440EP

	select 440EP

	select PCI

	select PCI

	help

	help

arch/powerpc/platforms/44x/Makefile

+0 −2
Original line number Original line Diff line number Diff line
@@ -2,8 +2,6 @@ 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_TAISHAN)	+= taishan.o

obj-$(CONFIG_BAMBOO)	+= bamboo.o

obj-$(CONFIG_YOSEMITE)	+= bamboo.o

obj-$(CONFIG_SAM440EP) 	+= sam440ep.o

obj-$(CONFIG_SAM440EP) 	+= sam440ep.o

obj-$(CONFIG_SEQUOIA)	+= sequoia.o

obj-$(CONFIG_SEQUOIA)	+= sequoia.o

obj-$(CONFIG_KATMAI)	+= katmai.o

obj-$(CONFIG_KATMAI)	+= katmai.o

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

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

 * Bamboo board specific routines

 *

 * Wade Farnsworth <wfarnsworth@mvista.com>

 * Copyright 2004 MontaVista Software Inc.

 *

 * Rewritten and ported to the merged powerpc tree:

 * 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 bamboo_of_bus[] = {

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

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

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

	{},

};



static int __init bamboo_device_probe(void)

{

	of_platform_bus_probe(NULL, bamboo_of_bus, NULL);



	return 0;

}

machine_device_initcall(bamboo, bamboo_device_probe);



static int __init bamboo_probe(void)

{

	unsigned long root = of_get_flat_dt_root();



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

		return 0;



	ppc_pci_flags = PPC_PCI_REASSIGN_ALL_RSRC;



	return 1;

}



define_machine(bamboo) {

	.name 			= "Bamboo",

	.probe 			= bamboo_probe,

	.progress 		= udbg_progress,

	.init_IRQ 		= uic_init_tree,

	.get_irq 		= uic_get_irq,

	.restart		= ppc4xx_reset_system,

	.calibrate_decr 	= generic_calibrate_decr,

};