Skip to content

Commit d1181e3

Browse files
committed
Merge tag 'qcom-arm32-for-6.14' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into soc/dt
Qualcomm Arm32 DeviceTree updates for v6.14 Describe the interconnect paths for PCIe EP controllers on SDX55 and SDX65. Disable USB U1/U2 entry to improve USB stability on the same. * tag 'qcom-arm32-for-6.14' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: ARM: dts: qcom: sdx55: Disable USB U1/U2 entry ARM: dts: qcom: sdx65: Disable USB U1/U2 entry ARM: dts: qcom: sdx55: Add CPU PCIe EP interconnect path ARM: dts: qcom: sdx65: Add PCIe EP interconnect path Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 29a0522 + e3bab40 commit d1181e3

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

arch/arm/boot/dts/qcom/qcom-sdx55.dtsi

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -427,8 +427,9 @@
427427
interrupt-names = "global",
428428
"doorbell";
429429

430-
interconnects = <&system_noc MASTER_PCIE &mc_virt SLAVE_EBI_CH0>;
431-
interconnect-names = "pcie-mem";
430+
interconnects = <&system_noc MASTER_PCIE &mc_virt SLAVE_EBI_CH0>,
431+
<&mem_noc MASTER_AMPSS_M0 &system_noc SLAVE_PCIE_0>;
432+
interconnect-names = "pcie-mem", "cpu-pcie";
432433

433434
resets = <&gcc GCC_PCIE_BCR>;
434435
reset-names = "core";
@@ -613,6 +614,8 @@
613614
iommus = <&apps_smmu 0x1a0 0x0>;
614615
snps,dis_u2_susphy_quirk;
615616
snps,dis_enblslpm_quirk;
617+
snps,dis-u1-entry-quirk;
618+
snps,dis-u2-entry-quirk;
616619
phys = <&usb_hsphy>, <&usb_qmpphy>;
617620
phy-names = "usb2-phy", "usb3-phy";
618621
};

arch/arm/boot/dts/qcom/qcom-sdx65.dtsi

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -335,6 +335,10 @@
335335
<GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>;
336336
interrupt-names = "global", "doorbell";
337337

338+
interconnects = <&system_noc MASTER_PCIE_0 &mc_virt SLAVE_EBI1>,
339+
<&mem_noc MASTER_APPSS_PROC &system_noc SLAVE_PCIE_0>;
340+
interconnect-names = "pcie-mem", "cpu-pcie";
341+
338342
resets = <&gcc GCC_PCIE_BCR>;
339343
reset-names = "core";
340344

@@ -526,6 +530,8 @@
526530
iommus = <&apps_smmu 0x1a0 0x0>;
527531
snps,dis_u2_susphy_quirk;
528532
snps,dis_enblslpm_quirk;
533+
snps,dis-u1-entry-quirk;
534+
snps,dis-u2-entry-quirk;
529535
phys = <&usb_hsphy>, <&usb_qmpphy>;
530536
phy-names = "usb2-phy", "usb3-phy";
531537
};

0 commit comments

Comments
 (0)