diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2012-07-03 21:42:07 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2012-07-03 21:42:07 +0000 |
| commit | 297078e82c005275159c5b9c768ad3d2b03a6073 (patch) | |
| tree | d1dd3b8f4e5289e213cdfe3344f74d72aaf01212 /target/linux/brcm63xx/patches-3.3/303-spi-board-info.patch | |
| parent | e6d44db12bccb96777c5b3acbe3bf7deedf31dbb (diff) | |
| download | upstream-297078e82c005275159c5b9c768ad3d2b03a6073.tar.gz upstream-297078e82c005275159c5b9c768ad3d2b03a6073.tar.bz2 upstream-297078e82c005275159c5b9c768ad3d2b03a6073.zip | |
bcm63xx: update patches to latest upstream versions
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32591 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm63xx/patches-3.3/303-spi-board-info.patch')
| -rw-r--r-- | target/linux/brcm63xx/patches-3.3/303-spi-board-info.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/brcm63xx/patches-3.3/303-spi-board-info.patch b/target/linux/brcm63xx/patches-3.3/303-spi-board-info.patch index 41ceaf7234..517a53b565 100644 --- a/target/linux/brcm63xx/patches-3.3/303-spi-board-info.patch +++ b/target/linux/brcm63xx/patches-3.3/303-spi-board-info.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -17,6 +17,7 @@ +@@ -14,6 +14,7 @@ #include <linux/ssb/ssb.h> #include <linux/gpio_keys.h> #include <linux/input.h> @@ -8,16 +8,16 @@ #include <asm/addrspace.h> #include <bcm63xx_board.h> #include <bcm63xx_cpu.h> -@@ -933,6 +934,9 @@ int __init board_register_devices(void) +@@ -902,6 +903,9 @@ int __init board_register_devices(void) if (board.num_devs) platform_add_devices(board.devs, board.num_devs); + if (board.num_spis) + 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; + bcm63xx_flash_register(); + + /* count number of LEDs defined by this device */ --- 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 { |