From 0cd478518fd2333cb6a33e134b4e15eb4efd5eb3 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 4 Oct 2015 11:34:39 +0000 Subject: kernel: update 4.1 to 4.1.10 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 [update from 4.1.9 to 4.1.10] Signed-off-by: Hauke Mehrtens SVN-Revision: 47104 --- ...0156-spi-bcm2835-enable-dma-modes-for-transfers-meeting-c.patch | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'target/linux/brcm2708/patches-4.1/0156-spi-bcm2835-enable-dma-modes-for-transfers-meeting-c.patch') diff --git a/target/linux/brcm2708/patches-4.1/0156-spi-bcm2835-enable-dma-modes-for-transfers-meeting-c.patch b/target/linux/brcm2708/patches-4.1/0156-spi-bcm2835-enable-dma-modes-for-transfers-meeting-c.patch index 3521f08..15205d1 100644 --- a/target/linux/brcm2708/patches-4.1/0156-spi-bcm2835-enable-dma-modes-for-transfers-meeting-c.patch +++ b/target/linux/brcm2708/patches-4.1/0156-spi-bcm2835-enable-dma-modes-for-transfers-meeting-c.patch @@ -375,7 +375,7 @@ Signed-off-by: Mark Brown 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 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 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 /* 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); -- cgit v1.1