Re-enable MPI/PCI code

SVN-Revision: 6897
This commit is contained in:
Florian Fainelli 2007-04-08 17:26:45 +00:00
parent ebfd23d3b4
commit 62684a8471

View file

@ -47,14 +47,13 @@
extern void brcm_time_init(void); extern void brcm_time_init(void);
extern int boot_loader_type; extern int boot_loader_type;
#if defined(CONFIG_BCM96348) && defined(CONFIG_PCI)
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <bcm_map_part.h> #include <bcm_map_part.h>
#include <6348_map_part.h>
#include <bcmpci.h> #include <bcmpci.h>
static volatile MpiRegisters * mpi = (MpiRegisters *)(MPI_BASE); static volatile MpiRegisters * mpi = (MpiRegisters *)(MPI_BASE);
#endif
/* This function should be in a board specific directory. For now, /* This function should be in a board specific directory. For now,
* assume that all boards that include this file use a Broadcom chip * assume that all boards that include this file use a Broadcom chip
@ -73,8 +72,6 @@ static void brcm_machine_halt(void)
while (1); while (1);
} }
#if defined(CONFIG_BCM96348) && defined(CONFIG_PCI)
static void mpi_SetLocalPciConfigReg(uint32 reg, uint32 value) static void mpi_SetLocalPciConfigReg(uint32 reg, uint32 value)
{ {
/* write index then value */ /* write index then value */
@ -461,7 +458,6 @@ static int mpi_init(void)
return 0; return 0;
} }
#endif
void __init plat_mem_setup(void) void __init plat_mem_setup(void)
{ {
@ -471,8 +467,6 @@ void __init plat_mem_setup(void)
board_time_init = brcm_time_init; board_time_init = brcm_time_init;
#if defined(CONFIG_BCM96348) && defined(CONFIG_PCI)
/* mpi initialization */ /* mpi initialization */
mpi_init(); mpi_init();
#endif
} }