[openwrt/openwrt] kernel: bump 6.6 to 6.6.69
LEDE Commits
lede-commits at lists.infradead.org
Fri Jan 3 13:30:50 PST 2025
hauke pushed a commit to openwrt/openwrt.git, branch openwrt-24.10:
https://git.openwrt.org/09fcac8bc079edb20eabda857544022e115973a9
commit 09fcac8bc079edb20eabda857544022e115973a9
Author: John Audia <therealgraysky at proton.me>
AuthorDate: Thu Jan 2 06:34:15 2025 -0500
kernel: bump 6.6 to 6.6.69
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.69
All patches automatically rebased.
Build system: x86/64
Build-tested: bcm27xx/bcm2712, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3
Run-tested: bcm27xx/bcm2712, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3
Signed-off-by: John Audia <therealgraysky at proton.me>
Link: https://github.com/openwrt/openwrt/pull/17459
Signed-off-by: Nick Hainke <vincent at systemli.org>
(cherry picked from commit 89b2356b8c2fd420b49bacaa865fb9bd24173ecc)
---
include/kernel-6.6 | 4 ++--
...519-usb-dwc3-Set-DMA-and-coherent-masks-early.patch | 8 ++++----
...v6.8-watchdog-mediatek-mt7988-add-wdt-support.patch | 18 +++++++++---------
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/include/kernel-6.6 b/include/kernel-6.6
index c2805b4540..6cee9d1e8c 100644
--- a/include/kernel-6.6
+++ b/include/kernel-6.6
@@ -1,2 +1,2 @@
-LINUX_VERSION-6.6 = .68
-LINUX_KERNEL_HASH-6.6.68 = 283ff410e3f352ceed161ae30c0020301326059db03e86efcb384d46ac5840e2
+LINUX_VERSION-6.6 = .69
+LINUX_KERNEL_HASH-6.6.69 = 9c6305567b75d99514cde6eb9de39973f3d5c857a75bd9dcdfca57041f8d4f34
diff --git a/target/linux/bcm27xx/patches-6.6/950-0519-usb-dwc3-Set-DMA-and-coherent-masks-early.patch b/target/linux/bcm27xx/patches-6.6/950-0519-usb-dwc3-Set-DMA-and-coherent-masks-early.patch
index fe77f21211..551bfccc75 100644
--- a/target/linux/bcm27xx/patches-6.6/950-0519-usb-dwc3-Set-DMA-and-coherent-masks-early.patch
+++ b/target/linux/bcm27xx/patches-6.6/950-0519-usb-dwc3-Set-DMA-and-coherent-masks-early.patch
@@ -68,7 +68,7 @@ Signed-off-by: Jonathan Bell <jonathan at raspberrypi.com>
select SOC_BRCMSTB if ARCH_BRCMSTB
--- a/drivers/phy/broadcom/phy-brcm-usb-init-synopsys.c
+++ b/drivers/phy/broadcom/phy-brcm-usb-init-synopsys.c
-@@ -335,6 +335,36 @@ static void usb_init_common_7216(struct
+@@ -341,6 +341,36 @@ static void usb_init_common_7216(struct
usb_init_common(params);
}
@@ -105,7 +105,7 @@ Signed-off-by: Jonathan Bell <jonathan at raspberrypi.com>
static void usb_init_xhci(struct brcm_usb_init_params *params)
{
pr_debug("%s\n", __func__);
-@@ -380,6 +410,18 @@ static void usb_uninit_common_7211b0(str
+@@ -386,6 +416,18 @@ static void usb_uninit_common_7211b0(str
}
@@ -124,7 +124,7 @@ Signed-off-by: Jonathan Bell <jonathan at raspberrypi.com>
static void usb_uninit_xhci(struct brcm_usb_init_params *params)
{
-@@ -434,6 +476,16 @@ static const struct brcm_usb_init_ops bc
+@@ -440,6 +482,16 @@ static const struct brcm_usb_init_ops bc
.set_dual_select = usb_set_dual_select,
};
@@ -141,7 +141,7 @@ Signed-off-by: Jonathan Bell <jonathan at raspberrypi.com>
void brcm_usb_dvr_init_7216(struct brcm_usb_init_params *params)
{
-@@ -451,3 +503,10 @@ void brcm_usb_dvr_init_7211b0(struct brc
+@@ -457,3 +509,10 @@ void brcm_usb_dvr_init_7211b0(struct brc
params->family_name = "7211";
params->ops = &bcm7211b0_ops;
}
diff --git a/target/linux/mediatek/patches-6.6/251-v6.8-watchdog-mediatek-mt7988-add-wdt-support.patch b/target/linux/mediatek/patches-6.6/251-v6.8-watchdog-mediatek-mt7988-add-wdt-support.patch
index c399b768b0..984034125c 100644
--- a/target/linux/mediatek/patches-6.6/251-v6.8-watchdog-mediatek-mt7988-add-wdt-support.patch
+++ b/target/linux/mediatek/patches-6.6/251-v6.8-watchdog-mediatek-mt7988-add-wdt-support.patch
@@ -18,7 +18,7 @@ Signed-off-by: Wim Van Sebroeck <wim at linux-watchdog.org>
--- a/drivers/watchdog/mtk_wdt.c
+++ b/drivers/watchdog/mtk_wdt.c
-@@ -58,9 +58,13 @@
+@@ -59,9 +59,13 @@
#define WDT_SWSYSRST 0x18U
#define WDT_SWSYS_RST_KEY 0x88000000
@@ -32,7 +32,7 @@ Signed-off-by: Wim Van Sebroeck <wim at linux-watchdog.org>
static bool nowayout = WATCHDOG_NOWAYOUT;
static unsigned int timeout;
-@@ -71,10 +75,12 @@ struct mtk_wdt_dev {
+@@ -72,10 +76,12 @@ struct mtk_wdt_dev {
struct reset_controller_dev rcdev;
bool disable_wdt_extrst;
bool reset_by_toprgu;
@@ -45,7 +45,7 @@ Signed-off-by: Wim Van Sebroeck <wim at linux-watchdog.org>
};
static const struct mtk_wdt_data mt2712_data = {
-@@ -89,6 +95,11 @@ static const struct mtk_wdt_data mt7986_
+@@ -94,6 +100,11 @@ static const struct mtk_wdt_data mt7986_
.toprgu_sw_rst_num = MT7986_TOPRGU_SW_RST_NUM,
};
@@ -57,7 +57,7 @@ Signed-off-by: Wim Van Sebroeck <wim at linux-watchdog.org>
static const struct mtk_wdt_data mt8183_data = {
.toprgu_sw_rst_num = MT8183_TOPRGU_SW_RST_NUM,
};
-@@ -109,6 +120,28 @@ static const struct mtk_wdt_data mt8195_
+@@ -114,6 +125,28 @@ static const struct mtk_wdt_data mt8195_
.toprgu_sw_rst_num = MT8195_TOPRGU_SW_RST_NUM,
};
@@ -86,7 +86,7 @@ Signed-off-by: Wim Van Sebroeck <wim at linux-watchdog.org>
static int toprgu_reset_update(struct reset_controller_dev *rcdev,
unsigned long id, bool assert)
{
-@@ -119,6 +152,9 @@ static int toprgu_reset_update(struct re
+@@ -124,6 +157,9 @@ static int toprgu_reset_update(struct re
spin_lock_irqsave(&data->lock, flags);
@@ -96,7 +96,7 @@ Signed-off-by: Wim Van Sebroeck <wim at linux-watchdog.org>
tmp = readl(data->wdt_base + WDT_SWSYSRST);
if (assert)
tmp |= BIT(id);
-@@ -127,6 +163,9 @@ static int toprgu_reset_update(struct re
+@@ -132,6 +168,9 @@ static int toprgu_reset_update(struct re
tmp |= WDT_SWSYS_RST_KEY;
writel(tmp, data->wdt_base + WDT_SWSYSRST);
@@ -106,7 +106,7 @@ Signed-off-by: Wim Van Sebroeck <wim at linux-watchdog.org>
spin_unlock_irqrestore(&data->lock, flags);
return 0;
-@@ -412,6 +451,8 @@ static int mtk_wdt_probe(struct platform
+@@ -417,6 +456,8 @@ static int mtk_wdt_probe(struct platform
wdt_data->toprgu_sw_rst_num);
if (err)
return err;
@@ -115,8 +115,8 @@ Signed-off-by: Wim Van Sebroeck <wim at linux-watchdog.org>
}
mtk_wdt->disable_wdt_extrst =
-@@ -450,6 +491,7 @@ static const struct of_device_id mtk_wdt
- { .compatible = "mediatek,mt6589-wdt" },
+@@ -456,6 +497,7 @@ static const struct of_device_id mtk_wdt
+ { .compatible = "mediatek,mt6735-wdt", .data = &mt6735_data },
{ .compatible = "mediatek,mt6795-wdt", .data = &mt6795_data },
{ .compatible = "mediatek,mt7986-wdt", .data = &mt7986_data },
+ { .compatible = "mediatek,mt7988-wdt", .data = &mt7988_data },
More information about the lede-commits
mailing list