brcm63xx: 3.10: backport multi-board support
[openwrt.git] / target / linux / brcm63xx / patches-3.10 / 303-spi-board-info.patch
1 --- a/arch/mips/bcm63xx/boards/board_common.c
2 +++ b/arch/mips/bcm63xx/boards/board_common.c
3 @@ -13,6 +13,7 @@
4  #include <linux/platform_device.h>
5  #include <linux/ssb/ssb.h>
6  #include <linux/gpio_keys.h>
7 +#include <linux/spi/spi.h>
8  #include <asm/addrspace.h>
9  #include <bcm63xx_board.h>
10  #include <bcm63xx_cpu.h>
11 @@ -225,6 +226,9 @@ int __init board_register_devices(void)
12         if (board.num_devs)
13                 platform_add_devices(board.devs, board.num_devs);
14  
15 +       if (board.num_spis)
16 +               spi_register_board_info(board.spis, board.num_spis);
17 +
18         bcm63xx_flash_register();
19  
20         /* count number of LEDs defined by this device */
21 --- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
22 +++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
23 @@ -61,6 +61,10 @@ struct board_info {
24         /* Additional platform devices */
25         struct platform_device **devs;
26         unsigned int    num_devs;
27 +
28 +       /* Additional platform devices */
29 +       struct spi_board_info *spis;
30 +       unsigned int    num_spis;
31  };
32  
33  #endif /* ! BOARD_BCM963XX_H_ */