diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2017-03-26 12:22:27 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2017-03-26 12:23:19 +0200 |
| commit | fb7ea71c15d2bccb8cc6383d3a08921b79713712 (patch) | |
| tree | 402344f7b2dc8600fb8b8d1ae60eb05f1e3458a8 /target/linux/pistachio/patches-4.9/106-spi-img-spfi-finish-every-transfer-cleanly.patch | |
| parent | 88b125e9a46dd8793aa5eaef8c148e851ceb7463 (diff) | |
| download | mtk-20170518-fb7ea71c15d2bccb8cc6383d3a08921b79713712.zip mtk-20170518-fb7ea71c15d2bccb8cc6383d3a08921b79713712.tar.gz mtk-20170518-fb7ea71c15d2bccb8cc6383d3a08921b79713712.tar.bz2 | |
kernel: update kernel 4.9 to 4.9.17
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/pistachio/patches-4.9/106-spi-img-spfi-finish-every-transfer-cleanly.patch')
| -rw-r--r-- | target/linux/pistachio/patches-4.9/106-spi-img-spfi-finish-every-transfer-cleanly.patch | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/target/linux/pistachio/patches-4.9/106-spi-img-spfi-finish-every-transfer-cleanly.patch b/target/linux/pistachio/patches-4.9/106-spi-img-spfi-finish-every-transfer-cleanly.patch index f75f0fb..0f95831 100644 --- a/target/linux/pistachio/patches-4.9/106-spi-img-spfi-finish-every-transfer-cleanly.patch +++ b/target/linux/pistachio/patches-4.9/106-spi-img-spfi-finish-every-transfer-cleanly.patch @@ -22,8 +22,6 @@ Signed-off-by: Ionela Voinescu <ionela.voinescu@imgtec.com> drivers/spi/spi-img-spfi.c | 49 +++++++++++++++++++++++++++++++++------------- 1 file changed, 35 insertions(+), 14 deletions(-) -diff --git a/drivers/spi/spi-img-spfi.c b/drivers/spi/spi-img-spfi.c -index 8ad6c75..a124423 100644 --- a/drivers/spi/spi-img-spfi.c +++ b/drivers/spi/spi-img-spfi.c @@ -83,6 +83,14 @@ @@ -41,7 +39,7 @@ index 8ad6c75..a124423 100644 /* * There are four parallel FIFOs of 16 bytes each. The word buffer * (*_32BIT_VALID_DATA) accesses all four FIFOs at once, resulting in an -@@ -144,6 +152,23 @@ static inline void spfi_reset(struct img_spfi *spfi) +@@ -144,6 +152,23 @@ static inline void spfi_reset(struct img spfi_writel(spfi, 0, SPFI_CONTROL); } @@ -65,7 +63,7 @@ index 8ad6c75..a124423 100644 static int spfi_wait_all_done(struct img_spfi *spfi) { unsigned long timeout = jiffies + msecs_to_jiffies(50); -@@ -152,19 +177,9 @@ static int spfi_wait_all_done(struct img_spfi *spfi) +@@ -152,19 +177,9 @@ static int spfi_wait_all_done(struct img return 0; while (time_before(jiffies, timeout)) { @@ -87,7 +85,7 @@ index 8ad6c75..a124423 100644 cpu_relax(); } -@@ -296,6 +311,8 @@ static int img_spfi_start_pio(struct spi_master *master, +@@ -296,6 +311,8 @@ static int img_spfi_start_pio(struct spi } ret = spfi_wait_all_done(spfi); @@ -96,7 +94,7 @@ index 8ad6c75..a124423 100644 if (ret < 0) return ret; -@@ -311,8 +328,10 @@ static void img_spfi_dma_rx_cb(void *data) +@@ -311,8 +328,10 @@ static void img_spfi_dma_rx_cb(void *dat spin_lock_irqsave(&spfi->lock, flags); spfi->rx_dma_busy = false; @@ -108,7 +106,7 @@ index 8ad6c75..a124423 100644 spin_unlock_irqrestore(&spfi->lock, flags); } -@@ -325,8 +344,10 @@ static void img_spfi_dma_tx_cb(void *data) +@@ -325,8 +344,10 @@ static void img_spfi_dma_tx_cb(void *dat spin_lock_irqsave(&spfi->lock, flags); spfi->tx_dma_busy = false; @@ -120,6 +118,3 @@ index 8ad6c75..a124423 100644 spin_unlock_irqrestore(&spfi->lock, flags); } --- -2.7.4 - |