aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape/patches-5.4/817-spi-0004-MLK-21960-2-spi-fspi-dynamically-alloc-AHB-memory.patch
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2021-06-30 16:57:44 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2021-07-17 13:21:03 +0200
commitf529c8463f82266538b19e9ad888ee9d6de412c1 (patch)
tree0b618156a8c6f148c0a046e9a9a9dbd02150fcf3 /target/linux/layerscape/patches-5.4/817-spi-0004-MLK-21960-2-spi-fspi-dynamically-alloc-AHB-memory.patch
parent479a2a90f782209b29dd9746d241fc1e67836309 (diff)
downloadupstream-f529c8463f82266538b19e9ad888ee9d6de412c1.tar.gz
upstream-f529c8463f82266538b19e9ad888ee9d6de412c1.tar.bz2
upstream-f529c8463f82266538b19e9ad888ee9d6de412c1.zip
kernel: bump 5.4 to 5.4.129
All patches automatically rebased. Build system: x86_64 Build-tested: ipq806x/R7800 Run-tested: ipq806x/R7800 No dmesg regressions, everything functional Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'target/linux/layerscape/patches-5.4/817-spi-0004-MLK-21960-2-spi-fspi-dynamically-alloc-AHB-memory.patch')
-rw-r--r--target/linux/layerscape/patches-5.4/817-spi-0004-MLK-21960-2-spi-fspi-dynamically-alloc-AHB-memory.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/layerscape/patches-5.4/817-spi-0004-MLK-21960-2-spi-fspi-dynamically-alloc-AHB-memory.patch b/target/linux/layerscape/patches-5.4/817-spi-0004-MLK-21960-2-spi-fspi-dynamically-alloc-AHB-memory.patch
index a8db23cebb..534c014a2b 100644
--- a/target/linux/layerscape/patches-5.4/817-spi-0004-MLK-21960-2-spi-fspi-dynamically-alloc-AHB-memory.patch
+++ b/target/linux/layerscape/patches-5.4/817-spi-0004-MLK-21960-2-spi-fspi-dynamically-alloc-AHB-memory.patch
@@ -76,7 +76,7 @@ Signed-off-by: Han Xu <han.xu@nxp.com>
} else {
if (op->data.nbytes && op->data.dir == SPI_MEM_DATA_OUT)
nxp_fspi_fill_txfifo(f, op);
-@@ -999,9 +1025,8 @@ static int nxp_fspi_probe(struct platfor
+@@ -993,9 +1019,8 @@ static int nxp_fspi_probe(struct platfor
/* find the resources - controller memory mapped space */
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "fspi_mmap");
@@ -88,7 +88,7 @@ Signed-off-by: Han Xu <han.xu@nxp.com>
goto err_put_ctrl;
}
-@@ -1080,6 +1105,9 @@ static int nxp_fspi_remove(struct platfo
+@@ -1079,6 +1104,9 @@ static int nxp_fspi_remove(struct platfo
mutex_destroy(&f->lock);