aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm2708/patches-4.1/0156-spi-bcm2835-enable-dma-modes-for-transfers-meeting-c.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2015-10-04 11:34:39 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2015-10-04 11:34:39 +0000
commit0cd478518fd2333cb6a33e134b4e15eb4efd5eb3 (patch)
treed0a1a756d8b4469d550ffbd17f0c7dd8300ecb82 /target/linux/brcm2708/patches-4.1/0156-spi-bcm2835-enable-dma-modes-for-transfers-meeting-c.patch
parentdea417017edc6717e2662ab97b0af3d0b724d360 (diff)
downloadupstream-0cd478518fd2333cb6a33e134b4e15eb4efd5eb3.tar.gz
upstream-0cd478518fd2333cb6a33e134b4e15eb4efd5eb3.tar.bz2
upstream-0cd478518fd2333cb6a33e134b4e15eb4efd5eb3.zip
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 <openwrt@kresin.me> [update from 4.1.9 to 4.1.10] Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 47104
Diffstat (limited to 'target/linux/brcm2708/patches-4.1/0156-spi-bcm2835-enable-dma-modes-for-transfers-meeting-c.patch')
-rw-r--r--target/linux/brcm2708/patches-4.1/0156-spi-bcm2835-enable-dma-modes-for-transfers-meeting-c.patch7
1 files changed, 4 insertions, 3 deletions
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 3521f08258..15205d1732 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 <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);