kernel: bump 5.15 to 5.15.83
Removed upstreamed: backport-5.15/883-v6.1-ca8210-Fix-crash-by-zero-initializing-data.patch[1] All patches automatically rebased 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.83&id=246bcd05ba6cc43b34ac0bb4bac3ea94a4efa07c Build system: x86_64 Build-tested: bcm2711/RPi4B Run-tested: bcm2711/RPi4B Signed-off-by: John Audia <therealgraysky@proton.me>
This commit is contained in:
committed by
Hauke Mehrtens
parent
bd911b4538
commit
b6fa423907
@@ -816,7 +816,7 @@ Signed-off-by: Sam Shih <sam.shih@mediatek.com>
|
||||
err_put_master:
|
||||
spi_master_put(master);
|
||||
|
||||
@@ -917,8 +1296,10 @@ static int mtk_spi_remove(struct platfor
|
||||
@@ -920,8 +1299,10 @@ static int mtk_spi_remove(struct platfor
|
||||
|
||||
mtk_spi_reset(mdata);
|
||||
|
||||
@@ -826,9 +826,9 @@ Signed-off-by: Sam Shih <sam.shih@mediatek.com>
|
||||
+ clk_unprepare(mdata->spi_hclk);
|
||||
+ }
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -934,8 +1315,10 @@ static int mtk_spi_suspend(struct device
|
||||
pm_runtime_put_noidle(&pdev->dev);
|
||||
pm_runtime_disable(&pdev->dev);
|
||||
@@ -940,8 +1321,10 @@ static int mtk_spi_suspend(struct device
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
@@ -840,7 +840,7 @@ Signed-off-by: Sam Shih <sam.shih@mediatek.com>
|
||||
|
||||
return ret;
|
||||
}
|
||||
@@ -952,11 +1335,20 @@ static int mtk_spi_resume(struct device
|
||||
@@ -958,11 +1341,20 @@ static int mtk_spi_resume(struct device
|
||||
dev_err(dev, "failed to enable spi_clk (%d)\n", ret);
|
||||
return ret;
|
||||
}
|
||||
@@ -862,7 +862,7 @@ Signed-off-by: Sam Shih <sam.shih@mediatek.com>
|
||||
|
||||
return ret;
|
||||
}
|
||||
@@ -968,10 +1360,13 @@ static int mtk_spi_runtime_suspend(struc
|
||||
@@ -974,10 +1366,13 @@ static int mtk_spi_runtime_suspend(struc
|
||||
struct spi_master *master = dev_get_drvdata(dev);
|
||||
struct mtk_spi *mdata = spi_master_get_devdata(master);
|
||||
|
||||
@@ -878,7 +878,7 @@ Signed-off-by: Sam Shih <sam.shih@mediatek.com>
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -982,13 +1377,31 @@ static int mtk_spi_runtime_resume(struct
|
||||
@@ -988,13 +1383,31 @@ static int mtk_spi_runtime_resume(struct
|
||||
struct mtk_spi *mdata = spi_master_get_devdata(master);
|
||||
int ret;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user