diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2021-10-24 20:59:54 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-11-02 23:37:19 +0100 |
| commit | ff504e6fd118ab2e55492a138d0907dc2a943057 (patch) | |
| tree | c196a63d10927e6a41d51dbac1c01bf981f0c9e0 /target/linux/pistachio/patches-5.10/106-spi-img-spfi-finish-every-transfer-cleanly.patch | |
| parent | 9b96fcf9f6369982668d1d4cf68dca9453d28a56 (diff) | |
| download | upstream-ff504e6fd118ab2e55492a138d0907dc2a943057.tar.gz upstream-ff504e6fd118ab2e55492a138d0907dc2a943057.tar.bz2 upstream-ff504e6fd118ab2e55492a138d0907dc2a943057.zip | |
pistachio: Make kernel 5.10 patches apply
Make the patches apply on kernel 5.10 and refresh the patches and the
kernel configuration on top of kernel 5.10.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/pistachio/patches-5.10/106-spi-img-spfi-finish-every-transfer-cleanly.patch')
| -rw-r--r-- | target/linux/pistachio/patches-5.10/106-spi-img-spfi-finish-every-transfer-cleanly.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/pistachio/patches-5.10/106-spi-img-spfi-finish-every-transfer-cleanly.patch b/target/linux/pistachio/patches-5.10/106-spi-img-spfi-finish-every-transfer-cleanly.patch index cffb72ee33..ea1f9f28cc 100644 --- a/target/linux/pistachio/patches-5.10/106-spi-img-spfi-finish-every-transfer-cleanly.patch +++ b/target/linux/pistachio/patches-5.10/106-spi-img-spfi-finish-every-transfer-cleanly.patch @@ -24,7 +24,7 @@ Signed-off-by: Ionela Voinescu <ionela.voinescu@imgtec.com> --- a/drivers/spi/spi-img-spfi.c +++ b/drivers/spi/spi-img-spfi.c -@@ -80,6 +80,14 @@ +@@ -79,6 +79,14 @@ #define SPFI_INTERRUPT_SDE BIT(1) #define SPFI_INTERRUPT_SDTRIG BIT(0) @@ -39,7 +39,7 @@ Signed-off-by: Ionela Voinescu <ionela.voinescu@imgtec.com> /* * There are four parallel FIFOs of 16 bytes each. The word buffer * (*_32BIT_VALID_DATA) accesses all four FIFOs at once, resulting in an -@@ -141,6 +149,23 @@ static inline void spfi_reset(struct img +@@ -136,6 +144,23 @@ static inline void spfi_reset(struct img spfi_writel(spfi, 0, SPFI_CONTROL); } @@ -63,7 +63,7 @@ Signed-off-by: Ionela Voinescu <ionela.voinescu@imgtec.com> static int spfi_wait_all_done(struct img_spfi *spfi) { unsigned long timeout = jiffies + msecs_to_jiffies(50); -@@ -149,19 +174,9 @@ static int spfi_wait_all_done(struct img +@@ -144,19 +169,9 @@ static int spfi_wait_all_done(struct img return 0; while (time_before(jiffies, timeout)) { @@ -85,7 +85,7 @@ Signed-off-by: Ionela Voinescu <ionela.voinescu@imgtec.com> cpu_relax(); } -@@ -293,6 +308,8 @@ static int img_spfi_start_pio(struct spi +@@ -288,6 +303,8 @@ static int img_spfi_start_pio(struct spi } ret = spfi_wait_all_done(spfi); @@ -94,7 +94,7 @@ Signed-off-by: Ionela Voinescu <ionela.voinescu@imgtec.com> if (ret < 0) return ret; -@@ -308,8 +325,10 @@ static void img_spfi_dma_rx_cb(void *dat +@@ -303,8 +320,10 @@ static void img_spfi_dma_rx_cb(void *dat spin_lock_irqsave(&spfi->lock, flags); spfi->rx_dma_busy = false; @@ -106,7 +106,7 @@ Signed-off-by: Ionela Voinescu <ionela.voinescu@imgtec.com> spin_unlock_irqrestore(&spfi->lock, flags); } -@@ -322,8 +341,10 @@ static void img_spfi_dma_tx_cb(void *dat +@@ -317,8 +336,10 @@ static void img_spfi_dma_tx_cb(void *dat spin_lock_irqsave(&spfi->lock, flags); spfi->tx_dma_busy = false; |