redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

[POWERPC] 83xx: fold the mpc8313 platform into the mpc831x platform

Browse source 
prepare for adding support for the mpc8315 rdb, since they are
identical wrt platform code.

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
This commit is contained in:
Kim Phillips 2008-01-24 20:45:51 -06:00 committed by Kumar Gala
parent f3a2b29d93
commit 519fd80da9
4 changed files with 18 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/powerpc/configs/mpc8313_rdb_defconfig
View file

@ -138,7 +138,7 @@ CONFIG_PPC_83xx=y
# CONFIG_PPC_CELL is not set # CONFIG_PPC_CELL is not set
# CONFIG_PPC_CELL_NATIVE is not set # CONFIG_PPC_CELL_NATIVE is not set
# CONFIG_PQ2ADS is not set # CONFIG_PQ2ADS is not set
CONFIG_MPC8313_RDB=y CONFIG_MPC831x_RDB=y
# CONFIG_MPC832x_MDS is not set # CONFIG_MPC832x_MDS is not set
# CONFIG_MPC832x_RDB is not set # CONFIG_MPC832x_RDB is not set
# CONFIG_MPC834x_MDS is not set # CONFIG_MPC834x_MDS is not set

6
arch/powerpc/platforms/83xx/Kconfig
View file

@ -3,8 +3,8 @@ choice
depends on PPC_83xx depends on PPC_83xx
default MPC834x_MDS default MPC834x_MDS
config MPC8313_RDB config MPC831x_RDB
bool "Freescale MPC8313 RDB" bool "Freescale MPC831x RDB"
select DEFAULT_UIMAGE select DEFAULT_UIMAGE
help help
This option enables support for the MPC8313 RDB board. This option enables support for the MPC8313 RDB board.
@ -68,7 +68,7 @@ config PPC_MPC831x
bool bool
select PPC_UDBG_16550 select PPC_UDBG_16550
select PPC_INDIRECT_PCI select PPC_INDIRECT_PCI
default y if MPC8313_RDB default y if MPC831x_RDB
config PPC_MPC832x config PPC_MPC832x
bool bool

2
arch/powerpc/platforms/83xx/Makefile
View file

@ -3,7 +3,7 @@
# #
obj-y := misc.o usb.o obj-y := misc.o usb.o
obj-$(CONFIG_PCI) += pci.o obj-$(CONFIG_PCI) += pci.o
obj-$(CONFIG_MPC8313_RDB) += mpc8313_rdb.o obj-$(CONFIG_MPC831x_RDB) += mpc831x_rdb.o
obj-$(CONFIG_MPC832x_RDB) += mpc832x_rdb.o obj-$(CONFIG_MPC832x_RDB) += mpc832x_rdb.o
obj-$(CONFIG_MPC834x_MDS) += mpc834x_mds.o obj-$(CONFIG_MPC834x_MDS) += mpc834x_mds.o
obj-$(CONFIG_MPC834x_ITX) += mpc834x_itx.o obj-$(CONFIG_MPC834x_ITX) += mpc834x_itx.o

35
arch/powerpc/platforms/83xx/mpc8313_rdb.c → arch/powerpc/platforms/83xx/mpc831x_rdb.c
View file

@ -1,7 +1,7 @@
/* /*
* arch/powerpc/platforms/83xx/mpc8313_rdb.c * arch/powerpc/platforms/83xx/mpc831x_rdb.c
* *
* Description: MPC8313x RDB board specific routines. * Description: MPC831x RDB board specific routines.
* This file is based on mpc834x_sys.c * This file is based on mpc834x_sys.c
* Author: Lo Wlison <r43300@freescale.com> * Author: Lo Wlison <r43300@freescale.com>
* *
@ -22,26 +22,17 @@
#include "mpc83xx.h" #include "mpc83xx.h"
#undef DEBUG /*
#ifdef DEBUG
#define DBG(fmt...) udbg_printf(fmt)
#else
#define DBG(fmt...)
#endif
/* ************************************************************************
*
* Setup the architecture * Setup the architecture
*
*/ */
static void __init mpc8313_rdb_setup_arch(void) static void __init mpc831x_rdb_setup_arch(void)
{ {
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
struct device_node *np; struct device_node *np;
#endif #endif
if (ppc_md.progress) if (ppc_md.progress)
ppc_md.progress("mpc8313_rdb_setup_arch()", 0); ppc_md.progress("mpc831x_rdb_setup_arch()", 0);
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
for_each_compatible_node(np, "pci", "fsl,mpc8349-pci") for_each_compatible_node(np, "pci", "fsl,mpc8349-pci")
@ -50,7 +41,7 @@ static void __init mpc8313_rdb_setup_arch(void)
mpc831x_usb_cfg(); mpc831x_usb_cfg();
} }
void __init mpc8313_rdb_init_IRQ(void) void __init mpc831x_rdb_init_IRQ(void)
{ {
struct device_node *np; struct device_node *np;
@ -69,7 +60,7 @@ void __init mpc8313_rdb_init_IRQ(void)
/* /*
* Called very early, MMU is off, device-tree isn't unflattened * Called very early, MMU is off, device-tree isn't unflattened
*/ */
static int __init mpc8313_rdb_probe(void) static int __init mpc831x_rdb_probe(void)
{ {
unsigned long root = of_get_flat_dt_root(); unsigned long root = of_get_flat_dt_root();
@ -86,13 +77,13 @@ static int __init declare_of_platform_devices(void)
of_platform_bus_probe(NULL, of_bus_ids, NULL); of_platform_bus_probe(NULL, of_bus_ids, NULL);
return 0; return 0;
} }
machine_device_initcall(mpc8313_rdb, declare_of_platform_devices); machine_device_initcall(mpc831x_rdb, declare_of_platform_devices);
define_machine(mpc8313_rdb) { define_machine(mpc831x_rdb) {
.name = "MPC8313 RDB", .name = "MPC831x RDB",
.probe = mpc8313_rdb_probe, .probe = mpc831x_rdb_probe,
.setup_arch = mpc8313_rdb_setup_arch, .setup_arch = mpc831x_rdb_setup_arch,
.init_IRQ = mpc8313_rdb_init_IRQ, .init_IRQ = mpc831x_rdb_init_IRQ,
.get_irq = ipic_get_irq, .get_irq = ipic_get_irq,
.restart = mpc83xx_restart, .restart = mpc83xx_restart,
.time_init = mpc83xx_time_init, .time_init = mpc83xx_time_init,