domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel: update 4.1 to 4.1.10

Browse Source 
Fixes a regression on spi flash devices (upstream commit 1583eaece6fa).

Changelogs:
* https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.7
* https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.8
* https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.9
* https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.10

096-ipv4-off-by-one-in-continuation-handling-in-proc-net.patch was applied
upstream and dropped.

Signed-off-by: Mathias Kresin <openwrt@kresin.me>
[update from 4.1.9 to 4.1.10]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

SVN-Revision: 47104
This commit is contained in:
Hauke Mehrtens
2015-10-04 11:34:39 +00:00
parent dea417017e
commit 0cd478518f
41 changed files with 90 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
target/linux/brcm2708/patches-4.1/0001-Main-bcm2708-bcm2709-linux-port.patch
View File

@@ -168,7 +168,7 @@ Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
config ARCH_MULTIPLATFORM
bool "Allow multiple platforms to be selected"
depends on MMU
@@ -823,6 +859,9 @@ config ARCH_VIRT
@@ -824,6 +860,9 @@ config ARCH_VIRT
# Kconfigs may be included either alphabetically (according to the
# plat- suffix) or along side the corresponding mach-* source.
#
@@ -6745,7 +6745,7 @@ Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
ENTRY(cpu_v6_dcache_clean_area)
--- a/arch/arm/mm/proc-v7.S
+++ b/arch/arm/mm/proc-v7.S
@@ -456,6 +456,7 @@ __v7_setup:
@@ -460,6 +460,7 @@ __v7_setup_cont:
orr r0, r0, r6 @ set them
THUMB( orr r0, r0, #1 << 30 ) @ Thumb exceptions
ret lr @ return to head.S:__ret

2
target/linux/brcm2708/patches-4.1/0033-config-Enable-CONFIG_MEMCG-but-leave-it-disabled-due.patch
View File

@@ -11,7 +11,7 @@ Subject: [PATCH 033/171] config: Enable CONFIG_MEMCG, but leave it disabled
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -5393,6 +5393,29 @@ static int __init cgroup_disable(char *s
@@ -5394,6 +5394,29 @@ static int __init cgroup_disable(char *s
}
__setup("cgroup_disable=", cgroup_disable);

4
target/linux/brcm2708/patches-4.1/0099-spi-bcm2835-Support-pin-groups-other-than-7-11.patch
View File

@@ -19,7 +19,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
--- a/drivers/spi/spi-bcm2835.c
+++ b/drivers/spi/spi-bcm2835.c
@@ -359,6 +359,8 @@ static int bcm2835_spi_setup(struct spi_
@@ -376,6 +376,8 @@ static int bcm2835_spi_setup(struct spi_
{
int err;
struct gpio_chip *chip;
@@ -28,7 +28,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
/*
* sanity checking the native-chipselects
*/
@@ -375,15 +377,42 @@ static int bcm2835_spi_setup(struct spi_
@@ -392,15 +394,42 @@ static int bcm2835_spi_setup(struct spi_
"setup: only two native chip-selects are supported\n");
return -EINVAL;
}

7
target/linux/brcm2708/patches-4.1/0156-spi-bcm2835-enable-dma-modes-for-transfers-meeting-c.patch
View File

@@ -375,7 +375,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
static int bcm2835_spi_transfer_one_poll(struct spi_master *master,
struct spi_device *spi,
struct spi_transfer *tfr,
@@ -301,12 +582,26 @@ static int bcm2835_spi_transfer_one(stru
@@ -299,6 +580,11 @@ static int bcm2835_spi_transfer_one(stru
return bcm2835_spi_transfer_one_poll(master, spi, tfr,
cs, xfer_time_us);
@@ -387,6 +387,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
return bcm2835_spi_transfer_one_irq(master, spi, tfr, cs);
}
@@ -324,6 +610,15 @@ static int bcm2835_spi_prepare_message(s
static void bcm2835_spi_handle_err(struct spi_master *master,
struct spi_message *msg)
{
@@ -402,7 +403,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
bcm2835_spi_reset_hw(master);
}
@@ -505,6 +800,8 @@ static int bcm2835_spi_probe(struct plat
@@ -523,6 +818,8 @@ static int bcm2835_spi_probe(struct plat
goto out_clk_disable;
}
@@ -411,7 +412,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
/* initialise the hardware with the default polarities */
bcm2835_wr(bs, BCM2835_SPI_CS,
BCM2835_SPI_CS_CLEAR_RX | BCM2835_SPI_CS_CLEAR_TX);
@@ -535,6 +832,8 @@ static int bcm2835_spi_remove(struct pla
@@ -553,6 +850,8 @@ static int bcm2835_spi_remove(struct pla
clk_disable_unprepare(bs->clk);

6
target/linux/brcm2708/patches-4.1/0159-spi-bcm2835-fixed-compile-issues-due-to-embedded-com.patch
View File

@@ -11,15 +11,15 @@ Signed-off-by: Martin Sperl <kernel@martin.sperl.org>
--- a/drivers/spi/spi-bcm2835.c
+++ b/drivers/spi/spi-bcm2835.c
@@ -592,6 +592,7 @@ static int bcm2835_spi_transfer_one(stru
return bcm2835_spi_transfer_one_irq(master, spi, tfr, cs);
@@ -609,6 +609,7 @@ static int bcm2835_spi_prepare_message(s
return 0;
}
+#if 0
static void bcm2835_spi_handle_err(struct spi_master *master,
struct spi_message *msg)
{
@@ -606,6 +607,7 @@ static void bcm2835_spi_handle_err(struc
@@ -623,6 +624,7 @@ static void bcm2835_spi_handle_err(struc
/* and reset */
bcm2835_spi_reset_hw(master);
}

6
target/linux/brcm2708/patches-4.1/0163-spi-bcm2835-Fix-buld-error-from-previous-commit.patch
View File

@@ -9,15 +9,15 @@ Subject: [PATCH 163/171] spi: bcm2835: Fix buld error from previous commit
--- a/drivers/spi/spi-bcm2835.c
+++ b/drivers/spi/spi-bcm2835.c
@@ -592,7 +592,6 @@ static int bcm2835_spi_transfer_one(stru
return bcm2835_spi_transfer_one_irq(master, spi, tfr, cs);
@@ -609,7 +609,6 @@ static int bcm2835_spi_prepare_message(s
return 0;
}
-#if 0
static void bcm2835_spi_handle_err(struct spi_master *master,
struct spi_message *msg)
{
@@ -607,7 +606,6 @@ static void bcm2835_spi_handle_err(struc
@@ -624,7 +623,6 @@ static void bcm2835_spi_handle_err(struc
/* and reset */
bcm2835_spi_reset_hw(master);
}