diff options
author | Florian Fainelli <florian@openwrt.org> | 2011-06-19 20:12:45 +0000 |
---|---|---|
committer | Florian Fainelli <florian@openwrt.org> | 2011-06-19 20:12:45 +0000 |
commit | 0103e970083b4f80c2c91077f99862a7090b5026 (patch) | |
tree | d2e1bf2171ab570ac1e07d1c67200cc75b90aa68 /target/linux/brcm63xx/patches-2.6.39/240-spi.patch | |
parent | c344ac7cbf302390e501355ec1fdc5ae76976419 (diff) | |
download | master-187ad058-0103e970083b4f80c2c91077f99862a7090b5026.tar.gz master-187ad058-0103e970083b4f80c2c91077f99862a7090b5026.tar.bz2 master-187ad058-0103e970083b4f80c2c91077f99862a7090b5026.zip |
[brcm63xx] switch to 2.6.39
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27232 3c298f89-4303-0410-b956-a3cf2f4a3e73
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.patch | 8 |
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; |