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>
This commit is contained in:
committed by
Hauke Mehrtens
parent
479a2a90f7
commit
f529c8463f
@@ -35,7 +35,7 @@ Signed-off-by: Han Xu <han.xu@nxp.com>
|
||||
struct nxp_fspi {
|
||||
void __iomem *iobase;
|
||||
void __iomem *ahb_addr;
|
||||
@@ -1083,6 +1099,8 @@ static int nxp_fspi_resume(struct device
|
||||
@@ -1082,6 +1098,8 @@ static int nxp_fspi_resume(struct device
|
||||
|
||||
static const struct of_device_id nxp_fspi_dt_ids[] = {
|
||||
{ .compatible = "nxp,lx2160a-fspi", .data = (void *)&lx2160a_data, },
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user