mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-06-15 16:15: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>
83 lines
2.4 KiB
Diff
83 lines
2.4 KiB
Diff
From f82c48d468521cd9d1a31797c6f9e6cac6f7c1b3 Mon Sep 17 00:00:00 2001
|
|
From: Robert Marko <robimarko@gmail.com>
|
|
Date: Sat, 4 Jun 2022 17:30:03 +0200
|
|
Subject: [PATCH] arm64: dts: qcom: ipq6018: correct QUP peripheral labels
|
|
|
|
Current QUP peripheral labels like spi_0 and i2c_0 dont really tell what is
|
|
the exact QUP HW being used as there are actually 6 identical QUP HW blocks
|
|
for UART, SPI and I2C.
|
|
For example current i2c_0 label actually points to the QUP2 I2C HW.
|
|
|
|
This style of labeling does not follow what the rest of Qualcomm SoC-s use,
|
|
for example IPQ8074 which has the identical QUP blocks.
|
|
It also makes it really hard to add the missing QUP DT nodes as there are
|
|
multiple missing.
|
|
|
|
So utilize the same style as other Qualcomm SoC-s are using and update the
|
|
CP01 DTS as its the current sole user of them.
|
|
|
|
Signed-off-by: Robert Marko <robimarko@gmail.com>
|
|
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
|
|
Link: https://lore.kernel.org/r/20220604153003.55172-1-robimarko@gmail.com
|
|
---
|
|
arch/arm64/boot/dts/qcom/ipq6018-cp01-c1.dts | 4 ++--
|
|
arch/arm64/boot/dts/qcom/ipq6018.dtsi | 8 ++++----
|
|
2 files changed, 6 insertions(+), 6 deletions(-)
|
|
|
|
--- a/arch/arm64/boot/dts/qcom/ipq6018-cp01-c1.dts
|
|
+++ b/arch/arm64/boot/dts/qcom/ipq6018-cp01-c1.dts
|
|
@@ -29,13 +29,13 @@
|
|
status = "okay";
|
|
};
|
|
|
|
-&i2c_1 {
|
|
+&blsp1_i2c3 {
|
|
pinctrl-0 = <&i2c_1_pins>;
|
|
pinctrl-names = "default";
|
|
status = "okay";
|
|
};
|
|
|
|
-&spi_0 {
|
|
+&blsp1_spi1 {
|
|
cs-select = <0>;
|
|
pinctrl-0 = <&spi_0_pins>;
|
|
pinctrl-names = "default";
|
|
--- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi
|
|
+++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi
|
|
@@ -282,7 +282,7 @@
|
|
status = "disabled";
|
|
};
|
|
|
|
- spi_0: spi@78b5000 {
|
|
+ blsp1_spi1: spi@78b5000 {
|
|
compatible = "qcom,spi-qup-v2.2.1";
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
@@ -297,7 +297,7 @@
|
|
status = "disabled";
|
|
};
|
|
|
|
- spi_1: spi@78b6000 {
|
|
+ blsp1_spi2: spi@78b6000 {
|
|
compatible = "qcom,spi-qup-v2.2.1";
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
@@ -312,7 +312,7 @@
|
|
status = "disabled";
|
|
};
|
|
|
|
- i2c_0: i2c@78b6000 {
|
|
+ blsp1_i2c2: i2c@78b6000 {
|
|
compatible = "qcom,i2c-qup-v2.2.1";
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
@@ -327,7 +327,7 @@
|
|
status = "disabled";
|
|
};
|
|
|
|
- i2c_1: i2c@78b7000 { /* BLSP1 QUP2 */
|
|
+ blsp1_i2c3: i2c@78b7000 {
|
|
compatible = "qcom,i2c-qup-v2.2.1";
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|