aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx/patches-3.10/303-spi-board-info.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2014-08-01 21:56:35 +0000
committerJonas Gorski <jogo@openwrt.org>2014-08-01 21:56:35 +0000
commitfaa51b307cfdbec28f474b48699358064e0f99c7 (patch)
tree00464a0e64ab7da443068b24b5b44050647e2369 /target/linux/brcm63xx/patches-3.10/303-spi-board-info.patch
parent701e2a38fef4fce862eaeb21fc97874a6387a569 (diff)
downloadupstream-faa51b307cfdbec28f474b48699358064e0f99c7.tar.gz
upstream-faa51b307cfdbec28f474b48699358064e0f99c7.tar.bz2
upstream-faa51b307cfdbec28f474b48699358064e0f99c7.zip
brcm63xx: switch to 3.14
Now that BB is branched off, we can now switch to 3.14 and start breaking stuff again. Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 41941
Diffstat (limited to 'target/linux/brcm63xx/patches-3.10/303-spi-board-info.patch')
-rw-r--r--target/linux/brcm63xx/patches-3.10/303-spi-board-info.patch33
1 files changed, 0 insertions, 33 deletions
diff --git a/target/linux/brcm63xx/patches-3.10/303-spi-board-info.patch b/target/linux/brcm63xx/patches-3.10/303-spi-board-info.patch
deleted file mode 100644
index 878e6262d4..0000000000
--- a/target/linux/brcm63xx/patches-3.10/303-spi-board-info.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/arch/mips/bcm63xx/boards/board_common.c
-+++ b/arch/mips/bcm63xx/boards/board_common.c
-@@ -13,6 +13,7 @@
- #include <linux/platform_device.h>
- #include <linux/ssb/ssb.h>
- #include <linux/gpio_keys.h>
-+#include <linux/spi/spi.h>
- #include <asm/addrspace.h>
- #include <bcm63xx_board.h>
- #include <bcm63xx_cpu.h>
-@@ -225,6 +226,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);
-+
- 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
-@@ -61,6 +61,10 @@ struct board_info {
- /* Additional platform devices */
- struct platform_device **devs;
- unsigned int num_devs;
-+
-+ /* Additional platform devices */
-+ struct spi_board_info *spis;
-+ unsigned int num_spis;
- };
-
- #endif /* ! BOARD_BCM963XX_H_ */