Skip to content

Commit 6a46901

Browse files
linuswlinusw
committed
Merge tag 'qcom-arm64-for-7.2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into soc/dt
Qualcomm Arm64 DeviceTree updates for v7.2 Introduce the Qualcomm IPQ9650 router/gateway platform and the RDP488 board. Add support for the Motorola Edge 30 and the Nothing Phone. Describe the IPA block on the Agatti platform and missing OPP-levels for the video encoder/decoder. For Eliza, describe the QUP Serial Engines, GPI DMA, SDHCI, LLCC, IMEM, QCE crypto, ADSP remoteproc and USB nodes. Enable DSI panel, DisplayPort, USB, and ADSP support on the Eliza MTP. On Glymur enable ADSP and CDSP remoteprocs, FastRPC, crypto hardware, CPUfreq cooling devices, and coresight nodes. Enable the remoteprocs and the LID sensor on the Glymur CRD. Describe the CAN-FD controller found on the Hamoa EVK. Correct the DisplayPort controller OPP tables. Describe the watchdog on IPQ5210 and IPQ9650. Describe USB controller and PHYs for the Kaanapali platform and enable basic USB support on the MTP and QRD devices. Enable the second display subsystem on Lemans and use this to enable additional DisplayPort outputs on the Lemans Ride board, and IFP mezzanine for the EVK. Also enable the GPIO expander on the Lemans EVK to get the CAN signals out. Add crypto hardware and qfprom nodes on Milos. Reduce the remotefs shared memory size to avoid sanity checks in the modem firmware rejecting the region. Enable the vibrator on FairPhone FP6. Add GPSDP FastRPC support on Monaco, and describe the Bluetooth controller on the Arduino VENTUNO Q board. Introduce an EL2 overlay for the Purwa IoT EVK. Enable CAN bus controller on QCS6490 RB3gen2 and add a remotefs node. Enable FastRPC on the SC8280XP ADSP. Correct SDM630 and SDM660 ADSP FastRPC channel ids. Also add the ADSP memory region on SDM630. On SDM845 devices, enable NFC on Google Pixel 3, OnePlus 6, OnePlus 6T, and SHIFT SHIFT6mq. Enable camera flash on LG devices. Rework the framebuffer description on Samsung, SHIFT and Xiaomi devices. Enable camera flash on LG devices. Fix Bluetooth and WiFi on LG and Xiaomi devices. Enable MDSS and the display panel on Xiaomi Mi A3. Scale L3 and DDR clock votes based on CPUfreq selection. Enable camera clock controller, cpufreq cooling devices, and correct the DSI1 reference clock on SM8750. On the Talos platform, describe the QSPI support, GPR and audio services, and enable sound on the EVK target. Enable QSPI and describe the SPINOR on this bus, on the QCS615 Ride. Describe power-domain and iface clock for the Inline Crypto Engine (ICE) across various platforms. Fix the Bluetooth RFA supply name across a variety of devices. * tag 'qcom-arm64-for-7.2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: (131 commits) arm64: dts: qcom: add support for pixel 3a xl with the tianma panel arm64: dts: qcom: sdm670-google: add common device tree include arm64: dts: qcom: hamoa-iot-evk: add MCP2518FD CAN on spi18 arm64: dts: qcom: sm8750: allow mode-switch events to reach the QMP Combo PHY arm64: dts: qcom: sc8280xp: drop unused polling-delay-passive properties arm64: dts: qcom: ipq5210: add watchdog node arm64: dts: qcom: sdm845-xiaomi-beryllium: Correct IPA FW path arm64: dts: qcom: monaco-arduino-monza: Add Bluetooth UART node arm64: dts: qcom: glymur: Add qfprom efuse node arm64: dts: qcom: milos: Add qfprom efuse node arm64: dts: qcom: glymur: add coresight nodes arm64: dts: qcom: qcs6490-rb3gen2: add rmtfs node arm64: dts: qcom: lemans-evk: Enable CAN RX via I2C GPIO expander arm64: dts: qcom: glymur: Fix wrong interrupt number for i2c19 arm64: dts: qcom: Drop unused remoteproc_adsp_glink label arm64: dts: qcom: lemans: Add eDP ref clock for eDP PHYs arm64: dts: qcom: sm8750: Add power-domain and iface clk for ice node arm64: dts: qcom: sm8650: Add power-domain and iface clk for ice node arm64: dts: qcom: sm8550: Add power-domain and iface clk for ice node arm64: dts: qcom: sm8450: Add power-domain and iface clk for ice node ... Signed-off-by: Linus Walleij <linusw@kernel.org>
2 parents 9bca2a5 + f3919fa commit 6a46901

76 files changed

Lines changed: 11129 additions & 1598 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ properties:
7979
- items:
8080
- enum:
8181
- fairphone,fp6
82+
- nothing,asteroids
8283
- const: qcom,milos
8384

8485
- items:
@@ -365,6 +366,11 @@ properties:
365366
- qcom,ipq9574-ap-al02-c9
366367
- const: qcom,ipq9574
367368

369+
- items:
370+
- enum:
371+
- qcom,ipq9650-rdp488
372+
- const: qcom,ipq9650
373+
368374
- items:
369375
- enum:
370376
- qcom,kaanapali-mtp
@@ -822,6 +828,14 @@ properties:
822828
- const: google,zombie-sku514
823829
- const: qcom,sc7280
824830

831+
- description: Xiaomi Poco F1
832+
items:
833+
- enum:
834+
- xiaomi,beryllium-ebbg
835+
- xiaomi,beryllium-tianma
836+
- const: xiaomi,beryllium
837+
- const: qcom,sdm845
838+
825839
- items:
826840
- enum:
827841
- lenovo,flex-5g
@@ -972,8 +986,6 @@ properties:
972986
- sony,akatsuki-row
973987
- sony,apollo-row
974988
- thundercomm,db845c
975-
- xiaomi,beryllium
976-
- xiaomi,beryllium-ebbg
977989
- xiaomi,polaris
978990
- const: qcom,sdm845
979991

@@ -1040,6 +1052,7 @@ properties:
10401052

10411053
- items:
10421054
- enum:
1055+
- motorola,dubai
10431056
- nothing,spacewar
10441057
- const: qcom,sm7325
10451058

@@ -1168,6 +1181,10 @@ properties:
11681181
- const: microsoft,denali
11691182
- const: qcom,x1e80100
11701183

1184+
- items:
1185+
- const: microsoft,surface-pro-12in
1186+
- const: qcom,x1p42100
1187+
11711188
- items:
11721189
- enum:
11731190
- qcom,purwa-iot-evk

‎Documentation/devicetree/bindings/clock/qcom,ipq9650-gcc.yaml‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/clock/qcom,ipq9650-gcc.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Qualcomm Global Clock & Reset Controller on IPQ9650
8+
9+
maintainers:
10+
- Bjorn Andersson <andersson@kernel.org>
11+
- Kathiravan Thirumoorthy <kathiravan.thirumoorthy@oss.qualcomm.com>
12+
13+
description: |
14+
Qualcomm global clock control module provides the clocks, resets and power
15+
domains on IPQ9650
16+
17+
See also:
18+
include/dt-bindings/clock/qcom,ipq9650-gcc.h
19+
include/dt-bindings/reset/qcom,ipq9650-gcc.h
20+
21+
properties:
22+
compatible:
23+
const: qcom,ipq9650-gcc
24+
25+
clocks:
26+
items:
27+
- description: Board XO source
28+
- description: Sleep clock source
29+
- description: PCIE30 PHY0 pipe clock source
30+
- description: PCIE30 PHY1 pipe clock source
31+
- description: PCIE30 PHY2 pipe clock source
32+
- description: PCIE30 PHY3 pipe clock source
33+
- description: PCIE30 PHY4 pipe clock source
34+
- description: USB PCIE wrapper pipe clock source
35+
- description: NSS common clock source
36+
37+
'#power-domain-cells': false
38+
39+
'#interconnect-cells':
40+
const: 1
41+
42+
required:
43+
- compatible
44+
- clocks
45+
46+
allOf:
47+
- $ref: qcom,gcc.yaml#
48+
49+
unevaluatedProperties: false
50+
51+
examples:
52+
- |
53+
clock-controller@1800000 {
54+
compatible = "qcom,ipq9650-gcc";
55+
reg = <0x01800000 0x40000>;
56+
clocks = <&xo_board_clk>,
57+
<&sleep_clk>,
58+
<&pcie30_phy0_pipe_clk>,
59+
<&pcie30_phy1_pipe_clk>,
60+
<&pcie30_phy2_pipe_clk>,
61+
<&pcie30_phy3_pipe_clk>,
62+
<&pcie30_phy4_pipe_clk>,
63+
<&usb3phy_0_cc_pipe_clk>,
64+
<&nss_cmn_clk>;
65+
#clock-cells = <1>;
66+
#reset-cells = <1>;
67+
};
68+
...

‎Documentation/devicetree/bindings/net/bluetooth/qcom,wcn6855-bt.yaml‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,6 @@ properties:
5050
description: VDD_RFA_1P7 supply regulator handle
5151
deprecated: true
5252

53-
vddrfa1p8-supply:
54-
description: VDD_RFA_1P8 supply regulator handle
55-
5653
vddrfacmn-supply:
5754
description: VDD_RFA_CMN supply regulator handle
5855

@@ -68,7 +65,7 @@ required:
6865
- vddbtcmx-supply
6966
- vddrfa0p8-supply
7067
- vddrfa1p2-supply
71-
- vddrfa1p8-supply
68+
- vddrfa1p7-supply
7269
- vddrfacmn-supply
7370
- vddwlcx-supply
7471
- vddwlmx-supply
@@ -91,7 +88,7 @@ examples:
9188
vddbtcmx-supply = <&vreg_pmu_btcmx_0p8>;
9289
vddrfa0p8-supply = <&vreg_pmu_rfa_0p8>;
9390
vddrfa1p2-supply = <&vreg_pmu_rfa_1p2>;
94-
vddrfa1p8-supply = <&vreg_pmu_rfa_1p7>;
91+
vddrfa1p7-supply = <&vreg_pmu_rfa_1p7>;
9592
vddrfacmn-supply = <&vreg_pmu_rfa_cmn_0p8>;
9693
vddwlcx-supply = <&vreg_pmu_wlcx_0p8>;
9794
vddwlmx-supply = <&vreg_pmu_wlmx_0p8>;

‎arch/arm64/boot/dts/qcom/Makefile‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ dtb-$(CONFIG_ARCH_QCOM) += ipq9574-rdp433.dtb ipq9574-rdp433-emmc.dtb
3939
dtb-$(CONFIG_ARCH_QCOM) += ipq9574-rdp449.dtb
4040
dtb-$(CONFIG_ARCH_QCOM) += ipq9574-rdp453.dtb
4141
dtb-$(CONFIG_ARCH_QCOM) += ipq9574-rdp454.dtb
42+
dtb-$(CONFIG_ARCH_QCOM) += ipq9650-rdp488.dtb
4243
dtb-$(CONFIG_ARCH_QCOM) += kaanapali-mtp.dtb
4344
dtb-$(CONFIG_ARCH_QCOM) += kaanapali-qrd.dtb
4445
dtb-$(CONFIG_ARCH_QCOM) += lemans-evk.dtb
@@ -56,6 +57,7 @@ lemans-evk-ifp-mezzanine-dtbs := lemans-evk.dtb lemans-evk-ifp-mezzanine.dtbo
5657
dtb-$(CONFIG_ARCH_QCOM) += lemans-evk-ifp-mezzanine.dtb
5758
dtb-$(CONFIG_ARCH_QCOM) += mahua-crd.dtb
5859
dtb-$(CONFIG_ARCH_QCOM) += milos-fairphone-fp6.dtb
60+
dtb-$(CONFIG_ARCH_QCOM) += milos-nothing-asteroids.dtb
5961
dtb-$(CONFIG_ARCH_QCOM) += monaco-arduino-monza.dtb
6062
dtb-$(CONFIG_ARCH_QCOM) += monaco-evk.dtb
6163

@@ -157,6 +159,10 @@ dtb-$(CONFIG_ARCH_QCOM) += msm8998-sony-xperia-yoshino-maple.dtb
157159
dtb-$(CONFIG_ARCH_QCOM) += msm8998-sony-xperia-yoshino-poplar.dtb
158160
dtb-$(CONFIG_ARCH_QCOM) += msm8998-xiaomi-sagit.dtb
159161
dtb-$(CONFIG_ARCH_QCOM) += purwa-iot-evk.dtb
162+
163+
purwa-iot-evk-el2-dtbs := purwa-iot-evk.dtb x1-el2.dtbo
164+
165+
dtb-$(CONFIG_ARCH_QCOM) += purwa-iot-evk-el2.dtb
160166
dtb-$(CONFIG_ARCH_QCOM) += qcm6490-fairphone-fp5.dtb
161167
dtb-$(CONFIG_ARCH_QCOM) += qcm6490-idp.dtb
162168
dtb-$(CONFIG_ARCH_QCOM) += qcm6490-particle-tachyon.dtb
@@ -302,6 +308,7 @@ dtb-$(CONFIG_ARCH_QCOM) += sdm632-fairphone-fp3.dtb
302308
dtb-$(CONFIG_ARCH_QCOM) += sdm632-motorola-ocean.dtb
303309
dtb-$(CONFIG_ARCH_QCOM) += sdm636-sony-xperia-ganges-mermaid.dtb
304310
dtb-$(CONFIG_ARCH_QCOM) += sdm660-xiaomi-lavender.dtb
311+
dtb-$(CONFIG_ARCH_QCOM) += sdm670-google-bonito-tianma.dtb
305312
dtb-$(CONFIG_ARCH_QCOM) += sdm670-google-sargo.dtb
306313
dtb-$(CONFIG_ARCH_QCOM) += sdm845-db845c.dtb
307314

@@ -340,6 +347,7 @@ dtb-$(CONFIG_ARCH_QCOM) += sm6375-sony-xperia-murray-pdx225.dtb
340347
dtb-$(CONFIG_ARCH_QCOM) += sm7125-xiaomi-curtana.dtb
341348
dtb-$(CONFIG_ARCH_QCOM) += sm7125-xiaomi-joyeuse.dtb
342349
dtb-$(CONFIG_ARCH_QCOM) += sm7225-fairphone-fp4.dtb
350+
dtb-$(CONFIG_ARCH_QCOM) += sm7325-motorola-dubai.dtb
343351
dtb-$(CONFIG_ARCH_QCOM) += sm7325-nothing-spacewar.dtb
344352
dtb-$(CONFIG_ARCH_QCOM) += sm8150-hdk.dtb
345353
dtb-$(CONFIG_ARCH_QCOM) += sm8150-microsoft-surface-duo.dtb

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

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -433,6 +433,18 @@
433433
interrupt-controller;
434434
#interrupt-cells = <2>;
435435
};
436+
437+
ipa_smp2p_out: ipa-ap-to-modem {
438+
qcom,entry-name = "ipa";
439+
#qcom,smem-state-cells = <1>;
440+
};
441+
442+
ipa_smp2p_in: ipa-modem-to-ap {
443+
qcom,entry-name = "ipa";
444+
interrupt-controller;
445+
#interrupt-cells = <2>;
446+
};
447+
436448
};
437449

438450
soc: soc@0 {
@@ -1641,6 +1653,47 @@
16411653
};
16421654
};
16431655

1656+
ipa: ipa@5840000 {
1657+
compatible = "qcom,qcm2290-ipa", "qcom,sc7180-ipa";
1658+
1659+
iommus = <&apps_smmu 0x140 0x0>;
1660+
reg = <0x0 0x05840000 0x0 0x7000>,
1661+
<0x0 0x05847000 0x0 0x2000>,
1662+
<0x0 0x05804000 0x0 0x2c000>;
1663+
reg-names = "ipa-reg",
1664+
"ipa-shared",
1665+
"gsi";
1666+
1667+
interrupts-extended = <&intc GIC_SPI 257 IRQ_TYPE_EDGE_RISING>,
1668+
<&intc GIC_SPI 259 IRQ_TYPE_LEVEL_HIGH>,
1669+
<&ipa_smp2p_in 0 IRQ_TYPE_EDGE_RISING>,
1670+
<&ipa_smp2p_in 1 IRQ_TYPE_EDGE_RISING>;
1671+
interrupt-names = "ipa",
1672+
"gsi",
1673+
"ipa-clock-query",
1674+
"ipa-setup-ready";
1675+
1676+
clocks = <&rpmcc RPM_SMD_IPA_CLK>;
1677+
clock-names = "core";
1678+
1679+
interconnects = <&system_noc MASTER_IPA RPM_ALWAYS_TAG
1680+
&bimc SLAVE_EBI1 RPM_ALWAYS_TAG>,
1681+
<&system_noc MASTER_IPA RPM_ALWAYS_TAG
1682+
&system_noc SLAVE_IMEM RPM_ALWAYS_TAG>,
1683+
<&bimc MASTER_APPSS_PROC RPM_ACTIVE_TAG
1684+
&config_noc SLAVE_IPA_CFG RPM_ACTIVE_TAG>;
1685+
interconnect-names = "memory",
1686+
"imem",
1687+
"config";
1688+
1689+
qcom,smem-states = <&ipa_smp2p_out 0>,
1690+
<&ipa_smp2p_out 1>;
1691+
qcom,smem-state-names = "ipa-clock-enabled-valid",
1692+
"ipa-clock-enabled";
1693+
1694+
status = "disabled";
1695+
};
1696+
16441697
gpu: gpu@5900000 {
16451698
compatible = "qcom,adreno-07000200", "qcom,adreno";
16461699
reg = <0x0 0x05900000 0x0 0x40000>,
@@ -2455,6 +2508,16 @@
24552508
opp-hz = /bits/ 64 <240000000>;
24562509
required-opps = <&rpmpd_opp_svs>;
24572510
};
2511+
2512+
opp-300000000 {
2513+
opp-hz = /bits/ 64 <300000000>;
2514+
required-opps = <&rpmpd_opp_svs_plus>;
2515+
};
2516+
2517+
opp-384000000 {
2518+
opp-hz = /bits/ 64 <384000000>;
2519+
required-opps = <&rpmpd_opp_nom>;
2520+
};
24582521
};
24592522
};
24602523

0 commit comments

Comments
 (0)