git.librecmc.org Git - oweals/openwrt.git/blob

   1 From 7515c6f1da334184c3ece06e6f61461086d8e2b1 Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
   3 Date: Wed, 1 Apr 2015 18:18:01 +0200
   4 Subject: [PATCH] MIPS: BCM47xx: Keep ID entries for non-standard devices
   5  together
   6 MIME-Version: 1.0
   7 Content-Type: text/plain; charset=UTF-8
   8 Content-Transfer-Encoding: 8bit
   9
  10 Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
  11 Cc: linux-mips@linux-mips.org
  12 Cc: Hauke Mehrtens <hauke@hauke-m.de>
  13 Patchwork: https://patchwork.linux-mips.org/patch/9655/
  14 Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  15 ---
  16  arch/mips/bcm47xx/board.c | 48 ++++++++++++++++++++---------------------------
  17  1 file changed, 20 insertions(+), 28 deletions(-)
  18
  19 --- a/arch/mips/bcm47xx/board.c
  20 +++ b/arch/mips/bcm47xx/board.c
  21 @@ -40,20 +40,6 @@ struct bcm47xx_board_type_list1 bcm47xx_
  22         { {0}, NULL},
  23  };
  24
  25 -/* model_no */
  26 -static const
  27 -struct bcm47xx_board_type_list1 bcm47xx_board_list_model_no[] __initconst = {
  28 -       {{BCM47XX_BOARD_ASUS_WL700GE, "Asus WL700"}, "WL700"},
  29 -       { {0}, NULL},
  30 -};
  31 -
  32 -/* machine_name */
  33 -static const
  34 -struct bcm47xx_board_type_list1 bcm47xx_board_list_machine_name[] __initconst = {
  35 -       {{BCM47XX_BOARD_LINKSYS_WRTSL54GS, "Linksys WRTSL54GS"}, "WRTSL54GS"},
  36 -       { {0}, NULL},
  37 -};
  38 -
  39  /* hardware_version */
  40  static const
  41  struct bcm47xx_board_type_list1 bcm47xx_board_list_hardware_version[] __initconst = {
  42 @@ -202,6 +188,18 @@ struct bcm47xx_board_type_list2 bcm47xx_
  43         { {0}, NULL},
  44  };
  45
  46 +/*
  47 + * Some devices don't use any common NVRAM entry for identification and they
  48 + * have only one model specific variable.
  49 + * They don't deserve own arrays, let's group them there using key-value array.
  50 + */
  51 +static const
  52 +struct bcm47xx_board_type_list2 bcm47xx_board_list_key_value[] __initconst = {
  53 +       {{BCM47XX_BOARD_ASUS_WL700GE, "Asus WL700"}, "model_no", "WL700"},
  54 +       {{BCM47XX_BOARD_LINKSYS_WRTSL54GS, "Linksys WRTSL54GS"}, "machine_name", "WRTSL54GS"},
  55 +       { {0}, NULL},
  56 +};
  57 +
  58  static const
  59  struct bcm47xx_board_type bcm47xx_board_unknown[] __initconst = {
  60         {BCM47XX_BOARD_UNKNOWN, "Unknown Board"},
  61 @@ -225,20 +223,6 @@ static __init const struct bcm47xx_board
  62                 }
  63         }
  64
  65 -       if (bcm47xx_nvram_getenv("model_no", buf1, sizeof(buf1)) >= 0) {
  66 -               for (e1 = bcm47xx_board_list_model_no; e1->value1; e1++) {
  67 -                       if (strstarts(buf1, e1->value1))
  68 -                               return &e1->board;
  69 -               }
  70 -       }
  71 -
  72 -       if (bcm47xx_nvram_getenv("machine_name", buf1, sizeof(buf1)) >= 0) {
  73 -               for (e1 = bcm47xx_board_list_machine_name; e1->value1; e1++) {
  74 -                       if (strstarts(buf1, e1->value1))
  75 -                               return &e1->board;
  76 -               }
  77 -       }
  78 -
  79         if (bcm47xx_nvram_getenv("hardware_version", buf1, sizeof(buf1)) >= 0) {
  80                 for (e1 = bcm47xx_board_list_hardware_version; e1->value1; e1++) {
  81                         if (strstarts(buf1, e1->value1))
  82 @@ -314,6 +298,14 @@ static __init const struct bcm47xx_board
  83                                 return &e2->board;
  84                 }
  85         }
  86 +
  87 +       for (e2 = bcm47xx_board_list_key_value; e2->value1; e2++) {
  88 +               if (bcm47xx_nvram_getenv(e2->value1, buf1, sizeof(buf1)) >= 0) {
  89 +                       if (!strcmp(buf1, e2->value2))
  90 +                               return &e2->board;
  91 +               }
  92 +       }
  93 +
  94         return bcm47xx_board_unknown;
  95  }
  96