44d546290a
Reorder patches for a clearer distinction between the purposes of the different patches. SVN-Revision: 31127
25 lines
712 B
Diff
25 lines
712 B
Diff
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
|
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
|
@@ -924,6 +924,9 @@ int __init board_register_devices(void)
|
|
}
|
|
#endif
|
|
|
|
+ if (board.num_devs)
|
|
+ platform_add_devices(board.devs, board.num_devs);
|
|
+
|
|
/* 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
|
|
@@ -61,6 +61,10 @@ struct board_info {
|
|
|
|
/* Buttons */
|
|
struct gpio_button buttons[4];
|
|
+
|
|
+ /* Additional platform devices */
|
|
+ struct platform_device **devs;
|
|
+ unsigned int num_devs;
|
|
};
|
|
|
|
#endif /* ! BOARD_BCM963XX_H_ */
|