44d546290a
Reorder patches for a clearer distinction between the purposes of the different patches. SVN-Revision: 31127
25 lines
819 B
Diff
25 lines
819 B
Diff
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
|
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
|
@@ -927,6 +927,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;
|
|
--- 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 {
|
|
/* 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_ */
|