aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx/patches-2.6.39/240-spi.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2011-06-19 20:12:45 +0000
committerFlorian Fainelli <florian@openwrt.org>2011-06-19 20:12:45 +0000
commit6bb0a608dc24f7f50f026a58cfdcb5b1573eb993 (patch)
tree205bed85785e83f0c53f9b4a8047fb58f5be0a3c /target/linux/brcm63xx/patches-2.6.39/240-spi.patch
parentbcada2640b2cdeada7b40b64ea7df6d163049650 (diff)
downloadupstream-6bb0a608dc24f7f50f026a58cfdcb5b1573eb993.tar.gz
upstream-6bb0a608dc24f7f50f026a58cfdcb5b1573eb993.tar.bz2
upstream-6bb0a608dc24f7f50f026a58cfdcb5b1573eb993.zip
switch to 2.6.39
SVN-Revision: 27232
Diffstat (limited to 'target/linux/brcm63xx/patches-2.6.39/240-spi.patch')
-rw-r--r--target/linux/brcm63xx/patches-2.6.39/240-spi.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/brcm63xx/patches-2.6.39/240-spi.patch b/target/linux/brcm63xx/patches-2.6.39/240-spi.patch
index d882c21832..09e19e0838 100644
--- a/target/linux/brcm63xx/patches-2.6.39/240-spi.patch
+++ b/target/linux/brcm63xx/patches-2.6.39/240-spi.patch
@@ -200,7 +200,7 @@
#define BCM_6358_OHCI0_IRQ (IRQ_INTERNAL_BASE + 5)
--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
-@@ -771,4 +771,116 @@
+@@ -805,4 +805,116 @@
#define DMIPSPLLCFG_N2_SHIFT 29
#define DMIPSPLLCFG_N2_MASK (0x7 << DMIPSPLLCFG_N2_SHIFT)
@@ -990,7 +990,7 @@
#include <board_bcm963xx.h>
#define PFX "board_bcm963xx: "
-@@ -931,6 +932,9 @@ int __init board_register_devices(void)
+@@ -925,6 +926,9 @@ int __init board_register_devices(void)
if (board.num_spis)
spi_register_board_info(board.spis, board.num_spis);
@@ -998,5 +998,5 @@
+ bcm63xx_spi_register();
+
/* read base address of boot chip select (0) */
- if (BCMCPU_IS_6345())
- val = 0x1fc00000;
+ val = bcm_mpi_readl(MPI_CSBASE_REG(0));
+ val &= MPI_CSBASE_BASE_MASK;