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
6 Content-Type: text/plain; charset=UTF-8
7 Content-Transfer-Encoding: 8bit
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.
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>
21 arch/mips/bcm47xx/sprom.c | 53 ++++++++---------------------------------------
22 1 file changed, 9 insertions(+), 44 deletions(-)
24 --- a/arch/mips/bcm47xx/sprom.c
25 +++ b/arch/mips/bcm47xx/sprom.c
26 @@ -200,6 +200,9 @@ static void bcm47xx_sprom_fill_auto(stru
27 const char *pre = prefix;
30 + /* Broadcom extracts it for rev 8+ but it was found on 2 and 4 too */
31 + ENTRY(0xfffffffe, u16, pre, "devid", dev_id, 0, fallback);
33 ENTRY(0xfffffffe, u16, pre, "boardrev", board_rev, 0, true);
34 ENTRY(0xfffffffe, u32, pre, "boardflags", boardflags, 0, fb);
35 ENTRY(0xfffffff0, u32, pre, "boardflags2", boardflags2, 0, fb);
36 @@ -412,27 +415,6 @@ static void bcm47xx_sprom_fill_auto(stru
38 #undef ENTRY /* It's specififc, uses local variable, don't use it (again). */
40 -static void bcm47xx_fill_sprom_r1234589(struct ssb_sprom *sprom,
41 - const char *prefix, bool fallback)
43 - nvram_read_u16(prefix, NULL, "devid", &sprom->dev_id, 0, fallback);
44 - nvram_read_alpha2(prefix, "ccode", sprom->alpha2, fallback);
47 -static void bcm47xx_fill_sprom_r3(struct ssb_sprom *sprom, const char *prefix,
50 - nvram_read_leddc(prefix, "leddc", &sprom->leddc_on_time,
51 - &sprom->leddc_off_time, fallback);
54 -static void bcm47xx_fill_sprom_r4589(struct ssb_sprom *sprom,
55 - const char *prefix, bool fallback)
57 - nvram_read_leddc(prefix, "leddc", &sprom->leddc_on_time,
58 - &sprom->leddc_off_time, fallback);
61 static void bcm47xx_fill_sprom_path_r4589(struct ssb_sprom *sprom,
62 const char *prefix, bool fallback)
64 @@ -589,39 +571,22 @@ void bcm47xx_fill_sprom(struct ssb_sprom
66 nvram_read_u8(prefix, NULL, "sromrev", &sprom->revision, 0, fallback);
68 + /* Entries requiring custom functions */
69 + nvram_read_alpha2(prefix, "ccode", sprom->alpha2, fallback);
70 + if (sprom->revision >= 3)
71 + nvram_read_leddc(prefix, "leddc", &sprom->leddc_on_time,
72 + &sprom->leddc_off_time, fallback);
74 switch (sprom->revision) {
76 - bcm47xx_fill_sprom_r1234589(sprom, prefix, fallback);
79 - bcm47xx_fill_sprom_r1234589(sprom, prefix, fallback);
82 - bcm47xx_fill_sprom_r1234589(sprom, prefix, fallback);
83 - bcm47xx_fill_sprom_r3(sprom, prefix, fallback);
87 - bcm47xx_fill_sprom_r1234589(sprom, prefix, fallback);
88 - bcm47xx_fill_sprom_r4589(sprom, prefix, fallback);
89 bcm47xx_fill_sprom_path_r4589(sprom, prefix, fallback);
90 bcm47xx_fill_sprom_path_r45(sprom, prefix, fallback);
93 - bcm47xx_fill_sprom_r1234589(sprom, prefix, fallback);
94 - bcm47xx_fill_sprom_r4589(sprom, prefix, fallback);
95 - bcm47xx_fill_sprom_path_r4589(sprom, prefix, fallback);
98 - bcm47xx_fill_sprom_r1234589(sprom, prefix, fallback);
99 - bcm47xx_fill_sprom_r4589(sprom, prefix, fallback);
100 bcm47xx_fill_sprom_path_r4589(sprom, prefix, fallback);
103 - pr_warn("Unsupported SPROM revision %d detected. Will extract v1\n",
105 - sprom->revision = 1;
106 - bcm47xx_fill_sprom_r1234589(sprom, prefix, fallback);
109 bcm47xx_sprom_fill_auto(sprom, prefix, fallback);