diff options
author | John Audia <therealgraysky@proton.me> | 2024-04-03 15:06:44 -0400 |
---|---|---|
committer | John Audia <therealgraysky@proton.me> | 2024-04-05 14:43:44 -0400 |
commit | 5c2eca676a8b08ad0cea3b80a32ae55a628477e7 (patch) | |
tree | 7ebeaa43db88a037fca99ae221eb57868c35d10a /target/linux/mediatek | |
parent | 4d3f41130e3c681d40c3599653a17bbff5d00306 (diff) | |
download | openwrt-5c2eca676a8b08ad0cea3b80a32ae55a628477e7.tar.gz openwrt-5c2eca676a8b08ad0cea3b80a32ae55a628477e7.tar.bz2 openwrt-5c2eca676a8b08ad0cea3b80a32ae55a628477e7.zip |
kernel: bump 6.6 to 6.6.24
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.24
Removed upstreamed:
generic/backport-6.6/838-v6.9-leds-trigger-netdev-Fix-kernel-panic-on-interface-re.patch[1]
generic/backport-6.6/981-mtd-spinand-Add-support-for-5-byte-IDs.patch[2]
mediatek/patches-6.6/831-thermal-drivers-mediatek-Fix-control-buffer-enablement-on-MT7896.patch[3]
Removed:
ipq40xx/patches-6.6/110-mtd-limit-OTP-nvmem-to-non-nand-devices.patch[4]
All other patches automatically rebased.
1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.24&id=10f2af1af8ab8a7064f193446abd5579d3def7e3
2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.24&id=9c74507e6c4382d12a5e418742b81fd441f03313
3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.24&id=fe750e2744428be6aec7395b13df3b34381ce6b6
4. Acknowledgment to @DragonBlurp for pointing out the redundancy of this patch. https://github.com/openwrt/openwrt/commit/dd78a59cd7b029560b33cb3ac0e1aa8b747bd807
Build system: x86/64
Build-tested: x86/64/AMD Cezanne, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3
Run-tested: x86/64/AMD Cezanne, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3
Signed-off-by: John Audia <therealgraysky@proton.me>
Diffstat (limited to 'target/linux/mediatek')
-rw-r--r-- | target/linux/mediatek/patches-6.6/410-bt-mtk-serial-fix.patch | 2 | ||||
-rw-r--r-- | target/linux/mediatek/patches-6.6/831-thermal-drivers-mediatek-Fix-control-buffer-enablement-on-MT7896.patch | 59 |
2 files changed, 1 insertions, 60 deletions
diff --git a/target/linux/mediatek/patches-6.6/410-bt-mtk-serial-fix.patch b/target/linux/mediatek/patches-6.6/410-bt-mtk-serial-fix.patch index f377487975..53e92a6dd3 100644 --- a/target/linux/mediatek/patches-6.6/410-bt-mtk-serial-fix.patch +++ b/target/linux/mediatek/patches-6.6/410-bt-mtk-serial-fix.patch @@ -19,7 +19,7 @@ }, [PORT_NPCM] = { .name = "Nuvoton 16550", -@@ -2780,6 +2780,11 @@ serial8250_do_set_termios(struct uart_po +@@ -2774,6 +2774,11 @@ serial8250_do_set_termios(struct uart_po unsigned long flags; unsigned int baud, quot, frac = 0; diff --git a/target/linux/mediatek/patches-6.6/831-thermal-drivers-mediatek-Fix-control-buffer-enablement-on-MT7896.patch b/target/linux/mediatek/patches-6.6/831-thermal-drivers-mediatek-Fix-control-buffer-enablement-on-MT7896.patch deleted file mode 100644 index bf9fa57113..0000000000 --- a/target/linux/mediatek/patches-6.6/831-thermal-drivers-mediatek-Fix-control-buffer-enablement-on-MT7896.patch +++ /dev/null @@ -1,59 +0,0 @@ -From patchwork Thu Sep 7 11:20:18 2023 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -X-Patchwork-Submitter: Frank Wunderlich <linux@fw-web.de> -X-Patchwork-Id: 13376356 -From: Frank Wunderlich <linux@fw-web.de> -To: linux-mediatek@lists.infradead.org -Subject: [PATCH] thermal/drivers/mediatek: Fix control buffer enablement on - MT7896 -Date: Thu, 7 Sep 2023 13:20:18 +0200 -Message-Id: <20230907112018.52811-1-linux@fw-web.de> -X-Mailer: git-send-email 2.34.1 -MIME-Version: 1.0 -X-Mail-ID: e7eeb8e1-00de-41f6-a5df-ce2e9164136e -X-BeenThere: linux-mediatek@lists.infradead.org -X-Mailman-Version: 2.1.34 -Precedence: list -List-Id: <linux-mediatek.lists.infradead.org> -Cc: Daniel Lezcano <daniel.lezcano@linaro.org>, - "Rafael J. Wysocki" <rafael@kernel.org>, linux-pm@vger.kernel.org, - Amit Kucheria <amitk@kernel.org>, Daniel Golle <daniel@makrotopia.org>, - stable@vger.kernel.org, linux-kernel@vger.kernel.org, - Matthias Brugger <matthias.bgg@gmail.com>, Zhang Rui <rui.zhang@intel.com>, - linux-arm-kernel@lists.infradead.org, - AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> -Sender: "Linux-mediatek" <linux-mediatek-bounces@lists.infradead.org> - -From: Frank Wunderlich <frank-w@public-files.de> - -Reading thermal sensor on mt7986 devices returns invalid temperature: - -bpi-r3 ~ # cat /sys/class/thermal/thermal_zone0/temp - -274000 - -Fix this by adding missing members in mtk_thermal_data struct which were -used in mtk_thermal_turn_on_buffer after commit 33140e668b10. - -Cc: stable@vger.kernel.org -Fixes: 33140e668b10 ("thermal/drivers/mediatek: Control buffer enablement tweaks") -Signed-off-by: Frank Wunderlich <frank-w@public-files.de> -Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> -Reviewed-by: Markus Schneider-Pargmann <msp@baylibre.com> ---- - drivers/thermal/mediatek/auxadc_thermal.c | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/drivers/thermal/mediatek/auxadc_thermal.c -+++ b/drivers/thermal/mediatek/auxadc_thermal.c -@@ -690,6 +690,9 @@ static const struct mtk_thermal_data mt7 - .adcpnp = mt7986_adcpnp, - .sensor_mux_values = mt7986_mux_values, - .version = MTK_THERMAL_V3, -+ .apmixed_buffer_ctl_reg = APMIXED_SYS_TS_CON1, -+ .apmixed_buffer_ctl_mask = GENMASK(31, 6) | BIT(3), -+ .apmixed_buffer_ctl_set = BIT(0), - }; - - static bool mtk_thermal_temp_is_valid(int temp) |