mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-06-16 02:25:29 +08:00
547fc7765c
* kernel: bump 5.15 to 5.15.86 Removed upstreamed: pending-5.15/101-Use-stddefs.h-instead-of-compiler.h.patch[1] ipq60xx/patches-5.15/0171-arm64-dts-qcom-ipq6018-cp01-c1-use-BLSPI1-pins.patch ipq806x/patches-5.15/122-01-clk-qcom-clk-krait-fix-wrong-div2-functions.patch[2] ipq60xx/patches-5.15/0139-arm64-dts-qcom-Correct-QMP-PHY-child-node-name.patch ipq60xx/patches-5.15/0005-v5.16-arm64-dts-qcom-Correct-QMP-PHY-child-node-name.patch ipq807x/patches-5.15/0004-v5.16-arm64-dts-qcom-Correct-QMP-PHY-child-node-name.patch bcm27xx/patches-5.15/950-0198-drm-fourcc-Add-packed-10bit-YUV-4-2-0-format.patch[3] Manually rebased: ramips/patches-5.15/100-PCI-mt7621-Add-MediaTek-MT7621-PCIe-host-controller-.patch[4] Added patch/backported: ramips/patches-5.15/107-PCI-mt7621-Add-sentinel-to-quirks-table.patch[5] All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.86&id=c160505c9b574b346031fdf2c649d19e7939ca11 2. Cannot find in the stable tree but it is here:a051e10bfc3.ec1727f89e4. Quilt gave this output when I applied the patch to rebase it: % quilt push -f Applying patch platform/100-PCI-mt7621-Add-MediaTek-MT7621-PCIe-host-controller-.patch patching file arch/mips/ralink/Kconfig patching file drivers/pci/controller/Kconfig patching file drivers/pci/controller/Makefile patching file drivers/staging/Kconfig patching file drivers/staging/Makefile patching file drivers/staging/mt7621-pci/Kconfig patching file drivers/staging/mt7621-pci/Makefile patching file drivers/staging/mt7621-pci/TODO patching file drivers/staging/mt7621-pci/mediatek,mt7621-pci.txt patching file drivers/staging/mt7621-pci/pci-mt7621.c Hunk #1 FAILED at 1. Not deleting file drivers/staging/mt7621-pci/pci-mt7621.c as content differs from patch 1 out of 1 hunk FAILED -- saving rejects to file drivers/staging/mt7621-pci/pci-mt7621.c.rej patching file drivers/pci/controller/pcie-mt7621.c Applied patch platform/100-PCI-mt7621-Add-MediaTek-MT7621-PCIe-host-controller-.patch (forced; needs refresh) Upon inspecting drivers/staging/mt7621-pci/pci-mt7621.c.rej, it seems that the original patch wants to delete drivers/staging/mt7621-pci/pci-mt7621.c but upstream's version was not an exact match. I opted to delete that file and need some feedback. Was that the correct course of action? 5. Suggestion by hauke:19098934f9"This patch is in upstream kernel, but it was backported to the old staging driver in kernel 5.15." Build system: x86_64 Build-tested: bcm2711/RPi4B, filogic/xiaomi_redmi-router-ax6000-ubootmod Run-tested: bcm2711/RPi4B, filogic/xiaomi_redmi-router-ax6000-ubootmod Signed-off-by: John Audia <therealgraysky@proton.me> Signed-off-by: Linhui Liu <liulinhui36@gmail.com> * oxnas: sata_oxnas: use ata_link_err Kernel 5.15.86 has backported ("ata: libata: move ata_{port,link,dev}_dbg to standard pr_XXX() macros") and this is now causing compilation errors for oxnas SATA driver due to usage of ata_link_printk(). Upstream has migrated to using the appropriate ata_link_{err, warn, notice, info} calls a while ago so its not affected. Lets do the same for oxnas SATA driver and use ata_link_err() instead of ata_link_printk(). Signed-off-by: Robert Marko <robimarko@gmail.com> Signed-off-by: John Audia <therealgraysky@proton.me> Signed-off-by: Linhui Liu <liulinhui36@gmail.com> Signed-off-by: Robert Marko <robimarko@gmail.com> Co-authored-by: John Audia <therealgraysky@proton.me> Co-authored-by: Robert Marko <robimarko@gmail.com>
55 lines
1.6 KiB
Diff
55 lines
1.6 KiB
Diff
From eed2617c6a237f46db3ed2b63f6dff158407e468 Mon Sep 17 00:00:00 2001
|
|
From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
|
|
Date: Tue, 27 Sep 2022 19:36:30 +0200
|
|
Subject: [PATCH] arm64: dts: qcom: ipq6018: align TLMM pin configuration with
|
|
DT schema
|
|
|
|
DT schema expects TLMM pin configuration nodes to be named with
|
|
'-state' suffix and their optional children with '-pins' suffix.
|
|
|
|
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
|
|
Reviewed-by: Bjorn Andersson <andersson@kernel.org>
|
|
Reviewed-by: Konrad Dybcio <konrad.dybcio@somainline.org>
|
|
---
|
|
arch/arm64/boot/dts/qcom/ipq6018-cp01-c1.dts | 4 ++--
|
|
arch/arm64/boot/dts/qcom/ipq6018.dtsi | 4 ++--
|
|
2 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
--- a/arch/arm64/boot/dts/qcom/ipq6018-cp01-c1.dts
|
|
+++ b/arch/arm64/boot/dts/qcom/ipq6018-cp01-c1.dts
|
|
@@ -51,13 +51,13 @@
|
|
};
|
|
|
|
&tlmm {
|
|
- i2c_1_pins: i2c-1-pins {
|
|
+ i2c_1_pins: i2c-1-state {
|
|
pins = "gpio42", "gpio43";
|
|
function = "blsp2_i2c";
|
|
drive-strength = <8>;
|
|
};
|
|
|
|
- spi_0_pins: spi-0-pins {
|
|
+ spi_0_pins: spi-0-state {
|
|
pins = "gpio38", "gpio39", "gpio40", "gpio41";
|
|
function = "blsp0_spi";
|
|
drive-strength = <8>;
|
|
--- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi
|
|
+++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi
|
|
@@ -230,14 +230,14 @@
|
|
interrupt-controller;
|
|
#interrupt-cells = <2>;
|
|
|
|
- serial_3_pins: serial3-pinmux {
|
|
+ serial_3_pins: serial3-state {
|
|
pins = "gpio44", "gpio45";
|
|
function = "blsp2_uart";
|
|
drive-strength = <8>;
|
|
bias-pull-down;
|
|
};
|
|
|
|
- qpic_pins: qpic-pins {
|
|
+ qpic_pins: qpic-state {
|
|
pins = "gpio1", "gpio3", "gpio4",
|
|
"gpio5", "gpio6", "gpio7",
|
|
"gpio8", "gpio10", "gpio11",
|