Skip to content

Commit 483d2f1

Browse files
georgemoussalemrobimarko
authored andcommitted
qualcommax: ipq50xx: backport v6.20 patches
Replace the following pending patches which have now been merged in kernel v6.20: - arm64: dts: qcom: ipq5018: Remove tsens v1 fallback compatible - clk: qcom: gcc-ipq5018: flag sleep clock as critical - arm64: dts: qcom: ipq5018: Correct USB DWC3 wrapper interrupts Signed-off-by: George Moussalem <george.moussalem@outlook.com> Link: openwrt/openwrt#21883 Signed-off-by: Robert Marko <robimarko@gmail.com>
1 parent 01fb4a6 commit 483d2f1

7 files changed

Lines changed: 109 additions & 233 deletions
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
From 60fb18fbc234efb2d59472a889282dba2df3402a Mon Sep 17 00:00:00 2001
2+
From: George Moussalem <george.moussalem@outlook.com>
3+
Date: Mon, 18 Aug 2025 15:33:47 +0400
4+
Subject: arm64: dts: qcom: ipq5018: Remove tsens v1 fallback compatible
5+
6+
Remove qcom,tsens-v1 as fallback compatible since this IP has no RPM
7+
and, as such, must use its own init routine available in the driver.
8+
9+
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
10+
Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
11+
Signed-off-by: George Moussalem <george.moussalem@outlook.com>
12+
Link: https://lore.kernel.org/r/20250818-ipq5018-tsens-fix-v1-2-0f08cf09182d@outlook.com
13+
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
14+
---
15+
arch/arm64/boot/dts/qcom/ipq5018.dtsi | 2 +-
16+
1 file changed, 1 insertion(+), 1 deletion(-)
17+
18+
(limited to 'arch/arm64/boot/dts/qcom/ipq5018.dtsi')
19+
20+
--- a/arch/arm64/boot/dts/qcom/ipq5018.dtsi
21+
+++ b/arch/arm64/boot/dts/qcom/ipq5018.dtsi
22+
@@ -340,7 +340,7 @@
23+
};
24+
25+
tsens: thermal-sensor@4a9000 {
26+
- compatible = "qcom,ipq5018-tsens", "qcom,tsens-v1";
27+
+ compatible = "qcom,ipq5018-tsens";
28+
reg = <0x004a9000 0x1000>,
29+
<0x004a8000 0x1000>;
30+
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
From 04c4dc1f541135708d90a9b4632af51136f93ac3 Mon Sep 17 00:00:00 2001
2+
From: George Moussalem <george.moussalem@outlook.com>
3+
Date: Fri, 28 Nov 2025 15:03:19 +0400
4+
Subject: clk: qcom: gcc-ipq5018: flag sleep clock as critical
5+
6+
The sleep clock never be disabled. To avoid the kernel trying to disable
7+
it and keep it always on, flag it as critical.
8+
9+
Fixes: e3fdbef1bab8 ("clk: qcom: Add Global Clock controller (GCC) driver for IPQ5018")
10+
Signed-off-by: George Moussalem <george.moussalem@outlook.com>
11+
Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
12+
Link: https://lore.kernel.org/r/20251128-ipq5018-sleep-clk-fix-v1-1-6f4b75ec336c@outlook.com
13+
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
14+
---
15+
drivers/clk/qcom/gcc-ipq5018.c | 1 +
16+
1 file changed, 1 insertion(+)
17+
18+
(limited to 'drivers/clk/qcom/gcc-ipq5018.c')
19+
20+
--- a/drivers/clk/qcom/gcc-ipq5018.c
21+
+++ b/drivers/clk/qcom/gcc-ipq5018.c
22+
@@ -1340,6 +1340,7 @@ static struct clk_branch gcc_sleep_clk_s
23+
.name = "gcc_sleep_clk_src",
24+
.parent_data = gcc_sleep_clk_data,
25+
.num_parents = ARRAY_SIZE(gcc_sleep_clk_data),
26+
+ .flags = CLK_IS_CRITICAL,
27+
.ops = &clk_branch2_ops,
28+
},
29+
},
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
From d106f9681d1952b7c19726b0713cee6ae11211f5 Mon Sep 17 00:00:00 2001
2+
From: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
3+
Date: Tue, 6 Jan 2026 19:51:24 +0100
4+
Subject: arm64: dts: qcom: ipq5018: Correct USB DWC3 wrapper interrupts
5+
6+
Interrupts for DWC3 node were completely mixed up - SPI interrupt 62 is
7+
not listed in reference manual at all. It was also causing dtbs_check
8+
warnings:
9+
10+
ipq5018-rdp432-c2.dtb: usb@8af8800 (qcom,ipq5018-dwc3): interrupt-names:0: 'pwr_event' was expected
11+
ipq5018-rdp432-c2.dtb: usb@8af8800 (qcom,ipq5018-dwc3): interrupt-names: ['hs_phy_irq'] is too short
12+
13+
Warning itself was introduced by commit 53c6d854be4e ("dt-bindings: usb:
14+
dwc3: Clean up hs_phy_irq in binding"), but this was trying to bring
15+
sanity to the interrupts overall, although did a mistake for IPQ5018.
16+
IPQ5018 does not have QUSB2 PHY and its interrupts should rather match
17+
ones used in IPQ5332.
18+
19+
Correct it by using interrupts matching the bindings and reference
20+
manual.
21+
22+
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
23+
Tested-by: George Moussalem <george.moussalem@outlook.com>
24+
Link: https://lore.kernel.org/r/20260106185123.19929-3-krzysztof.kozlowski@oss.qualcomm.com
25+
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
26+
---
27+
arch/arm64/boot/dts/qcom/ipq5018.dtsi | 8 ++++++--
28+
1 file changed, 6 insertions(+), 2 deletions(-)
29+
30+
(limited to 'arch/arm64/boot/dts/qcom/ipq5018.dtsi')
31+
32+
--- a/arch/arm64/boot/dts/qcom/ipq5018.dtsi
33+
+++ b/arch/arm64/boot/dts/qcom/ipq5018.dtsi
34+
@@ -571,8 +571,12 @@
35+
compatible = "qcom,ipq5018-dwc3", "qcom,dwc3";
36+
reg = <0x08af8800 0x400>;
37+
38+
- interrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>;
39+
- interrupt-names = "hs_phy_irq";
40+
+ interrupts = <GIC_SPI 134 IRQ_TYPE_LEVEL_HIGH>,
41+
+ <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>,
42+
+ <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>;
43+
+ interrupt-names = "pwr_event",
44+
+ "dp_hs_phy_irq",
45+
+ "dm_hs_phy_irq";
46+
47+
clocks = <&gcc GCC_USB0_MASTER_CLK>,
48+
<&gcc GCC_SYS_NOC_USB0_AXI_CLK>,

target/linux/qualcommax/patches-6.12/0180-arm64-dts-qcom-ipq5018-Remove-tsens-v1-fallback-compatible.patch

Lines changed: 0 additions & 109 deletions
This file was deleted.

target/linux/qualcommax/patches-6.12/0187-clk-qcom-gcc-ipq5018-flag-sleep-clock-as-critical.patch

Lines changed: 0 additions & 19 deletions
This file was deleted.

target/linux/qualcommax/patches-6.12/0189-arm64-dts-qcom-ipq5018-add-nodes-to-bringup-q6.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Signed-off-by: George Moussalem <george.moussalem@outlook.com>
2828
};
2929

3030
soc: soc@0 {
31-
@@ -717,6 +722,41 @@
31+
@@ -721,6 +726,41 @@
3232
};
3333
};
3434

@@ -70,7 +70,7 @@ Signed-off-by: George Moussalem <george.moussalem@outlook.com>
7070
pcie1: pcie@80000000 {
7171
compatible = "qcom,pcie-ipq5018";
7272
reg = <0x80000000 0xf1d>,
73-
@@ -991,4 +1031,28 @@
73+
@@ -995,4 +1035,28 @@
7474
<GIC_PPI 4 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
7575
<GIC_PPI 1 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;
7676
};

target/linux/qualcommax/patches-6.12/0191-arm64-dts-qcom-ipq5018-Correct-USB-DWC3-wrapper-interrupts.patch

Lines changed: 0 additions & 103 deletions
This file was deleted.

0 commit comments

Comments
 (0)