kernel: update 4.1 to 4.1.13

- two upstreamed patches removed
- compile tested all targets using 4.1
- run tested ar71xx

Signed-off-by: Roman Yeryomin <roman@advem.lv>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

SVN-Revision: 47694

5 files changed, 12 insertions, 41 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
index 7302c65..ed40052 100644
--- 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
@@ -21,11 +21,9 @@ 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,
+@@ -200,6 +200,9 @@ static void bcm47xx_sprom_fill_auto(stru
  	const char *pre = prefix;
  	bool fb = fallback;
  
@@ -35,7 +33,7 @@ index b0d62e7..2d5c7a7 100644
  	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,
+@@ -412,27 +415,6 @@ static void bcm47xx_sprom_fill_auto(stru
  }
  #undef ENTRY /* It's specififc, uses local variable, don't use it (again). */
  
@@ -63,7 +61,7 @@ index b0d62e7..2d5c7a7 100644
  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,
+@@ -589,39 +571,22 @@ void bcm47xx_fill_sprom(struct ssb_sprom
  
  	nvram_read_u8(prefix, NULL, "sromrev", &sprom->revision, 0, fallback);
  
@@ -109,6 +107,3 @@ index b0d62e7..2d5c7a7 100644
  	}
  
  	bcm47xx_sprom_fill_auto(sprom, prefix, fallback);
--- 
-1.8.4.5
-
diff --git a/target/linux/brcm47xx/patches-4.1/032-01-MIPS-BCM47xx-Use-kmemdup-rather-than-duplicating-its.patch b/target/linux/brcm47xx/patches-4.1/032-01-MIPS-BCM47xx-Use-kmemdup-rather-than-duplicating-its.patch
index 958738c..682cc41 100644
--- a/target/linux/brcm47xx/patches-4.1/032-01-MIPS-BCM47xx-Use-kmemdup-rather-than-duplicating-its.patch
+++ b/target/linux/brcm47xx/patches-4.1/032-01-MIPS-BCM47xx-Use-kmemdup-rather-than-duplicating-its.patch
@@ -27,11 +27,9 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  arch/mips/bcm47xx/buttons.c | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
 
-diff --git a/arch/mips/bcm47xx/buttons.c b/arch/mips/bcm47xx/buttons.c
-index 08a4abf..52caa75 100644
 --- a/arch/mips/bcm47xx/buttons.c
 +++ b/arch/mips/bcm47xx/buttons.c
-@@ -396,10 +396,9 @@ static int __init bcm47xx_buttons_copy(const struct gpio_keys_button *buttons,
+@@ -396,10 +396,9 @@ static int __init bcm47xx_buttons_copy(c
  {
  	size_t size = nbuttons * sizeof(*buttons);
  
@@ -43,6 +41,3 @@ index 08a4abf..52caa75 100644
  	bcm47xx_button_pdata.nbuttons = nbuttons;
  
  	return 0;
--- 
-1.8.4.5
-
diff --git a/target/linux/brcm47xx/patches-4.1/033-01-MIPS-BCM47xx-Support-on-SoC-bus-in-SPROM-reading-fun.patch b/target/linux/brcm47xx/patches-4.1/033-01-MIPS-BCM47xx-Support-on-SoC-bus-in-SPROM-reading-fun.patch
index f8d945d..7b8ed25 100644
--- a/target/linux/brcm47xx/patches-4.1/033-01-MIPS-BCM47xx-Support-on-SoC-bus-in-SPROM-reading-fun.patch
+++ b/target/linux/brcm47xx/patches-4.1/033-01-MIPS-BCM47xx-Support-on-SoC-bus-in-SPROM-reading-fun.patch
@@ -21,11 +21,9 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  arch/mips/bcm47xx/sprom.c | 8 ++++++--
  1 file changed, 6 insertions(+), 2 deletions(-)
 
-diff --git a/arch/mips/bcm47xx/sprom.c b/arch/mips/bcm47xx/sprom.c
-index 2d5c7a7..e19c1b9 100644
 --- a/arch/mips/bcm47xx/sprom.c
 +++ b/arch/mips/bcm47xx/sprom.c
-@@ -610,14 +610,18 @@ static int bcm47xx_get_sprom_ssb(struct ssb_bus *bus, struct ssb_sprom *out)
+@@ -610,14 +610,18 @@ static int bcm47xx_get_sprom_ssb(struct
  {
  	char prefix[10];
  
@@ -46,6 +44,3 @@ index 2d5c7a7..e19c1b9 100644
  		pr_warn("Unable to fill SPROM for given bustype.\n");
  		return -EINVAL;
  	}
--- 
-1.8.4.5
-
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
index c32f1ec..584b135 100644
--- 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
@@ -20,11 +20,9 @@ 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,
+@@ -60,9 +60,9 @@ static int get_nvram_var(const char *pre
  }
  
  #define NVRAM_READ_VAL(type)						\
@@ -37,7 +35,7 @@ index e19c1b9..43353db 100644
  {									\
  	char buf[100];							\
  	int err;							\
-@@ -422,7 +422,10 @@ static void bcm47xx_fill_sprom_path_r4589(struct ssb_sprom *sprom,
+@@ -422,7 +422,10 @@ static void bcm47xx_fill_sprom_path_r458
  	int i;
  
  	for (i = 0; i < ARRAY_SIZE(sprom->core_pwr_info); i++) {
@@ -49,7 +47,7 @@ index e19c1b9..43353db 100644
  		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,
+@@ -470,7 +473,10 @@ static void bcm47xx_fill_sprom_path_r45(
  	int i;
  
  	for (i = 0; i < ARRAY_SIZE(sprom->core_pwr_info); i++) {
@@ -61,7 +59,7 @@ index e19c1b9..43353db 100644
  		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,
+@@ -535,10 +541,11 @@ static void bcm47xx_fill_sprom_ethernet(
  	nvram_read_macaddr(prefix, "il0macaddr", sprom->il0mac, fallback);
  
  	/* The address prefix 00:90:4C is used by Broadcom in their initial
@@ -77,6 +75,3 @@ index e19c1b9..43353db 100644
  	if (!bcm47xx_is_valid_mac(sprom->il0mac)) {
  		u8 mac[6];
  
--- 
-1.8.4.5
-
diff --git a/target/linux/brcm47xx/patches-4.1/033-03-MIPS-BCM47xx-Fetch-board-info-directly-in-callback-f.patch b/target/linux/brcm47xx/patches-4.1/033-03-MIPS-BCM47xx-Fetch-board-info-directly-in-callback-f.patch
index 7cafe6f..777a82b 100644
--- a/target/linux/brcm47xx/patches-4.1/033-03-MIPS-BCM47xx-Fetch-board-info-directly-in-callback-f.patch
+++ b/target/linux/brcm47xx/patches-4.1/033-03-MIPS-BCM47xx-Fetch-board-info-directly-in-callback-f.patch
@@ -23,11 +23,9 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  arch/mips/include/asm/mach-bcm47xx/bcm47xx.h |  5 -----
  3 files changed, 18 insertions(+), 19 deletions(-)
 
-diff --git a/arch/mips/bcm47xx/setup.c b/arch/mips/bcm47xx/setup.c
-index 17503a0..6d38948 100644
 --- a/arch/mips/bcm47xx/setup.c
 +++ b/arch/mips/bcm47xx/setup.c
-@@ -105,11 +105,28 @@ static int bcm47xx_get_invariants(struct ssb_bus *bus,
+@@ -105,11 +105,28 @@ static int bcm47xx_get_invariants(struct
  				  struct ssb_init_invariants *iv)
  {
  	char buf[20];
@@ -57,11 +55,9 @@ index 17503a0..6d38948 100644
  
  	memset(&iv->sprom, 0, sizeof(struct ssb_sprom));
  	bcm47xx_fill_sprom(&iv->sprom, NULL, false);
-diff --git a/arch/mips/bcm47xx/sprom.c b/arch/mips/bcm47xx/sprom.c
-index 43353db..a7e569c 100644
 --- a/arch/mips/bcm47xx/sprom.c
 +++ b/arch/mips/bcm47xx/sprom.c
-@@ -599,19 +599,6 @@ void bcm47xx_fill_sprom(struct ssb_sprom *sprom, const char *prefix,
+@@ -599,19 +599,6 @@ void bcm47xx_fill_sprom(struct ssb_sprom
  	bcm47xx_sprom_fill_auto(sprom, prefix, fallback);
  }
  
@@ -81,11 +77,9 @@ index 43353db..a7e569c 100644
  #if defined(CONFIG_BCM47XX_SSB)
  static int bcm47xx_get_sprom_ssb(struct ssb_bus *bus, struct ssb_sprom *out)
  {
-diff --git a/arch/mips/include/asm/mach-bcm47xx/bcm47xx.h b/arch/mips/include/asm/mach-bcm47xx/bcm47xx.h
-index 1461c10..71e4096 100644
 --- a/arch/mips/include/asm/mach-bcm47xx/bcm47xx.h
 +++ b/arch/mips/include/asm/mach-bcm47xx/bcm47xx.h
-@@ -48,11 +48,6 @@ extern enum bcm47xx_bus_type bcm47xx_bus_type;
+@@ -48,11 +48,6 @@ extern enum bcm47xx_bus_type bcm47xx_bus
  void bcm47xx_fill_sprom(struct ssb_sprom *sprom, const char *prefix,
  			bool fallback);
  
@@ -97,6 +91,3 @@ index 1461c10..71e4096 100644
  void bcm47xx_set_system_type(u16 chip_id);
  
  #endif /* __ASM_BCM47XX_H */
--- 
-1.8.4.5
-