diff options
| author | Florian Fainelli <florian@openwrt.org> | 2011-06-19 20:28:38 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2011-06-19 20:28:38 +0000 |
| commit | 4dd4cbeb43687199f514ce9ad11f337cdbfe0421 (patch) | |
| tree | 6a12b2550706a027bba880b8a3d26a0be56a1823 /target/linux/brcm63xx/patches-2.6.39/240-spi.patch | |
| parent | 7819b530da5e6b23ee61a2dc2da02529b71b82ce (diff) | |
| download | upstream-4dd4cbeb43687199f514ce9ad11f337cdbfe0421.tar.gz upstream-4dd4cbeb43687199f514ce9ad11f337cdbfe0421.tar.bz2 upstream-4dd4cbeb43687199f514ce9ad11f337cdbfe0421.zip | |
fixup patches after r27234
SVN-Revision: 27235
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 09e19e0838..d882c21832 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 -@@ -805,4 +805,116 @@ +@@ -771,4 +771,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: " -@@ -925,6 +926,9 @@ int __init board_register_devices(void) +@@ -931,6 +932,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) */ - val = bcm_mpi_readl(MPI_CSBASE_REG(0)); - val &= MPI_CSBASE_BASE_MASK; + if (BCMCPU_IS_6345()) + val = 0x1fc00000; |