[openwrt/openwrt] kernel: bump 4.14 to 4.14.229
LEDE Commits
lede-commits at lists.infradead.org
Fri Apr 9 14:45:21 BST 2021
xback pushed a commit to openwrt/openwrt.git, branch openwrt-19.07:
https://git.openwrt.org/7f3ec4ce39f050702aa05353c2a4c2abea0b2770
commit 7f3ec4ce39f050702aa05353c2a4c2abea0b2770
Author: Koen Vandeputte <koen.vandeputte at citymesh.com>
AuthorDate: Fri Apr 9 10:09:24 2021 +0200
kernel: bump 4.14 to 4.14.229
Refreshed all patches.
Compile-tested on: ar71xx, cns3xxx, imx6, x86_64
Runtime-tested on: ar71xx, cns3xxx, imx6
Signed-off-by: Koen Vandeputte <koen.vandeputte at citymesh.com>
---
include/kernel-version.mk | 4 ++--
.../0126-usb-xhci-mtk-use-dma_set_mask_and_coherent-in-probe-.patch | 2 +-
.../0127-usb-xhci-mtk-use-ports-count-from-xhci-in-xhci_mtk_s.patch | 4 ++--
.../0129-usb-xhci-mtk-support-option-to-disable-usb3-ports.patch | 2 +-
.../0131-usb-xhci-mtk-add-optional-mcu-and-dma-bus-clocks.patch | 2 +-
.../0190-usb-xhci-mtk-supports-remote-wakeup-for-mt2712-with-.patch | 6 +++---
.../0191-usb-xhci-allow-imod-interval-to-be-configurable.patch | 2 +-
7 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index 5359977683..f3f9a41f4f 100644
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@ -6,9 +6,9 @@ ifdef CONFIG_TESTING_KERNEL
KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER)
endif
-LINUX_VERSION-4.14 = .228
+LINUX_VERSION-4.14 = .229
-LINUX_KERNEL_HASH-4.14.228 = 15074d44ab330bba00518df1c86d3d2c304a34514d70958c0529a9d28d93815b
+LINUX_KERNEL_HASH-4.14.229 = b29be839cddea6d728155ecd9dfa8bced517ab7456ce13bb3d23b63d28ab362c
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
diff --git a/target/linux/mediatek/patches-4.14/0126-usb-xhci-mtk-use-dma_set_mask_and_coherent-in-probe-.patch b/target/linux/mediatek/patches-4.14/0126-usb-xhci-mtk-use-dma_set_mask_and_coherent-in-probe-.patch
index 26c7515943..5d761ae4f2 100644
--- a/target/linux/mediatek/patches-4.14/0126-usb-xhci-mtk-use-dma_set_mask_and_coherent-in-probe-.patch
+++ b/target/linux/mediatek/patches-4.14/0126-usb-xhci-mtk-use-dma_set_mask_and_coherent-in-probe-.patch
@@ -16,7 +16,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
--- a/drivers/usb/host/xhci-mtk.c
+++ b/drivers/usb/host/xhci-mtk.c
-@@ -606,15 +606,10 @@ static int xhci_mtk_probe(struct platfor
+@@ -613,15 +613,10 @@ static int xhci_mtk_probe(struct platfor
}
/* Initialize dma_mask and coherent_dma_mask to 32-bits */
diff --git a/target/linux/mediatek/patches-4.14/0127-usb-xhci-mtk-use-ports-count-from-xhci-in-xhci_mtk_s.patch b/target/linux/mediatek/patches-4.14/0127-usb-xhci-mtk-use-ports-count-from-xhci-in-xhci_mtk_s.patch
index 3ead12e808..3c497fbdb5 100644
--- a/target/linux/mediatek/patches-4.14/0127-usb-xhci-mtk-use-ports-count-from-xhci-in-xhci_mtk_s.patch
+++ b/target/linux/mediatek/patches-4.14/0127-usb-xhci-mtk-use-ports-count-from-xhci-in-xhci_mtk_s.patch
@@ -34,7 +34,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
if (sch_array == NULL)
--- a/drivers/usb/host/xhci-mtk.c
+++ b/drivers/usb/host/xhci-mtk.c
-@@ -492,7 +492,6 @@ static void xhci_mtk_quirks(struct devic
+@@ -499,7 +499,6 @@ static void xhci_mtk_quirks(struct devic
/* called during probe() after chip reset completes */
static int xhci_mtk_setup(struct usb_hcd *hcd)
{
@@ -42,7 +42,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
struct xhci_hcd_mtk *mtk = hcd_to_mtk(hcd);
int ret;
-@@ -507,8 +506,6 @@ static int xhci_mtk_setup(struct usb_hcd
+@@ -514,8 +513,6 @@ static int xhci_mtk_setup(struct usb_hcd
return ret;
if (usb_hcd_is_primary_hcd(hcd)) {
diff --git a/target/linux/mediatek/patches-4.14/0129-usb-xhci-mtk-support-option-to-disable-usb3-ports.patch b/target/linux/mediatek/patches-4.14/0129-usb-xhci-mtk-support-option-to-disable-usb3-ports.patch
index d5e48c7d01..5e6ca4f131 100644
--- a/target/linux/mediatek/patches-4.14/0129-usb-xhci-mtk-support-option-to-disable-usb3-ports.patch
+++ b/target/linux/mediatek/patches-4.14/0129-usb-xhci-mtk-support-option-to-disable-usb3-ports.patch
@@ -63,7 +63,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
value = readl(&ippc->u3_ctrl_p[i]);
value |= CTRL_U3_PORT_PDN;
writel(value, &ippc->u3_ctrl_p[i]);
-@@ -573,6 +582,9 @@ static int xhci_mtk_probe(struct platfor
+@@ -580,6 +589,9 @@ static int xhci_mtk_probe(struct platfor
}
mtk->lpm_support = of_property_read_bool(node, "usb3-lpm-capable");
diff --git a/target/linux/mediatek/patches-4.14/0131-usb-xhci-mtk-add-optional-mcu-and-dma-bus-clocks.patch b/target/linux/mediatek/patches-4.14/0131-usb-xhci-mtk-add-optional-mcu-and-dma-bus-clocks.patch
index 264cd25e7f..09049a818d 100644
--- a/target/linux/mediatek/patches-4.14/0131-usb-xhci-mtk-add-optional-mcu-and-dma-bus-clocks.patch
+++ b/target/linux/mediatek/patches-4.14/0131-usb-xhci-mtk-add-optional-mcu-and-dma-bus-clocks.patch
@@ -98,7 +98,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
clk_disable_unprepare(mtk->sys_clk);
clk_disable_unprepare(mtk->ref_clk);
}
-@@ -529,24 +585,9 @@ static int xhci_mtk_probe(struct platfor
+@@ -536,24 +592,9 @@ static int xhci_mtk_probe(struct platfor
return PTR_ERR(mtk->vusb33);
}
diff --git a/target/linux/mediatek/patches-4.14/0190-usb-xhci-mtk-supports-remote-wakeup-for-mt2712-with-.patch b/target/linux/mediatek/patches-4.14/0190-usb-xhci-mtk-supports-remote-wakeup-for-mt2712-with-.patch
index 2742915c4a..cd3817b18c 100644
--- a/target/linux/mediatek/patches-4.14/0190-usb-xhci-mtk-supports-remote-wakeup-for-mt2712-with-.patch
+++ b/target/linux/mediatek/patches-4.14/0190-usb-xhci-mtk-supports-remote-wakeup-for-mt2712-with-.patch
@@ -217,7 +217,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
}
static int xhci_mtk_setup(struct usb_hcd *hcd);
-@@ -595,8 +536,10 @@ static int xhci_mtk_probe(struct platfor
+@@ -602,8 +543,10 @@ static int xhci_mtk_probe(struct platfor
&mtk->u3p_dis_msk);
ret = usb_wakeup_of_property_parse(mtk, node);
@@ -229,7 +229,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
mtk->num_phys = of_count_phandle_with_args(node,
"phys", "#phy-cells");
-@@ -783,7 +726,7 @@ static int __maybe_unused xhci_mtk_suspe
+@@ -791,7 +734,7 @@ static int __maybe_unused xhci_mtk_suspe
xhci_mtk_host_disable(mtk);
xhci_mtk_phy_power_off(mtk);
xhci_mtk_clks_disable(mtk);
@@ -238,7 +238,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
return 0;
}
-@@ -793,7 +736,7 @@ static int __maybe_unused xhci_mtk_resum
+@@ -801,7 +744,7 @@ static int __maybe_unused xhci_mtk_resum
struct usb_hcd *hcd = mtk->hcd;
struct xhci_hcd *xhci = hcd_to_xhci(hcd);
diff --git a/target/linux/mediatek/patches-4.14/0191-usb-xhci-allow-imod-interval-to-be-configurable.patch b/target/linux/mediatek/patches-4.14/0191-usb-xhci-allow-imod-interval-to-be-configurable.patch
index d17345b43e..84ffc5f271 100644
--- a/target/linux/mediatek/patches-4.14/0191-usb-xhci-allow-imod-interval-to-be-configurable.patch
+++ b/target/linux/mediatek/patches-4.14/0191-usb-xhci-allow-imod-interval-to-be-configurable.patch
@@ -68,7 +68,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
usb at f0931000 {
--- a/drivers/usb/host/xhci-mtk.c
+++ b/drivers/usb/host/xhci-mtk.c
-@@ -629,6 +629,15 @@ static int xhci_mtk_probe(struct platfor
+@@ -636,6 +636,15 @@ static int xhci_mtk_probe(struct platfor
xhci = hcd_to_xhci(hcd);
xhci->main_hcd = hcd;
More information about the lede-commits
mailing list