aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx/patches-2.6.39/200-spi-board-info.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2011-06-19 20:28:38 +0000
committerFlorian Fainelli <florian@openwrt.org>2011-06-19 20:28:38 +0000
commit35faebfc518d829b7a5a1eeaf3cc4f4edbf278ec (patch)
tree546e653ac51909c27fdfe4c716b6d04cc8c3c1c1 /target/linux/brcm63xx/patches-2.6.39/200-spi-board-info.patch
parent333e68fdfd8c0f30a7e86bedda3b27005f0ff9e4 (diff)
downloadmaster-187ad058-35faebfc518d829b7a5a1eeaf3cc4f4edbf278ec.tar.gz
master-187ad058-35faebfc518d829b7a5a1eeaf3cc4f4edbf278ec.tar.bz2
master-187ad058-35faebfc518d829b7a5a1eeaf3cc4f4edbf278ec.zip
[brcm63xx] fixup patches after r27234
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27235 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm63xx/patches-2.6.39/200-spi-board-info.patch')
-rw-r--r--target/linux/brcm63xx/patches-2.6.39/200-spi-board-info.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/brcm63xx/patches-2.6.39/200-spi-board-info.patch b/target/linux/brcm63xx/patches-2.6.39/200-spi-board-info.patch
index 037c4914c6..761ac9605d 100644
--- a/target/linux/brcm63xx/patches-2.6.39/200-spi-board-info.patch
+++ b/target/linux/brcm63xx/patches-2.6.39/200-spi-board-info.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -912,6 +912,9 @@ int __init board_register_devices(void)
+@@ -918,6 +918,9 @@ int __init board_register_devices(void)
if (board.num_devs)
platform_add_devices(board.devs, board.num_devs);
@@ -8,8 +8,8 @@
+ spi_register_board_info(board.spis, board.num_spis);
+
/* read base address of boot chip select (0) */
- val = bcm_mpi_readl(MPI_CSBASE_REG(0));
- val &= MPI_CSBASE_BASE_MASK;
+ if (BCMCPU_IS_6345())
+ val = 0x1fc00000;
--- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
+++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
@@ -65,6 +65,10 @@ struct board_info {