diff options
Diffstat (limited to 'target/linux/brcm47xx/patches-4.1/031-11-MIPS-BCM47xx-Simplify-handling-SPROM-revisions.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-4.1/031-11-MIPS-BCM47xx-Simplify-handling-SPROM-revisions.patch | 114 |
1 files changed, 114 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/patches-4.1/031-11-MIPS-BCM47xx-Simplify-handling-SPROM-revisions.patch b/target/linux/brcm47xx/patches-4.1/031-11-MIPS-BCM47xx-Simplify-handling-SPROM-revisions.patch new file mode 100644 index 0000000000..7302c65c03 --- /dev/null +++ b/target/linux/brcm47xx/patches-4.1/031-11-MIPS-BCM47xx-Simplify-handling-SPROM-revisions.patch @@ -0,0 +1,114 @@ +From 590605c6bc31d5cbfcb3844ef98eb10ff7ce24c3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com> +Date: Sun, 21 Jun 2015 15:25:49 +0200 +Subject: [PATCH] MIPS: BCM47xx: Simplify handling SPROM revisions +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +After the big SPROM cleanup moving code to the bcm47xx_sprom_fill_auto +we ended up with few tiny functions, two of them being identical. Let's +get rid of these [12]-liners. +This also stops extracting higher SPROM revisions as revision 1. Now we +have that function nicely handling revisions we don't need it. + +Signed-off-by: Rafał Miłecki <zajec5@gmail.com> +Cc: linux-mips@linux-mips.org +Cc: Hauke Mehrtens <hauke@hauke-m.de> +Patchwork: https://patchwork.linux-mips.org/patch/10569/ +Signed-off-by: Ralf Baechle <ralf@linux-mips.org> +--- + arch/mips/bcm47xx/sprom.c | 53 ++++++++--------------------------------------- + 1 file changed, 9 insertions(+), 44 deletions(-) + +diff --git a/arch/mips/bcm47xx/sprom.c b/arch/mips/bcm47xx/sprom.c +index b0d62e7..2d5c7a7 100644 +--- a/arch/mips/bcm47xx/sprom.c ++++ b/arch/mips/bcm47xx/sprom.c +@@ -200,6 +200,9 @@ static void bcm47xx_sprom_fill_auto(struct ssb_sprom *sprom, + const char *pre = prefix; + bool fb = fallback; + ++ /* Broadcom extracts it for rev 8+ but it was found on 2 and 4 too */ ++ ENTRY(0xfffffffe, u16, pre, "devid", dev_id, 0, fallback); ++ + ENTRY(0xfffffffe, u16, pre, "boardrev", board_rev, 0, true); + ENTRY(0xfffffffe, u32, pre, "boardflags", boardflags, 0, fb); + ENTRY(0xfffffff0, u32, pre, "boardflags2", boardflags2, 0, fb); +@@ -412,27 +415,6 @@ static void bcm47xx_sprom_fill_auto(struct ssb_sprom *sprom, + } + #undef ENTRY /* It's specififc, uses local variable, don't use it (again). */ + +-static void bcm47xx_fill_sprom_r1234589(struct ssb_sprom *sprom, +- const char *prefix, bool fallback) +-{ +- nvram_read_u16(prefix, NULL, "devid", &sprom->dev_id, 0, fallback); +- nvram_read_alpha2(prefix, "ccode", sprom->alpha2, fallback); +-} +- +-static void bcm47xx_fill_sprom_r3(struct ssb_sprom *sprom, const char *prefix, +- bool fallback) +-{ +- nvram_read_leddc(prefix, "leddc", &sprom->leddc_on_time, +- &sprom->leddc_off_time, fallback); +-} +- +-static void bcm47xx_fill_sprom_r4589(struct ssb_sprom *sprom, +- const char *prefix, bool fallback) +-{ +- nvram_read_leddc(prefix, "leddc", &sprom->leddc_on_time, +- &sprom->leddc_off_time, fallback); +-} +- + static void bcm47xx_fill_sprom_path_r4589(struct ssb_sprom *sprom, + const char *prefix, bool fallback) + { +@@ -589,39 +571,22 @@ void bcm47xx_fill_sprom(struct ssb_sprom *sprom, const char *prefix, + + nvram_read_u8(prefix, NULL, "sromrev", &sprom->revision, 0, fallback); + ++ /* Entries requiring custom functions */ ++ nvram_read_alpha2(prefix, "ccode", sprom->alpha2, fallback); ++ if (sprom->revision >= 3) ++ nvram_read_leddc(prefix, "leddc", &sprom->leddc_on_time, ++ &sprom->leddc_off_time, fallback); ++ + switch (sprom->revision) { +- case 1: +- bcm47xx_fill_sprom_r1234589(sprom, prefix, fallback); +- break; +- case 2: +- bcm47xx_fill_sprom_r1234589(sprom, prefix, fallback); +- break; +- case 3: +- bcm47xx_fill_sprom_r1234589(sprom, prefix, fallback); +- bcm47xx_fill_sprom_r3(sprom, prefix, fallback); +- break; + case 4: + case 5: +- bcm47xx_fill_sprom_r1234589(sprom, prefix, fallback); +- bcm47xx_fill_sprom_r4589(sprom, prefix, fallback); + bcm47xx_fill_sprom_path_r4589(sprom, prefix, fallback); + bcm47xx_fill_sprom_path_r45(sprom, prefix, fallback); + break; + case 8: +- bcm47xx_fill_sprom_r1234589(sprom, prefix, fallback); +- bcm47xx_fill_sprom_r4589(sprom, prefix, fallback); +- bcm47xx_fill_sprom_path_r4589(sprom, prefix, fallback); +- break; + case 9: +- bcm47xx_fill_sprom_r1234589(sprom, prefix, fallback); +- bcm47xx_fill_sprom_r4589(sprom, prefix, fallback); + bcm47xx_fill_sprom_path_r4589(sprom, prefix, fallback); + break; +- default: +- pr_warn("Unsupported SPROM revision %d detected. Will extract v1\n", +- sprom->revision); +- sprom->revision = 1; +- bcm47xx_fill_sprom_r1234589(sprom, prefix, fallback); + } + + bcm47xx_sprom_fill_auto(sprom, prefix, fallback); +-- +1.8.4.5 + |