brcm47xx: backport MIPS BCM47XX changes queued for 4.2
[openwrt/svn-archive/archive.git] / target / linux / brcm47xx / patches-4.0 / 031-03-MIPS-BCM47xx-Extract-all-boardflags-to-new-u32-field.patch
1 From ecd06daee04bae00f3dfd0a3cd46f28142f18191 Mon Sep 17 00:00:00 2001
2 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
3 Date: Tue, 12 May 2015 11:31:02 +0200
4 Subject: [PATCH] MIPS: BCM47xx: Extract all boardflags to new u32 fields
5 MIME-Version: 1.0
6 Content-Type: text/plain; charset=UTF-8
7 Content-Transfer-Encoding: 8bit
8
9 For years we planned to get rid of old u16 fields, let's start doing it
10 with MIPS code. This process will take some time, it requires doing the
11 same in ssb/bcma and then switching all drivers to new fields. This will
12 be handled in separated patches submitted to appropriate trees.
13
14 Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
15 Cc: linux-mips@linux-mips.org
16 Cc: Hauke Mehrtens <hauke@hauke-m.de>
17 Patchwork: https://patchwork.linux-mips.org/patch/10026/
18 Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
19 ---
20 arch/mips/bcm47xx/sprom.c | 3 +++
21 include/linux/ssb/ssb.h | 5 ++++-
22 2 files changed, 7 insertions(+), 1 deletion(-)
23
24 diff --git a/arch/mips/bcm47xx/sprom.c b/arch/mips/bcm47xx/sprom.c
25 index 68ebf23..4048083 100644
26 --- a/arch/mips/bcm47xx/sprom.c
27 +++ b/arch/mips/bcm47xx/sprom.c
28 @@ -201,6 +201,9 @@ static void bcm47xx_sprom_fill_auto(struct ssb_sprom *sprom,
29 bool fb = fallback;
30
31 ENTRY(0xfffffffe, u16, pre, "boardrev", board_rev, 0, true);
32 + ENTRY(0xfffffffe, u32, pre, "boardflags", boardflags, 0, fb);
33 + ENTRY(0xfffffff0, u32, pre, "boardflags2", boardflags2, 0, fb);
34 + ENTRY(0xfffff800, u32, pre, "boardflags3", boardflags3, 0, fb);
35 ENTRY(0x00000002, u16, pre, "boardflags", boardflags_lo, 0, fb);
36 ENTRY(0xfffffffc, u16, pre, "boardtype", board_type, 0, true);
37 ENTRY(0xfffffffe, u16, pre, "boardnum", board_num, 0, fb);