Skip to content

Commit 627522c

Browse files
committed
Merge tag 'qcom-arm64-fixes-for-6.13' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/fixes
Qualcomm Arm64 DeviceTree fixes for v6.13 Revert the enablement of OTG support on primary and secondary USB Type-C controllers of X1 Elite, for now, as this broke support for USB hotplug. Disable the TPDM DCC device on SA8775P, as this is inaccessible per current firmware configuration. Also correct the PCIe "addr_space" region to enable larger BAR sizes. Also fix the address space of PCIe6a found in X1 Elite. * tag 'qcom-arm64-fixes-for-6.13' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: arm64: dts: qcom: sa8775p: fix the secure device bootup issue Revert "arm64: dts: qcom: x1e80100: enable OTG on USB-C controllers" Revert "arm64: dts: qcom: x1e80100-crd: enable otg on usb ports" arm64: dts: qcom: x1e80100: Fix up BAR space size for PCIe6a Revert "arm64: dts: qcom: x1e78100-t14s: enable otg on usb-c ports" arm64: dts: qcom: sa8775p: Fix the size of 'addr_space' regions Link: https://lore.kernel.org/r/20250103024945.4649-1-andersson@kernel.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 9d89551 + 8a6442e commit 627522c

File tree

4 files changed

+24
-9
lines changed

4 files changed

+24
-9
lines changed

arch/arm64/boot/dts/qcom/sa8775p.dtsi

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2440,6 +2440,7 @@
24402440

24412441
qcom,cmb-element-bits = <32>;
24422442
qcom,cmb-msrs-num = <32>;
2443+
status = "disabled";
24432444

24442445
out-ports {
24452446
port {
@@ -6092,7 +6093,7 @@
60926093
<0x0 0x40000000 0x0 0xf20>,
60936094
<0x0 0x40000f20 0x0 0xa8>,
60946095
<0x0 0x40001000 0x0 0x4000>,
6095-
<0x0 0x40200000 0x0 0x100000>,
6096+
<0x0 0x40200000 0x0 0x1fe00000>,
60966097
<0x0 0x01c03000 0x0 0x1000>,
60976098
<0x0 0x40005000 0x0 0x2000>;
60986099
reg-names = "parf", "dbi", "elbi", "atu", "addr_space",
@@ -6250,7 +6251,7 @@
62506251
<0x0 0x60000000 0x0 0xf20>,
62516252
<0x0 0x60000f20 0x0 0xa8>,
62526253
<0x0 0x60001000 0x0 0x4000>,
6253-
<0x0 0x60200000 0x0 0x100000>,
6254+
<0x0 0x60200000 0x0 0x1fe00000>,
62546255
<0x0 0x01c13000 0x0 0x1000>,
62556256
<0x0 0x60005000 0x0 0x2000>;
62566257
reg-names = "parf", "dbi", "elbi", "atu", "addr_space",

arch/arm64/boot/dts/qcom/x1e78100-lenovo-thinkpad-t14s.dts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -773,6 +773,10 @@
773773
status = "okay";
774774
};
775775

776+
&usb_1_ss0_dwc3 {
777+
dr_mode = "host";
778+
};
779+
776780
&usb_1_ss0_dwc3_hs {
777781
remote-endpoint = <&pmic_glink_ss0_hs_in>;
778782
};
@@ -801,6 +805,10 @@
801805
status = "okay";
802806
};
803807

808+
&usb_1_ss1_dwc3 {
809+
dr_mode = "host";
810+
};
811+
804812
&usb_1_ss1_dwc3_hs {
805813
remote-endpoint = <&pmic_glink_ss1_hs_in>;
806814
};

arch/arm64/boot/dts/qcom/x1e80100-crd.dts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1197,6 +1197,10 @@
11971197
status = "okay";
11981198
};
11991199

1200+
&usb_1_ss0_dwc3 {
1201+
dr_mode = "host";
1202+
};
1203+
12001204
&usb_1_ss0_dwc3_hs {
12011205
remote-endpoint = <&pmic_glink_ss0_hs_in>;
12021206
};
@@ -1225,6 +1229,10 @@
12251229
status = "okay";
12261230
};
12271231

1232+
&usb_1_ss1_dwc3 {
1233+
dr_mode = "host";
1234+
};
1235+
12281236
&usb_1_ss1_dwc3_hs {
12291237
remote-endpoint = <&pmic_glink_ss1_hs_in>;
12301238
};
@@ -1253,6 +1261,10 @@
12531261
status = "okay";
12541262
};
12551263

1264+
&usb_1_ss2_dwc3 {
1265+
dr_mode = "host";
1266+
};
1267+
12561268
&usb_1_ss2_dwc3_hs {
12571269
remote-endpoint = <&pmic_glink_ss2_hs_in>;
12581270
};

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2924,7 +2924,7 @@
29242924
#address-cells = <3>;
29252925
#size-cells = <2>;
29262926
ranges = <0x01000000 0x0 0x00000000 0x0 0x70200000 0x0 0x100000>,
2927-
<0x02000000 0x0 0x70300000 0x0 0x70300000 0x0 0x1d00000>;
2927+
<0x02000000 0x0 0x70300000 0x0 0x70300000 0x0 0x3d00000>;
29282928
bus-range = <0x00 0xff>;
29292929

29302930
dma-coherent;
@@ -4066,8 +4066,6 @@
40664066

40674067
dma-coherent;
40684068

4069-
usb-role-switch;
4070-
40714069
ports {
40724070
#address-cells = <1>;
40734071
#size-cells = <0>;
@@ -4321,8 +4319,6 @@
43214319

43224320
dma-coherent;
43234321

4324-
usb-role-switch;
4325-
43264322
ports {
43274323
#address-cells = <1>;
43284324
#size-cells = <0>;
@@ -4421,8 +4417,6 @@
44214417

44224418
dma-coherent;
44234419

4424-
usb-role-switch;
4425-
44264420
ports {
44274421
#address-cells = <1>;
44284422
#size-cells = <0>;

0 commit comments

Comments
 (0)