kernel: bump 5.15 to 5.15.148
Changelog: https://cdn.kernel.org/pub/linux/kernel/v5.x/ChangeLog-5.15.148
Removed upstreamed:
generic/hack-5.15/321-powerpc_crtsavres_prereq.patch[1]
Manually rebased:
target/linux/octeontx/patches-5.15/0004-PCI-add-quirk-for-Gateworks-PLX-PEX860x-switch-with-.patch[2]
All other patches automatically rebased.
1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.148&id=0b11a145eb00d51f7ef18cfcae587b93f9adb1e9
2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit?h=v5.15.148&id=b67064bd372300a75293efbbc70624996dccffd4
Build system: x86_64
Build-tested: ramips/tplink_archer-a6-v3
Run-tested: ramips/tplink_archer-a6-v3
Signed-off-by: John Audia <therealgraysky@proton.me>
(cherry picked from commit 99c9d8abd6)
[Refresh on OpenWrt 23.05]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
committed by
Hauke Mehrtens
parent
fbe86d0e91
commit
1c28058710
@@ -18,7 +18,7 @@ Acked-by: Pali Rohár <pali@kernel.org>
|
||||
|
||||
--- a/drivers/pci/controller/pcie-mediatek.c
|
||||
+++ b/drivers/pci/controller/pcie-mediatek.c
|
||||
@@ -702,6 +702,13 @@ static int mtk_pcie_startup_port_v2(stru
|
||||
@@ -708,6 +708,13 @@ static int mtk_pcie_startup_port_v2(stru
|
||||
*/
|
||||
writel(PCIE_LINKDOWN_RST_EN, port->base + PCIE_RST_CTRL);
|
||||
|
||||
|
||||
@@ -52,7 +52,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
struct mtk_pcie_port;
|
||||
|
||||
/**
|
||||
@@ -1054,6 +1060,27 @@ static int mtk_pcie_setup(struct mtk_pci
|
||||
@@ -1060,6 +1066,27 @@ static int mtk_pcie_setup(struct mtk_pci
|
||||
struct mtk_pcie_port *port, *tmp;
|
||||
int err, slot;
|
||||
|
||||
|
||||
@@ -458,7 +458,7 @@ Signed-off-by: Wolfram Sang <wsa@kernel.org>
|
||||
adap->dev.parent = &pdev->dev;
|
||||
--- a/drivers/i2c/busses/i2c-rk3x.c
|
||||
+++ b/drivers/i2c/busses/i2c-rk3x.c
|
||||
@@ -1240,7 +1240,7 @@ static int rk3x_i2c_probe(struct platfor
|
||||
@@ -1247,7 +1247,7 @@ static int rk3x_i2c_probe(struct platfor
|
||||
/* use common interface to get I2C timing properties */
|
||||
i2c_parse_fw_timings(&pdev->dev, &i2c->t, true);
|
||||
|
||||
@@ -469,7 +469,7 @@ Signed-off-by: Wolfram Sang <wsa@kernel.org>
|
||||
i2c->adap.retries = 3;
|
||||
--- a/drivers/i2c/busses/i2c-s3c2410.c
|
||||
+++ b/drivers/i2c/busses/i2c-s3c2410.c
|
||||
@@ -1076,7 +1076,7 @@ static int s3c24xx_i2c_probe(struct plat
|
||||
@@ -1078,7 +1078,7 @@ static int s3c24xx_i2c_probe(struct plat
|
||||
else
|
||||
s3c24xx_i2c_parse_dt(pdev->dev.of_node, i2c);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user