1 From b9bc4eb19007fd35b57a10c4dfd442dd518ee345 Mon Sep 17 00:00:00 2001
2 From: Jonas Gorski <jogo@openwrt.org>
3 Date: Thu, 26 Jun 2014 12:51:00 +0200
4 Subject: [PATCH 47/48] MIPS: BCM63XX: add support for matching the board_info
7 Allow using the passed dtb's compatible property to match board_info
8 structs instead of nvram's boardname field, which is not unique anyway.
10 Signed-off-by: Jonas Gorski <jogo@openwrt.org>
12 arch/mips/bcm63xx/boards/board_bcm963xx.c | 4 ++--
13 arch/mips/bcm63xx/boards/board_common.c | 13 +++++++++++++
14 arch/mips/bcm63xx/boards/board_common.h | 3 +++
15 3 files changed, 18 insertions(+), 2 deletions(-)
17 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
18 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
19 @@ -785,9 +785,9 @@ void __init board_bcm963xx_init(void)
21 board_name = bcm63xx_nvram_get_name();
23 - /* find board by name */
24 + /* find board by name/compat */
25 for (i = 0; i < ARRAY_SIZE(bcm963xx_boards); i++) {
26 - if (strncmp(board_name, bcm963xx_boards[i]->name, 16))
27 + if (!board_is_compatible(bcm963xx_boards[i], board_name))
29 /* copy, board desc array is marked initdata */
30 board_early_setup(bcm963xx_boards[i],
31 --- a/arch/mips/bcm63xx/boards/board_common.c
32 +++ b/arch/mips/bcm63xx/boards/board_common.c
33 @@ -281,3 +281,16 @@ int __init board_register_devices(void)
38 +int __init board_is_compatible(const struct board_info *board,
39 + const char *board_name)
42 + if (initial_boot_params) {
43 + unsigned long dt_root = of_get_flat_dt_root();
45 + return of_flat_dt_is_compatible(dt_root, board->of_board_id);
48 + return !strncmp(board_name, board->name, 16);
50 --- a/arch/mips/bcm63xx/boards/board_common.h
51 +++ b/arch/mips/bcm63xx/boards/board_common.h
53 void board_early_setup(const struct board_info *board,
54 int (*get_mac_address)(u8 mac[ETH_ALEN]));
56 +int board_is_compatible(const struct board_info *board,
57 + const char *board_name);
59 #if defined(CONFIG_BOARD_BCM963XX)
60 void board_bcm963xx_init(void);