Skip to content

Commit 14e9d44

Browse files
arndbarndb
committed
Merge tag 'qcom-arm64-fixes-for-6.9' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into for-next
Qualcomm Arm64 DeviceTree fixes for v6.9 This corrects the watchdog IRQ flags for a number of remoteproc instances, which otherwise prevents the driver from probe in the face of a probe deferral. Improvements in other areas, such as USB, have made it possible for CX rail voltage on SC8280XP to be lowered, no longer meeting requirements of active PCIe controllers. Necessary votes are added to these controllers. The MSI definitions for PCIe controllers in SM8450, SM8550, and SM8650 was incorrect, due to a bug in the driver. As this has now been fixed the definition needs to be corrected. Lastly, the SuperSpeed PHY irq of the second USB controller in SC8180x, and the compatible string for X1 Elite domain idle states are corrected. * tag 'qcom-arm64-fixes-for-6.9' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: arm64: dts: qcom: sc8180x: Fix ss_phy_irq for secondary USB controller arm64: dts: qcom: sm8650: Fix the msi-map entries arm64: dts: qcom: sm8550: Fix the msi-map entries arm64: dts: qcom: sm8450: Fix the msi-map entries arm64: dts: qcom: sc8280xp: add missing PCIe minimum OPP arm64: dts: qcom: x1e80100: Fix the compatible for cluster idle states arm64: dts: qcom: Fix type of "wdog" IRQs for remoteprocs Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 32a1eaa + ecda830 commit 14e9d44

File tree

10 files changed

+31
-38
lines changed

10 files changed

+31
-38
lines changed

‎arch/arm64/boot/dts/qcom/sc7280.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3707,7 +3707,7 @@
37073707
compatible = "qcom,sc7280-adsp-pas";
37083708
reg = <0 0x03700000 0 0x100>;
37093709

3710-
interrupts-extended = <&pdc 6 IRQ_TYPE_LEVEL_HIGH>,
3710+
interrupts-extended = <&pdc 6 IRQ_TYPE_EDGE_RISING>,
37113711
<&adsp_smp2p_in 0 IRQ_TYPE_EDGE_RISING>,
37123712
<&adsp_smp2p_in 1 IRQ_TYPE_EDGE_RISING>,
37133713
<&adsp_smp2p_in 2 IRQ_TYPE_EDGE_RISING>,
@@ -3944,7 +3944,7 @@
39443944
compatible = "qcom,sc7280-cdsp-pas";
39453945
reg = <0 0x0a300000 0 0x10000>;
39463946

3947-
interrupts-extended = <&intc GIC_SPI 578 IRQ_TYPE_LEVEL_HIGH>,
3947+
interrupts-extended = <&intc GIC_SPI 578 IRQ_TYPE_EDGE_RISING>,
39483948
<&cdsp_smp2p_in 0 IRQ_TYPE_EDGE_RISING>,
39493949
<&cdsp_smp2p_in 1 IRQ_TYPE_EDGE_RISING>,
39503950
<&cdsp_smp2p_in 2 IRQ_TYPE_EDGE_RISING>,

‎arch/arm64/boot/dts/qcom/sc8180x.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2701,7 +2701,7 @@
27012701
resets = <&gcc GCC_USB30_SEC_BCR>;
27022702
power-domains = <&gcc USB30_SEC_GDSC>;
27032703
interrupts-extended = <&intc GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>,
2704-
<&pdc 7 IRQ_TYPE_LEVEL_HIGH>,
2704+
<&pdc 40 IRQ_TYPE_LEVEL_HIGH>,
27052705
<&pdc 10 IRQ_TYPE_EDGE_BOTH>,
27062706
<&pdc 11 IRQ_TYPE_EDGE_BOTH>;
27072707
interrupt-names = "hs_phy_irq", "ss_phy_irq",

‎arch/arm64/boot/dts/qcom/sc8280xp.dtsi

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1774,6 +1774,7 @@
17741774
reset-names = "pci";
17751775

17761776
power-domains = <&gcc PCIE_4_GDSC>;
1777+
required-opps = <&rpmhpd_opp_nom>;
17771778

17781779
phys = <&pcie4_phy>;
17791780
phy-names = "pciephy";
@@ -1872,6 +1873,7 @@
18721873
reset-names = "pci";
18731874

18741875
power-domains = <&gcc PCIE_3B_GDSC>;
1876+
required-opps = <&rpmhpd_opp_nom>;
18751877

18761878
phys = <&pcie3b_phy>;
18771879
phy-names = "pciephy";
@@ -1970,6 +1972,7 @@
19701972
reset-names = "pci";
19711973

19721974
power-domains = <&gcc PCIE_3A_GDSC>;
1975+
required-opps = <&rpmhpd_opp_nom>;
19731976

19741977
phys = <&pcie3a_phy>;
19751978
phy-names = "pciephy";
@@ -2071,6 +2074,7 @@
20712074
reset-names = "pci";
20722075

20732076
power-domains = <&gcc PCIE_2B_GDSC>;
2077+
required-opps = <&rpmhpd_opp_nom>;
20742078

20752079
phys = <&pcie2b_phy>;
20762080
phy-names = "pciephy";
@@ -2169,6 +2173,7 @@
21692173
reset-names = "pci";
21702174

21712175
power-domains = <&gcc PCIE_2A_GDSC>;
2176+
required-opps = <&rpmhpd_opp_nom>;
21722177

21732178
phys = <&pcie2a_phy>;
21742179
phy-names = "pciephy";
@@ -2641,7 +2646,7 @@
26412646
compatible = "qcom,sc8280xp-adsp-pas";
26422647
reg = <0 0x03000000 0 0x100>;
26432648

2644-
interrupts-extended = <&intc GIC_SPI 162 IRQ_TYPE_LEVEL_HIGH>,
2649+
interrupts-extended = <&intc GIC_SPI 162 IRQ_TYPE_EDGE_RISING>,
26452650
<&smp2p_adsp_in 0 IRQ_TYPE_EDGE_RISING>,
26462651
<&smp2p_adsp_in 1 IRQ_TYPE_EDGE_RISING>,
26472652
<&smp2p_adsp_in 2 IRQ_TYPE_EDGE_RISING>,
@@ -4977,7 +4982,7 @@
49774982
compatible = "qcom,sc8280xp-nsp0-pas";
49784983
reg = <0 0x1b300000 0 0x100>;
49794984

4980-
interrupts-extended = <&intc GIC_SPI 578 IRQ_TYPE_LEVEL_HIGH>,
4985+
interrupts-extended = <&intc GIC_SPI 578 IRQ_TYPE_EDGE_RISING>,
49814986
<&smp2p_nsp0_in 0 IRQ_TYPE_EDGE_RISING>,
49824987
<&smp2p_nsp0_in 1 IRQ_TYPE_EDGE_RISING>,
49834988
<&smp2p_nsp0_in 2 IRQ_TYPE_EDGE_RISING>,
@@ -5108,7 +5113,7 @@
51085113
compatible = "qcom,sc8280xp-nsp1-pas";
51095114
reg = <0 0x21300000 0 0x100>;
51105115

5111-
interrupts-extended = <&intc GIC_SPI 887 IRQ_TYPE_LEVEL_HIGH>,
5116+
interrupts-extended = <&intc GIC_SPI 887 IRQ_TYPE_EDGE_RISING>,
51125117
<&smp2p_nsp1_in 0 IRQ_TYPE_EDGE_RISING>,
51135118
<&smp2p_nsp1_in 1 IRQ_TYPE_EDGE_RISING>,
51145119
<&smp2p_nsp1_in 2 IRQ_TYPE_EDGE_RISING>,

‎arch/arm64/boot/dts/qcom/sm6350.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1252,7 +1252,7 @@
12521252
compatible = "qcom,sm6350-adsp-pas";
12531253
reg = <0 0x03000000 0 0x100>;
12541254

1255-
interrupts-extended = <&pdc 6 IRQ_TYPE_LEVEL_HIGH>,
1255+
interrupts-extended = <&pdc 6 IRQ_TYPE_EDGE_RISING>,
12561256
<&smp2p_adsp_in 0 IRQ_TYPE_EDGE_RISING>,
12571257
<&smp2p_adsp_in 1 IRQ_TYPE_EDGE_RISING>,
12581258
<&smp2p_adsp_in 2 IRQ_TYPE_EDGE_RISING>,
@@ -1511,7 +1511,7 @@
15111511
compatible = "qcom,sm6350-cdsp-pas";
15121512
reg = <0 0x08300000 0 0x10000>;
15131513

1514-
interrupts-extended = <&intc GIC_SPI 578 IRQ_TYPE_LEVEL_HIGH>,
1514+
interrupts-extended = <&intc GIC_SPI 578 IRQ_TYPE_EDGE_RISING>,
15151515
<&smp2p_cdsp_in 0 IRQ_TYPE_EDGE_RISING>,
15161516
<&smp2p_cdsp_in 1 IRQ_TYPE_EDGE_RISING>,
15171517
<&smp2p_cdsp_in 2 IRQ_TYPE_EDGE_RISING>,

‎arch/arm64/boot/dts/qcom/sm6375.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1561,7 +1561,7 @@
15611561
compatible = "qcom,sm6375-adsp-pas";
15621562
reg = <0 0x0a400000 0 0x100>;
15631563

1564-
interrupts-extended = <&intc GIC_SPI 282 IRQ_TYPE_LEVEL_HIGH>,
1564+
interrupts-extended = <&intc GIC_SPI 282 IRQ_TYPE_EDGE_RISING>,
15651565
<&smp2p_adsp_in 0 IRQ_TYPE_EDGE_RISING>,
15661566
<&smp2p_adsp_in 1 IRQ_TYPE_EDGE_RISING>,
15671567
<&smp2p_adsp_in 2 IRQ_TYPE_EDGE_RISING>,

‎arch/arm64/boot/dts/qcom/sm8250.dtsi

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3062,7 +3062,7 @@
30623062
compatible = "qcom,sm8250-slpi-pas";
30633063
reg = <0 0x05c00000 0 0x4000>;
30643064

3065-
interrupts-extended = <&pdc 9 IRQ_TYPE_LEVEL_HIGH>,
3065+
interrupts-extended = <&pdc 9 IRQ_TYPE_EDGE_RISING>,
30663066
<&smp2p_slpi_in 0 IRQ_TYPE_EDGE_RISING>,
30673067
<&smp2p_slpi_in 1 IRQ_TYPE_EDGE_RISING>,
30683068
<&smp2p_slpi_in 2 IRQ_TYPE_EDGE_RISING>,
@@ -3766,7 +3766,7 @@
37663766
compatible = "qcom,sm8250-cdsp-pas";
37673767
reg = <0 0x08300000 0 0x10000>;
37683768

3769-
interrupts-extended = <&intc GIC_SPI 578 IRQ_TYPE_LEVEL_HIGH>,
3769+
interrupts-extended = <&intc GIC_SPI 578 IRQ_TYPE_EDGE_RISING>,
37703770
<&smp2p_cdsp_in 0 IRQ_TYPE_EDGE_RISING>,
37713771
<&smp2p_cdsp_in 1 IRQ_TYPE_EDGE_RISING>,
37723772
<&smp2p_cdsp_in 2 IRQ_TYPE_EDGE_RISING>,
@@ -5928,7 +5928,7 @@
59285928
compatible = "qcom,sm8250-adsp-pas";
59295929
reg = <0 0x17300000 0 0x100>;
59305930

5931-
interrupts-extended = <&pdc 6 IRQ_TYPE_LEVEL_HIGH>,
5931+
interrupts-extended = <&pdc 6 IRQ_TYPE_EDGE_RISING>,
59325932
<&smp2p_adsp_in 0 IRQ_TYPE_EDGE_RISING>,
59335933
<&smp2p_adsp_in 1 IRQ_TYPE_EDGE_RISING>,
59345934
<&smp2p_adsp_in 2 IRQ_TYPE_EDGE_RISING>,

‎arch/arm64/boot/dts/qcom/sm8450.dtsi

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1777,12 +1777,8 @@
17771777
ranges = <0x01000000 0x0 0x00000000 0x0 0x60200000 0x0 0x100000>,
17781778
<0x02000000 0x0 0x60300000 0x0 0x60300000 0x0 0x3d00000>;
17791779

1780-
/*
1781-
* MSIs for BDF (1:0.0) only works with Device ID 0x5980.
1782-
* Hence, the IDs are swapped.
1783-
*/
1784-
msi-map = <0x0 &gic_its 0x5981 0x1>,
1785-
<0x100 &gic_its 0x5980 0x1>;
1780+
msi-map = <0x0 &gic_its 0x5980 0x1>,
1781+
<0x100 &gic_its 0x5981 0x1>;
17861782
msi-map-mask = <0xff00>;
17871783
interrupts = <GIC_SPI 141 IRQ_TYPE_LEVEL_HIGH>,
17881784
<GIC_SPI 142 IRQ_TYPE_LEVEL_HIGH>,
@@ -1900,12 +1896,8 @@
19001896
ranges = <0x01000000 0x0 0x00000000 0x0 0x40200000 0x0 0x100000>,
19011897
<0x02000000 0x0 0x40300000 0x0 0x40300000 0x0 0x1fd00000>;
19021898

1903-
/*
1904-
* MSIs for BDF (1:0.0) only works with Device ID 0x5a00.
1905-
* Hence, the IDs are swapped.
1906-
*/
1907-
msi-map = <0x0 &gic_its 0x5a01 0x1>,
1908-
<0x100 &gic_its 0x5a00 0x1>;
1899+
msi-map = <0x0 &gic_its 0x5a00 0x1>,
1900+
<0x100 &gic_its 0x5a01 0x1>;
19091901
msi-map-mask = <0xff00>;
19101902
interrupts = <GIC_SPI 307 IRQ_TYPE_LEVEL_HIGH>,
19111903
<GIC_SPI 308 IRQ_TYPE_LEVEL_HIGH>,

‎arch/arm64/boot/dts/qcom/sm8550.dtsi

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1755,9 +1755,8 @@
17551755
<&gem_noc MASTER_APPSS_PROC 0 &cnoc_main SLAVE_PCIE_0 0>;
17561756
interconnect-names = "pcie-mem", "cpu-pcie";
17571757

1758-
/* Entries are reversed due to the unusual ITS DeviceID encoding */
1759-
msi-map = <0x0 &gic_its 0x1401 0x1>,
1760-
<0x100 &gic_its 0x1400 0x1>;
1758+
msi-map = <0x0 &gic_its 0x1400 0x1>,
1759+
<0x100 &gic_its 0x1401 0x1>;
17611760
iommu-map = <0x0 &apps_smmu 0x1400 0x1>,
17621761
<0x100 &apps_smmu 0x1401 0x1>;
17631762

@@ -1867,9 +1866,8 @@
18671866
<&gem_noc MASTER_APPSS_PROC 0 &cnoc_main SLAVE_PCIE_1 0>;
18681867
interconnect-names = "pcie-mem", "cpu-pcie";
18691868

1870-
/* Entries are reversed due to the unusual ITS DeviceID encoding */
1871-
msi-map = <0x0 &gic_its 0x1481 0x1>,
1872-
<0x100 &gic_its 0x1480 0x1>;
1869+
msi-map = <0x0 &gic_its 0x1480 0x1>,
1870+
<0x100 &gic_its 0x1481 0x1>;
18731871
iommu-map = <0x0 &apps_smmu 0x1480 0x1>,
18741872
<0x100 &apps_smmu 0x1481 0x1>;
18751873

‎arch/arm64/boot/dts/qcom/sm8650.dtsi

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2274,9 +2274,8 @@
22742274
interrupt-map-mask = <0 0 0 0x7>;
22752275
#interrupt-cells = <1>;
22762276

2277-
/* Entries are reversed due to the unusual ITS DeviceID encoding */
2278-
msi-map = <0x0 &gic_its 0x1401 0x1>,
2279-
<0x100 &gic_its 0x1400 0x1>;
2277+
msi-map = <0x0 &gic_its 0x1400 0x1>,
2278+
<0x100 &gic_its 0x1401 0x1>;
22802279
msi-map-mask = <0xff00>;
22812280

22822281
linux,pci-domain = <0>;
@@ -2402,9 +2401,8 @@
24022401
interrupt-map-mask = <0 0 0 0x7>;
24032402
#interrupt-cells = <1>;
24042403

2405-
/* Entries are reversed due to the unusual ITS DeviceID encoding */
2406-
msi-map = <0x0 &gic_its 0x1481 0x1>,
2407-
<0x100 &gic_its 0x1480 0x1>;
2404+
msi-map = <0x0 &gic_its 0x1480 0x1>,
2405+
<0x100 &gic_its 0x1481 0x1>;
24082406
msi-map-mask = <0xff00>;
24092407

24102408
linux,pci-domain = <1>;

‎arch/arm64/boot/dts/qcom/x1e80100.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@
284284

285285
domain-idle-states {
286286
CLUSTER_CL4: cluster-sleep-0 {
287-
compatible = "arm,idle-state";
287+
compatible = "domain-idle-state";
288288
idle-state-name = "l2-ret";
289289
arm,psci-suspend-param = <0x01000044>;
290290
entry-latency-us = <350>;
@@ -293,7 +293,7 @@
293293
};
294294

295295
CLUSTER_CL5: cluster-sleep-1 {
296-
compatible = "arm,idle-state";
296+
compatible = "domain-idle-state";
297297
idle-state-name = "ret-pll-off";
298298
arm,psci-suspend-param = <0x01000054>;
299299
entry-latency-us = <2200>;

0 commit comments

Comments
 (0)