diff options
author | Rafał Miłecki <zajec5@gmail.com> | 2015-06-05 20:41:18 +0000 |
---|---|---|
committer | Rafał Miłecki <zajec5@gmail.com> | 2015-06-05 20:41:18 +0000 |
commit | 5dcf53c610633ccaf3316181f084fd1069715179 (patch) | |
tree | 5ad6beab600bd6b9f712f701d7eeee449f8b0d2d /target/linux/brcm47xx/patches-3.18/032-03-MIPS-BCM47xx-Extract-all-boardflags-to-new-u32-field.patch | |
parent | 9e0443cd1272d6f4ea1fd24494278069ab45e8c4 (diff) | |
download | upstream-5dcf53c610633ccaf3316181f084fd1069715179.tar.gz upstream-5dcf53c610633ccaf3316181f084fd1069715179.tar.bz2 upstream-5dcf53c610633ccaf3316181f084fd1069715179.zip |
brcm47xx: backport MIPS BCM47XX changes queued for 4.2
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45906 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-3.18/032-03-MIPS-BCM47xx-Extract-all-boardflags-to-new-u32-field.patch')
-rw-r--r-- | target/linux/brcm47xx/patches-3.18/032-03-MIPS-BCM47xx-Extract-all-boardflags-to-new-u32-field.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/target/linux/brcm47xx/patches-3.18/032-03-MIPS-BCM47xx-Extract-all-boardflags-to-new-u32-field.patch b/target/linux/brcm47xx/patches-3.18/032-03-MIPS-BCM47xx-Extract-all-boardflags-to-new-u32-field.patch new file mode 100644 index 0000000000..6c09264b48 --- /dev/null +++ b/target/linux/brcm47xx/patches-3.18/032-03-MIPS-BCM47xx-Extract-all-boardflags-to-new-u32-field.patch @@ -0,0 +1,37 @@ +From ecd06daee04bae00f3dfd0a3cd46f28142f18191 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com> +Date: Tue, 12 May 2015 11:31:02 +0200 +Subject: [PATCH] MIPS: BCM47xx: Extract all boardflags to new u32 fields +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +For years we planned to get rid of old u16 fields, let's start doing it +with MIPS code. This process will take some time, it requires doing the +same in ssb/bcma and then switching all drivers to new fields. This will +be handled in separated patches submitted to appropriate trees. + +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/10026/ +Signed-off-by: Ralf Baechle <ralf@linux-mips.org> +--- + arch/mips/bcm47xx/sprom.c | 3 +++ + include/linux/ssb/ssb.h | 5 ++++- + 2 files changed, 7 insertions(+), 1 deletion(-) + +diff --git a/arch/mips/bcm47xx/sprom.c b/arch/mips/bcm47xx/sprom.c +index 68ebf23..4048083 100644 +--- a/arch/mips/bcm47xx/sprom.c ++++ b/arch/mips/bcm47xx/sprom.c +@@ -201,6 +201,9 @@ static void bcm47xx_sprom_fill_auto(struct ssb_sprom *sprom, + bool fb = 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); ++ ENTRY(0xfffff800, u32, pre, "boardflags3", boardflags3, 0, fb); + ENTRY(0x00000002, u16, pre, "boardflags", boardflags_lo, 0, fb); + ENTRY(0xfffffffc, u16, pre, "boardtype", board_type, 0, true); + ENTRY(0xfffffffe, u16, pre, "boardnum", board_num, 0, fb); |