Skip to content

Commit 8158597

Browse files
arndbarndb
committed
Merge tag 'qcom-dts-for-6.4-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into soc/dt
A few more Qualcomm ARM32 DeviceTree updates for v6.4 This adds IPA definition to the sdx65 platform, and brings a few stylistic changes to sdx55 and sdx65. Compatibles for the two new Qualcomm Robotics Platform boards, RB1 and RB2, are defined, as is Xiaomi Mi A3 and the MI01.6 development baord on IPQ5332. These are all ARM64 boards, despite being introduced through the ARM32 pull request... * tag 'qcom-dts-for-6.4-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: dt-bindings: arm: qcom: Document the Qualcomm qrb4210-rb2 board ARM: dts: qcom: sdx55-fn980: Move "status" property to the end of node ARM: dts: qcom: sdx55: Move reset and wake gpios to board dts dt-bindings: arm: qcom: document MI01.6 board based on IPQ5332 family dt-bindings: arm: qcom: Document xiaomi,laurel-sprout board dt-bindings: arm: qcom: Add QRB2210/QCM2290 and RB1 board ARM: dts: qcom: sdx65: move status properties to end of nodes ARM: dts: qcom: sdx65: add IPA information Link: https://lore.kernel.org/r/20230414023723.2411793-1-andersson@kernel.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 0a25e38 + 4e859ef commit 8158597

5 files changed

Lines changed: 84 additions & 15 deletions

File tree

‎Documentation/devicetree/bindings/arm/qcom.yaml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,10 @@ description: |
4747
msm8996
4848
msm8998
4949
qcs404
50+
qcm2290
5051
qdu1000
52+
qrb2210
53+
qrb4210
5154
qru1000
5255
sa8155p
5356
sa8540p
@@ -84,6 +87,7 @@ description: |
8487
adp
8588
ap-al02-c7
8689
ap-mi01.2
90+
ap-mi01.6
8791
cdp
8892
cp01-c1
8993
dragonboard
@@ -94,6 +98,7 @@ description: |
9498
liquid
9599
mtp
96100
qrd
101+
rb2
97102
ride
98103
sbc
99104
x100
@@ -328,6 +333,7 @@ properties:
328333
- items:
329334
- enum:
330335
- qcom,ipq5332-ap-mi01.2
336+
- qcom,ipq5332-ap-mi01.6
331337
- const: qcom,ipq5332
332338

333339
- items:
@@ -354,6 +360,13 @@ properties:
354360
- const: swir,wp8548
355361
- const: qcom,mdm9615
356362

363+
- description: Qualcomm Technologies, Inc. Robotics RB1
364+
items:
365+
- enum:
366+
- qcom,qrb2210-rb1
367+
- const: qcom,qrb2210
368+
- const: qcom,qcm2290
369+
357370
- description: Qualcomm Technologies, Inc. Distributed Unit 1000 platform
358371
items:
359372
- enum:
@@ -863,6 +876,12 @@ properties:
863876
- oneplus,billie2
864877
- const: qcom,sm4250
865878

879+
- items:
880+
- enum:
881+
- qcom,qrb4210-rb2
882+
- const: qcom,qrb4210
883+
- const: qcom,sm4250
884+
866885
- items:
867886
- enum:
868887
- lenovo,j606f
@@ -872,6 +891,7 @@ properties:
872891
- items:
873892
- enum:
874893
- sony,pdx201
894+
- xiaomi,laurel-sprout
875895
- const: qcom,sm6125
876896

877897
- items:

‎arch/arm/boot/dts/qcom-sdx55-telit-fn980-tlb.dts‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -243,18 +243,21 @@
243243
};
244244

245245
&pcie_phy {
246-
status = "okay";
247-
248246
vdda-phy-supply = <&vreg_l1e_bb_1p2>;
249247
vdda-pll-supply = <&vreg_l4e_bb_0p875>;
250-
};
251248

252-
&pcie_ep {
253249
status = "okay";
250+
};
254251

252+
&pcie_ep {
255253
pinctrl-names = "default";
256254
pinctrl-0 = <&pcie_ep_clkreq_default &pcie_ep_perst_default
257255
&pcie_ep_wake_default>;
256+
257+
reset-gpios = <&tlmm 57 GPIO_ACTIVE_LOW>;
258+
wake-gpios = <&tlmm 53 GPIO_ACTIVE_LOW>;
259+
260+
status = "okay";
258261
};
259262

260263
&qpic_bam {
@@ -277,8 +280,8 @@
277280
};
278281

279282
&remoteproc_mpss {
280-
status = "okay";
281283
memory-region = <&mpss_adsp_mem>;
284+
status = "okay";
282285
};
283286

284287
&tlmm {
@@ -305,16 +308,18 @@
305308
};
306309

307310
&usb_hsphy {
308-
status = "okay";
309311
vdda-pll-supply = <&vreg_l4e_bb_0p875>;
310312
vdda33-supply = <&vreg_l10e_3p1>;
311313
vdda18-supply = <&vreg_l5e_bb_1p7>;
314+
315+
status = "okay";
312316
};
313317

314318
&usb_qmpphy {
315-
status = "okay";
316319
vdda-phy-supply = <&vreg_l4e_bb_0p875>;
317320
vdda-pll-supply = <&vreg_l1e_bb_1p2>;
321+
322+
status = "okay";
318323
};
319324

320325
&usb {

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -421,8 +421,6 @@
421421
<GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>;
422422
interrupt-names = "global",
423423
"doorbell";
424-
reset-gpios = <&tlmm 57 GPIO_ACTIVE_LOW>;
425-
wake-gpios = <&tlmm 53 GPIO_ACTIVE_LOW>;
426424
resets = <&gcc GCC_PCIE_BCR>;
427425
reset-names = "core";
428426
power-domains = <&gcc PCIE_GDSC>;

‎arch/arm/boot/dts/qcom-sdx65-mtp.dts‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,11 @@
245245
status = "okay";
246246
};
247247

248+
&ipa {
249+
qcom,gsi-loader = "skip";
250+
status = "okay";
251+
};
252+
248253
&qpic_bam {
249254
status = "okay";
250255
};
@@ -265,8 +270,8 @@
265270
};
266271

267272
&remoteproc_mpss {
268-
status = "okay";
269273
memory-region = <&mpss_adsp_mem>;
274+
status = "okay";
270275
};
271276

272277
&usb {
@@ -278,14 +283,14 @@
278283
};
279284

280285
&usb_hsphy {
281-
status = "okay";
282286
vdda-pll-supply = <&vreg_l4b_0p88>;
283287
vdda33-supply = <&vreg_l10b_3p08>;
284288
vdda18-supply = <&vreg_l5b_1p8>;
289+
status = "okay";
285290
};
286291

287292
&usb_qmpphy {
288-
status = "okay";
289293
vdda-phy-supply = <&vreg_l4b_0p88>;
290294
vdda-pll-supply = <&vreg_l1b_1p2>;
295+
status = "okay";
291296
};

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

Lines changed: 44 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include <dt-bindings/interrupt-controller/arm-gic.h>
1212
#include <dt-bindings/power/qcom-rpmpd.h>
1313
#include <dt-bindings/soc/qcom,rpmh-rsc.h>
14+
#include <dt-bindings/interconnect/qcom,sdx65.h>
1415

1516
/ {
1617
#address-cells = <1>;
@@ -223,16 +224,15 @@
223224
"qcom,usb-snps-hs-7nm-phy";
224225
reg = <0xff4000 0x120>;
225226
#phy-cells = <0>;
226-
status = "disabled";
227227
clocks = <&rpmhcc RPMH_CXO_CLK>;
228228
clock-names = "ref";
229229
resets = <&gcc GCC_QUSB2PHY_BCR>;
230+
status = "disabled";
230231
};
231232

232233
usb_qmpphy: phy@ff6000 {
233234
compatible = "qcom,sdx65-qmp-usb3-uni-phy";
234235
reg = <0x00ff6000 0x1c8>;
235-
status = "disabled";
236236
#address-cells = <1>;
237237
#size-cells = <1>;
238238
ranges;
@@ -246,6 +246,8 @@
246246
<&gcc GCC_USB3_PHY_BCR>;
247247
reset-names = "phy", "common";
248248

249+
status = "disabled";
250+
249251
usb_ssphy: phy@ff6200 {
250252
reg = <0x00ff6e00 0x160>,
251253
<0x00ff7000 0x1ec>,
@@ -299,6 +301,44 @@
299301
#hwlock-cells = <1>;
300302
};
301303

304+
ipa: ipa@3f40000 {
305+
compatible = "qcom,sdx65-ipa";
306+
307+
reg = <0x03f40000 0x10000>,
308+
<0x03f50000 0x5000>,
309+
<0x03e04000 0xfc000>;
310+
reg-names = "ipa-reg",
311+
"ipa-shared",
312+
"gsi";
313+
314+
interrupts-extended = <&intc GIC_SPI 241 IRQ_TYPE_EDGE_RISING>,
315+
<&intc GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH>,
316+
<&ipa_smp2p_in 0 IRQ_TYPE_EDGE_RISING>,
317+
<&ipa_smp2p_in 1 IRQ_TYPE_EDGE_RISING>;
318+
interrupt-names = "ipa",
319+
"gsi",
320+
"ipa-clock-query",
321+
"ipa-setup-ready";
322+
323+
iommus = <&apps_smmu 0x5e0 0x0>,
324+
<&apps_smmu 0x5e2 0x0>;
325+
326+
clocks = <&rpmhcc RPMH_IPA_CLK>;
327+
clock-names = "core";
328+
329+
interconnects = <&system_noc MASTER_IPA &mc_virt SLAVE_EBI1>,
330+
<&mem_noc MASTER_APPSS_PROC &system_noc SLAVE_IPA_CFG>;
331+
interconnect-names = "memory",
332+
"config";
333+
334+
qcom,smem-states = <&ipa_smp2p_out 0>,
335+
<&ipa_smp2p_out 1>;
336+
qcom,smem-state-names = "ipa-clock-enabled-valid",
337+
"ipa-clock-enabled";
338+
339+
status = "disabled";
340+
};
341+
302342
remoteproc_mpss: remoteproc@4080000 {
303343
compatible = "qcom,sdx55-mpss-pas";
304344
reg = <0x04080000 0x4040>;
@@ -355,7 +395,6 @@
355395
usb: usb@a6f8800 {
356396
compatible = "qcom,sdx65-dwc3", "qcom,dwc3";
357397
reg = <0x0a6f8800 0x400>;
358-
status = "disabled";
359398
#address-cells = <1>;
360399
#size-cells = <1>;
361400
ranges;
@@ -385,6 +424,8 @@
385424

386425
resets = <&gcc GCC_USB30_BCR>;
387426

427+
status = "disabled";
428+
388429
usb_dwc3: usb@a600000 {
389430
compatible = "snps,dwc3";
390431
reg = <0x0a600000 0xcd00>;

0 commit comments

Comments
 (0)