projects
/
oweals
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bcm6345 fixes from AndyI
[oweals/openwrt.git]
/
target
/
linux
/
brcm63xx
/
files
/
arch
/
mips
/
bcm63xx
/
boards
/
board_bcm963xx.c
diff --git
a/target/linux/brcm63xx/files/arch/mips/bcm63xx/boards/board_bcm963xx.c
b/target/linux/brcm63xx/files/arch/mips/bcm63xx/boards/board_bcm963xx.c
index 52d4c27a089e5f7ed7f45f6c9c595d730423e185..4551ef613d14c53eb29118daa82290673f470b0c 100644
(file)
--- a/
target/linux/brcm63xx/files/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/
target/linux/brcm63xx/files/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@
-789,7
+789,9
@@
int __init board_register_devices(void)
bcm63xx_uart_register();
bcm63xx_wdt_register();
bcm63xx_uart_register();
bcm63xx_wdt_register();
- bcm63xx_spi_register();
+
+ if (!BCMCPU_IS_6345())
+ bcm63xx_spi_register();
if (board.has_pccard)
bcm63xx_pcmcia_register();
if (board.has_pccard)
bcm63xx_pcmcia_register();
@@
-827,7
+829,7
@@
int __init board_register_devices(void)
/* read base address of boot chip select (0) */
if (BCMCPU_IS_6345())
/* read base address of boot chip select (0) */
if (BCMCPU_IS_6345())
- val = 0x1fc0000;
+ val = 0x1fc0000
0
;
else {
val = bcm_mpi_readl(MPI_CSBASE_REG(0));
val &= MPI_CSBASE_BASE_MASK;
else {
val = bcm_mpi_readl(MPI_CSBASE_REG(0));
val &= MPI_CSBASE_BASE_MASK;