mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-07-19 12:07:00 +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>
61 lines
1.9 KiB
Diff
61 lines
1.9 KiB
Diff
From f277b1421cdc4d2a6ef4bbb6bcaeb07a099157a2 Mon Sep 17 00:00:00 2001
|
|
From: anusha <anusharao@codeaurora.org>
|
|
Date: Wed, 5 Aug 2020 11:01:41 +0530
|
|
Subject: [PATCH 1008/1011] remoteproc: wcss: Add ipq6018 support in remoteproc
|
|
|
|
Signed-off-by: anusha <anusharao@codeaurora.org>
|
|
---
|
|
drivers/remoteproc/qcom_q6v5_wcss.c | 20 ++++++++++++++++++--
|
|
1 file changed, 18 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/remoteproc/qcom_q6v5_wcss.c
|
|
+++ b/drivers/remoteproc/qcom_q6v5_wcss.c
|
|
@@ -91,7 +91,7 @@
|
|
#define WCNSS_PAS_ID 6
|
|
|
|
enum {
|
|
- WCSS_IPQ8074,
|
|
+ WCSS_IPQ,
|
|
WCSS_QCS404,
|
|
};
|
|
|
|
@@ -906,7 +906,7 @@ static int q6v5_wcss_init_mmio(struct q6
|
|
if (!wcss->reg_base)
|
|
return -ENOMEM;
|
|
|
|
- if (wcss->version == WCSS_IPQ8074) {
|
|
+ if (wcss->version == WCSS_IPQ) {
|
|
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "rmb");
|
|
wcss->rmb_base = devm_ioremap_resource(&pdev->dev, res);
|
|
if (IS_ERR(wcss->rmb_base))
|
|
@@ -1177,6 +1177,21 @@ static int q6v5_wcss_remove(struct platf
|
|
return 0;
|
|
}
|
|
|
|
+static const struct wcss_data wcss_ipq6018_res_init = {
|
|
+ .init_clock = ipq8074_init_clock,
|
|
+ .q6_firmware_name = "IPQ6018/q6_fw.mdt",
|
|
+ .m3_firmware_name = "IPQ6018/m3_fw.mdt",
|
|
+ .crash_reason_smem = WCSS_CRASH_REASON,
|
|
+ .aon_reset_required = true,
|
|
+ .wcss_q6_reset_required = true,
|
|
+ .bcr_reset_required = false,
|
|
+ .ssr_name = "q6wcss",
|
|
+ .ops = &q6v5_wcss_ipq8074_ops,
|
|
+ .requires_force_stop = false,
|
|
+ .need_mem_protection = true,
|
|
+ .need_auto_boot = false,
|
|
+};
|
|
+
|
|
static const struct wcss_data wcss_ipq8074_res_init = {
|
|
.init_clock = ipq8074_init_clock,
|
|
.q6_firmware_name = "IPQ8074/q6_fw.mdt",
|
|
@@ -1210,6 +1225,7 @@ static const struct wcss_data wcss_qcs40
|
|
};
|
|
|
|
static const struct of_device_id q6v5_wcss_of_match[] = {
|
|
+ { .compatible = "qcom,ipq6018-wcss-pil", .data = &wcss_ipq6018_res_init },
|
|
{ .compatible = "qcom,ipq8074-wcss-pil", .data = &wcss_ipq8074_res_init },
|
|
{ .compatible = "qcom,qcs404-wcss-pil", .data = &wcss_qcs404_res_init },
|
|
{ },
|