target/linux/brcm47xx/patches-4.1/031-11-MIPS-BCM47xx-Simplify-handling-SPROM-revisions.patch

   1 From 590605c6bc31d5cbfcb3844ef98eb10ff7ce24c3 Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
   3 Date: Sun, 21 Jun 2015 15:25:49 +0200
   4 Subject: [PATCH] MIPS: BCM47xx: Simplify handling SPROM revisions
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8
   9 After the big SPROM cleanup moving code to the bcm47xx_sprom_fill_auto
  10 we ended up with few tiny functions, two of them being identical. Let's
  11 get rid of these [12]-liners.
  12 This also stops extracting higher SPROM revisions as revision 1. Now we
  13 have that function nicely handling revisions we don't need it.
  14
  15 Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
  16 Cc: linux-mips@linux-mips.org
  17 Cc: Hauke Mehrtens <hauke@hauke-m.de>
  18 Patchwork: https://patchwork.linux-mips.org/patch/10569/
  19 Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  20 ---
  21  arch/mips/bcm47xx/sprom.c | 53 ++++++++---------------------------------------
  22  1 file changed, 9 insertions(+), 44 deletions(-)
  23
  24 diff --git a/arch/mips/bcm47xx/sprom.c b/arch/mips/bcm47xx/sprom.c
  25 index b0d62e7..2d5c7a7 100644
  26 --- a/arch/mips/bcm47xx/sprom.c
  27 +++ b/arch/mips/bcm47xx/sprom.c
  28 @@ -200,6 +200,9 @@ static void bcm47xx_sprom_fill_auto(struct ssb_sprom *sprom,
  29         const char *pre = prefix;
  30         bool fb = fallback;
  31
  32 +       /* Broadcom extracts it for rev 8+ but it was found on 2 and 4 too */
  33 +       ENTRY(0xfffffffe, u16, pre, "devid", dev_id, 0, fallback);
  34 +
  35         ENTRY(0xfffffffe, u16, pre, "boardrev", board_rev, 0, true);
  36         ENTRY(0xfffffffe, u32, pre, "boardflags", boardflags, 0, fb);
  37         ENTRY(0xfffffff0, u32, pre, "boardflags2", boardflags2, 0, fb);
  38 @@ -412,27 +415,6 @@ static void bcm47xx_sprom_fill_auto(struct ssb_sprom *sprom,
  39  }
  40  #undef ENTRY /* It's specififc, uses local variable, don't use it (again). */
  41
  42 -static void bcm47xx_fill_sprom_r1234589(struct ssb_sprom *sprom,
  43 -                                       const char *prefix, bool fallback)
  44 -{
  45 -       nvram_read_u16(prefix, NULL, "devid", &sprom->dev_id, 0, fallback);
  46 -       nvram_read_alpha2(prefix, "ccode", sprom->alpha2, fallback);
  47 -}
  48 -
  49 -static void bcm47xx_fill_sprom_r3(struct ssb_sprom *sprom, const char *prefix,
  50 -                                 bool fallback)
  51 -{
  52 -       nvram_read_leddc(prefix, "leddc", &sprom->leddc_on_time,
  53 -                        &sprom->leddc_off_time, fallback);
  54 -}
  55 -
  56 -static void bcm47xx_fill_sprom_r4589(struct ssb_sprom *sprom,
  57 -                                    const char *prefix, bool fallback)
  58 -{
  59 -       nvram_read_leddc(prefix, "leddc", &sprom->leddc_on_time,
  60 -                        &sprom->leddc_off_time, fallback);
  61 -}
  62 -
  63  static void bcm47xx_fill_sprom_path_r4589(struct ssb_sprom *sprom,
  64                                           const char *prefix, bool fallback)
  65  {
  66 @@ -589,39 +571,22 @@ void bcm47xx_fill_sprom(struct ssb_sprom *sprom, const char *prefix,
  67
  68         nvram_read_u8(prefix, NULL, "sromrev", &sprom->revision, 0, fallback);
  69
  70 +       /* Entries requiring custom functions */
  71 +       nvram_read_alpha2(prefix, "ccode", sprom->alpha2, fallback);
  72 +       if (sprom->revision >= 3)
  73 +               nvram_read_leddc(prefix, "leddc", &sprom->leddc_on_time,
  74 +                                &sprom->leddc_off_time, fallback);
  75 +
  76         switch (sprom->revision) {
  77 -       case 1:
  78 -               bcm47xx_fill_sprom_r1234589(sprom, prefix, fallback);
  79 -               break;
  80 -       case 2:
  81 -               bcm47xx_fill_sprom_r1234589(sprom, prefix, fallback);
  82 -               break;
  83 -       case 3:
  84 -               bcm47xx_fill_sprom_r1234589(sprom, prefix, fallback);
  85 -               bcm47xx_fill_sprom_r3(sprom, prefix, fallback);
  86 -               break;
  87         case 4:
  88         case 5:
  89 -               bcm47xx_fill_sprom_r1234589(sprom, prefix, fallback);
  90 -               bcm47xx_fill_sprom_r4589(sprom, prefix, fallback);
  91                 bcm47xx_fill_sprom_path_r4589(sprom, prefix, fallback);
  92                 bcm47xx_fill_sprom_path_r45(sprom, prefix, fallback);
  93                 break;
  94         case 8:
  95 -               bcm47xx_fill_sprom_r1234589(sprom, prefix, fallback);
  96 -               bcm47xx_fill_sprom_r4589(sprom, prefix, fallback);
  97 -               bcm47xx_fill_sprom_path_r4589(sprom, prefix, fallback);
  98 -               break;
  99         case 9:
 100 -               bcm47xx_fill_sprom_r1234589(sprom, prefix, fallback);
 101 -               bcm47xx_fill_sprom_r4589(sprom, prefix, fallback);
 102                 bcm47xx_fill_sprom_path_r4589(sprom, prefix, fallback);
 103                 break;
 104 -       default:
 105 -               pr_warn("Unsupported SPROM revision %d detected. Will extract v1\n",
 106 -                       sprom->revision);
 107 -               sprom->revision = 1;
 108 -               bcm47xx_fill_sprom_r1234589(sprom, prefix, fallback);
 109         }
 110
 111         bcm47xx_sprom_fill_auto(sprom, prefix, fallback);
 112 --
 113 1.8.4.5
 114