brcm47xx: backport BCM47xx MIPS commits from 4.3 and 4.4-rc1

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>

SVN-Revision: 47484

1 files changed, 82 insertions, 0 deletions

diff --git a/target/linux/brcm47xx/patches-4.1/033-02-MIPS-BCM47xx-Fix-some-WARNINGs-pointed-in-sprom.c-by.patch b/target/linux/brcm47xx/patches-4.1/033-02-MIPS-BCM47xx-Fix-some-WARNINGs-pointed-in-sprom.c-by.patch
new file mode 100644
index 0000000000..c32f1ec226
--- /dev/null
+++ b/target/linux/brcm47xx/patches-4.1/033-02-MIPS-BCM47xx-Fix-some-WARNINGs-pointed-in-sprom.c-by.patch
@@ -0,0 +1,82 @@
+From 2f94acde42b70c81129b398c44aa09411974a16d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
+Date: Sun, 25 Oct 2015 22:16:48 +0100
+Subject: [PATCH 2/3] MIPS: BCM47xx: Fix some WARNINGs pointed in sprom.c by
+ checkpatch.pl
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+There are still few left:
+1) Most of them about lines over 80 chars (increased readability exception)
+2) Wrong parsing of preprocessor macros
+
+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/11356/
+Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
+---
+ arch/mips/bcm47xx/sprom.c | 25 ++++++++++++++++---------
+ 1 file changed, 16 insertions(+), 9 deletions(-)
+
+diff --git a/arch/mips/bcm47xx/sprom.c b/arch/mips/bcm47xx/sprom.c
+index e19c1b9..43353db 100644
+--- a/arch/mips/bcm47xx/sprom.c
++++ b/arch/mips/bcm47xx/sprom.c
+@@ -60,9 +60,9 @@ static int get_nvram_var(const char *prefix, const char *postfix,
+ }
+ 
+ #define NVRAM_READ_VAL(type)						\
+-static void nvram_read_ ## type (const char *prefix,			\
+-				 const char *postfix, const char *name, \
+-				 type *val, type allset, bool fallback) \
++static void nvram_read_ ## type(const char *prefix,			\
++				const char *postfix, const char *name,	\
++				type *val, type allset, bool fallback)	\
+ {									\
+ 	char buf[100];							\
+ 	int err;							\
+@@ -422,7 +422,10 @@ static void bcm47xx_fill_sprom_path_r4589(struct ssb_sprom *sprom,
+ 	int i;
+ 
+ 	for (i = 0; i < ARRAY_SIZE(sprom->core_pwr_info); i++) {
+-		struct ssb_sprom_core_pwr_info *pwr_info = &sprom->core_pwr_info[i];
++		struct ssb_sprom_core_pwr_info *pwr_info;
++
++		pwr_info = &sprom->core_pwr_info[i];
++
+ 		snprintf(postfix, sizeof(postfix), "%i", i);
+ 		nvram_read_u8(prefix, postfix, "maxp2ga",
+ 			      &pwr_info->maxpwr_2g, 0, fallback);
+@@ -470,7 +473,10 @@ static void bcm47xx_fill_sprom_path_r45(struct ssb_sprom *sprom,
+ 	int i;
+ 
+ 	for (i = 0; i < ARRAY_SIZE(sprom->core_pwr_info); i++) {
+-		struct ssb_sprom_core_pwr_info *pwr_info = &sprom->core_pwr_info[i];
++		struct ssb_sprom_core_pwr_info *pwr_info;
++
++		pwr_info = &sprom->core_pwr_info[i];
++
+ 		snprintf(postfix, sizeof(postfix), "%i", i);
+ 		nvram_read_u16(prefix, postfix, "pa2gw3a",
+ 			       &pwr_info->pa_2g[3], 0, fallback);
+@@ -535,10 +541,11 @@ static void bcm47xx_fill_sprom_ethernet(struct ssb_sprom *sprom,
+ 	nvram_read_macaddr(prefix, "il0macaddr", sprom->il0mac, fallback);
+ 
+ 	/* The address prefix 00:90:4C is used by Broadcom in their initial
+-	   configuration. When a mac address with the prefix 00:90:4C is used
+-	   all devices from the same series are sharing the same mac address.
+-	   To prevent mac address collisions we replace them with a mac address
+-	   based on the base address. */
++	 * configuration. When a mac address with the prefix 00:90:4C is used
++	 * all devices from the same series are sharing the same mac address.
++	 * To prevent mac address collisions we replace them with a mac address
++	 * based on the base address.
++	 */
+ 	if (!bcm47xx_is_valid_mac(sprom->il0mac)) {
+ 		u8 mac[6];
+ 
+-- 
+1.8.4.5
+