Skip to content

Commit a1f4991

Browse files
arndbarndb
committed
Merge tag 'qcom-arm64-for-6.20-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into soc/dt
More Qualcomm Arm64 DeviceTree updates for v6.20 Enable ADSP FastRPC and add missing GPU memory regions on Agatti. Also add the missing GPU regions on SM6115. Describe the application subsystem watchdog on Hamoa and enable this in the EL2 configurations. Add the camera control interface (CCI) I2C controller on MSM8953, and describe the camera regulators and the camera EEPROM on Fairphone FP3. Specify clock frequency for the i2c4 bus on OnePlus 6, to silence the warnings about missing frequency definition. Add FastRPC and associated heap memory, as well as Coresight, on SM8750 Switch a variety of platforms to use the generic RPMPD_ constants, instead of target-specific duplicated, to allow us to drop these from the header files. Drop the invalid opp-shared on the QUP OPP table for Talos. * tag 'qcom-arm64-for-6.20-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: arm64: dts: qcom: sm6115: Add CX_MEM/DBGC GPU regions arm64: dts: qcom: agatti: Add CX_MEM/DBGC GPU regions arm64: dts: qcom: sm8750: add ADSP fastrpc-compute-cb nodes arm64: dts: qcom: sm8750: add memory node for adsp fastrpc arm64: dts: qcom: switch to RPMPD_* indices arm64: dts: qcom: oneplus-enchilada: Specify i2c4 clock frequency arm64: dts: qcom: sm6350: Add clocks for aggre1 & aggre2 NoC arm64: dts: qcom: agatti: enable FastRPC on the ADSP arm64: qcom: dts: sm8750: add coresight nodes arm64: dts: qcom: talos: Drop opp-shared from QUP OPP table arm64: dts: qcom: x1-el2: Enable the APSS watchdog arm64: dts: qcom: hamoa: Add the APSS watchdog dt-bindings: watchdog: Document X1E80100 compatible arm64: dts: qcom: sdm632-fairphone-fp3: Enable CCI and add EEPROM arm64: dts: qcom: sdm632-fairphone-fp3: Add camera fixed regulators arm64: dts: qcom: msm8953: Add CCI nodes arm64: dts: qcom: msm8953: Re-sort tlmm pinctrl states Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 67fea39 + 78c13da commit a1f4991

19 files changed

Lines changed: 1694 additions & 466 deletions

‎Documentation/devicetree/bindings/watchdog/qcom-wdt.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ properties:
4343
- qcom,apss-wdt-sm6350
4444
- qcom,apss-wdt-sm8150
4545
- qcom,apss-wdt-sm8250
46+
- qcom,apss-wdt-x1e80100
4647
- const: qcom,kpss-wdt
4748
- const: qcom,kpss-wdt
4849
deprecated: true

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

Lines changed: 47 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1643,8 +1643,12 @@
16431643

16441644
gpu: gpu@5900000 {
16451645
compatible = "qcom,adreno-07000200", "qcom,adreno";
1646-
reg = <0x0 0x05900000 0x0 0x40000>;
1647-
reg-names = "kgsl_3d0_reg_memory";
1646+
reg = <0x0 0x05900000 0x0 0x40000>,
1647+
<0x0 0x0599e000 0x0 0x1000>,
1648+
<0x0 0x05961000 0x0 0x800>;
1649+
reg-names = "kgsl_3d0_reg_memory",
1650+
"cx_mem",
1651+
"cx_dbgc";
16481652

16491653
interrupts = <GIC_SPI 177 IRQ_TYPE_LEVEL_HIGH>;
16501654

@@ -2287,6 +2291,47 @@
22872291
};
22882292
};
22892293
};
2294+
2295+
fastrpc {
2296+
compatible = "qcom,fastrpc";
2297+
qcom,glink-channels = "fastrpcglink-apps-dsp";
2298+
label = "adsp";
2299+
2300+
qcom,non-secure-domain;
2301+
2302+
#address-cells = <1>;
2303+
#size-cells = <0>;
2304+
2305+
compute-cb@3 {
2306+
compatible = "qcom,fastrpc-compute-cb";
2307+
reg = <3>;
2308+
iommus = <&apps_smmu 0x1c3 0x0>;
2309+
};
2310+
2311+
compute-cb@4 {
2312+
compatible = "qcom,fastrpc-compute-cb";
2313+
reg = <4>;
2314+
iommus = <&apps_smmu 0x1c4 0x0>;
2315+
};
2316+
2317+
compute-cb@5 {
2318+
compatible = "qcom,fastrpc-compute-cb";
2319+
reg = <5>;
2320+
iommus = <&apps_smmu 0x1c5 0x0>;
2321+
};
2322+
2323+
compute-cb@6 {
2324+
compatible = "qcom,fastrpc-compute-cb";
2325+
reg = <6>;
2326+
iommus = <&apps_smmu 0x1c6 0x0>;
2327+
};
2328+
2329+
compute-cb@7 {
2330+
compatible = "qcom,fastrpc-compute-cb";
2331+
reg = <7>;
2332+
iommus = <&apps_smmu 0x1c7 0x0>;
2333+
};
2334+
};
22902335
};
22912336
};
22922337

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8360,6 +8360,14 @@
83608360
};
83618361
};
83628362

8363+
apss_watchdog: watchdog@17410000 {
8364+
compatible = "qcom,apss-wdt-x1e80100", "qcom,kpss-wdt";
8365+
reg = <0x0 0x17410000 0x0 0x1000>;
8366+
clocks = <&sleep_clk>;
8367+
interrupts = <GIC_SPI 0 IRQ_TYPE_EDGE_RISING>;
8368+
status = "reserved"; /* Reserved by Gunyah */
8369+
};
8370+
83638371
cpucp_mbox: mailbox@17430000 {
83648372
compatible = "qcom,x1e80100-cpucp-mbox";
83658373
reg = <0 0x17430000 0 0x10000>, <0 0x18830000 0 0x10000>;

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1945,8 +1945,8 @@
19451945
interrupt-names = "wdog", "fatal", "ready",
19461946
"handover", "stop-ack";
19471947

1948-
power-domains = <&rpmpd MSM8916_VDDCX>,
1949-
<&rpmpd MSM8916_VDDMX>;
1948+
power-domains = <&rpmpd RPMPD_VDDCX>,
1949+
<&rpmpd RPMPD_VDDMX>;
19501950
power-domain-names = "cx", "mx";
19511951

19521952
clocks = <&gcc GCC_MSS_CFG_AHB_CLK>,
@@ -2449,8 +2449,8 @@
24492449
<&wcnss_smp2p_in 3 IRQ_TYPE_EDGE_RISING>;
24502450
interrupt-names = "wdog", "fatal", "ready", "handover", "stop-ack";
24512451

2452-
power-domains = <&rpmpd MSM8916_VDDCX>,
2453-
<&rpmpd MSM8916_VDDMX>;
2452+
power-domains = <&rpmpd RPMPD_VDDCX>,
2453+
<&rpmpd RPMPD_VDDMX>;
24542454
power-domain-names = "cx", "mx";
24552455

24562456
qcom,smem-states = <&wcnss_smp2p_out 0>;

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1070,7 +1070,7 @@
10701070
phys = <&mdss_dsi0_phy>;
10711071

10721072
operating-points-v2 = <&mdss_dsi0_opp_table>;
1073-
power-domains = <&rpmpd MSM8917_VDDCX>;
1073+
power-domains = <&rpmpd RPMPD_VDDCX>;
10741074

10751075
#address-cells = <1>;
10761076
#size-cells = <0>;
@@ -1288,7 +1288,7 @@
12881288
pinctrl-0 = <&sdc1_default>;
12891289
pinctrl-1 = <&sdc1_sleep>;
12901290
pinctrl-names = "default", "sleep";
1291-
power-domains = <&rpmpd MSM8917_VDDCX>;
1291+
power-domains = <&rpmpd RPMPD_VDDCX>;
12921292
mmc-hs200-1_8v;
12931293
mmc-hs400-1_8v;
12941294
mmc-ddr-1_8v;
@@ -1313,7 +1313,7 @@
13131313
pinctrl-0 = <&sdc2_default>;
13141314
pinctrl-1 = <&sdc2_sleep>;
13151315
pinctrl-names = "default", "sleep";
1316-
power-domains = <&rpmpd MSM8917_VDDCX>;
1316+
power-domains = <&rpmpd RPMPD_VDDCX>;
13171317
bus-width = <4>;
13181318
status = "disabled";
13191319
};
@@ -1517,8 +1517,8 @@
15171517
<&wcnss_smp2p_in 3 IRQ_TYPE_EDGE_RISING>;
15181518
interrupt-names = "wdog", "fatal", "ready", "handover", "stop-ack";
15191519

1520-
power-domains = <&rpmpd MSM8917_VDDCX>,
1521-
<&rpmpd MSM8917_VDDMX>;
1520+
power-domains = <&rpmpd RPMPD_VDDCX>,
1521+
<&rpmpd RPMPD_VDDMX>;
15221522
power-domain-names = "cx", "mx";
15231523

15241524
qcom,smem-states = <&wcnss_smp2p_out 0>;

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1122,7 +1122,7 @@
11221122
phys = <&mdss_dsi0_phy>;
11231123

11241124
operating-points-v2 = <&mdss_dsi0_opp_table>;
1125-
power-domains = <&rpmpd MSM8937_VDDCX>;
1125+
power-domains = <&rpmpd RPMPD_VDDCX>;
11261126

11271127
#address-cells = <1>;
11281128
#size-cells = <0>;
@@ -1210,7 +1210,7 @@
12101210
phys = <&mdss_dsi1_phy>;
12111211

12121212
operating-points-v2 = <&mdss_dsi1_opp_table>;
1213-
power-domains = <&rpmpd MSM8937_VDDCX>;
1213+
power-domains = <&rpmpd RPMPD_VDDCX>;
12141214

12151215
#address-cells = <1>;
12161216
#size-cells = <0>;
@@ -1457,7 +1457,7 @@
14571457
pinctrl-1 = <&sdc1_sleep>;
14581458
pinctrl-names = "default",
14591459
"sleep";
1460-
power-domains = <&rpmpd MSM8937_VDDCX>;
1460+
power-domains = <&rpmpd RPMPD_VDDCX>;
14611461
mmc-hs200-1_8v;
14621462
mmc-hs400-1_8v;
14631463
mmc-ddr-1_8v;
@@ -1487,7 +1487,7 @@
14871487
pinctrl-1 = <&sdc2_sleep>;
14881488
pinctrl-names = "default",
14891489
"sleep";
1490-
power-domains = <&rpmpd MSM8937_VDDCX>;
1490+
power-domains = <&rpmpd RPMPD_VDDCX>;
14911491
bus-width = <4>;
14921492
status = "disabled";
14931493
};
@@ -1710,8 +1710,8 @@
17101710
"handover",
17111711
"stop-ack";
17121712

1713-
power-domains = <&rpmpd MSM8937_VDDCX>,
1714-
<&rpmpd MSM8937_VDDMX>;
1713+
power-domains = <&rpmpd RPMPD_VDDCX>,
1714+
<&rpmpd RPMPD_VDDMX>;
17151715
power-domain-names = "cx",
17161716
"mx";
17171717

0 commit comments

Comments
 (0)