Skip to content

Commit 60c2f54

Browse files
arndbarndb
committed
Merge tag 'qcom-arm64-for-6.5' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into soc/dt
Qualcomm ARM64 DeviceTree updates for v6.5 This introduces the RDP442 and RDP433 reference devices on IPQ5332 and IPQ9574, respectively. RDP418, RDP433, RDP449 and RDP453 on the IPQ9574 are added. On MSM8939 the Square T2 board and the Sony Xperia M4 Aqua is added. Support for Acer Apire 1, built on the Snapdragon 7c platform is introduced. Fxtec Pro1X on SM6115 is added. Lastly long floating support for SC8180X and the Lenovo Flex 5G, and the Primus reference device, has been added. On IPQ5332 and IPQ6018 QFPROM support is introduced, and as described above the RDP442 board on the prior. Download mode support and various reserved-memory regions are also introduced on IPQ6018. IPQ8074 gains another SPI controller. On IPQ9574 CPU frequency scaling, low speed busses, RNG, Watchdog, qfprom, SMEM and RPM are introduced. As are support for four new board, mentioned above. MSM8916 gains a range of structural improvements, to better suite the various boards supported. Regulator constraints are corrected and their states are adjusted to match reality (e.g. always-on regulators marked as always-on). BQ Aquaris X5 gains support for front flash LED. As mentioned above, MSM8939 support is introduced with support for boards from Sony and Square. MSM8953 gains DMA support in I2C masters. MSM8996-based Sony Xperia boards gains description of their RGB notification LED. On SA8775P support for UFS, USB, GPU clock and iommu controllers, PMU, AOSS, watchdog and missing low-speed controllers are added. On the Ride platform UFS, USB and an i2c bus are enabled. iommu properties are added to QSPI on both SC7180 and SC7280. LPASS clocks are adjusted and MDP node cleaned up slightly, on SC7180. As mentioned above, support for Acer Aspire 1 is introduced. Long lingering patches introducing SC8180X, the Lenovo Flex 5G and the Primus reference device has been merged. On SC8280XP ethernet is added and enabled on the automotive ride platform. An SDC controller is introduced and enabled on the SC8280XP CRD. On the Lenovo Thinkpad X13s and the CRD reference device the USB SuperSpeed phy is added to the Type-C graph, to enable support for orientation switching. Fairphone 3 gains support for its notification LED. On SDM845 the iommu stream for QSPI is defined, SHIFT SHIFT6mq gains support for flash LED and the RB3 (DB845c) board gains support for bonded/dual DSI-mode, to allow 4k output. On SM6115 CPU idle-states, crypto engine support and SuperSpeed USB PHY are introduced. As mentioned above Fxtec Pro1X is introduced. On the QRB4210 Robotics Platform RB2 USB, Audio and Compute DSPs, display, CAN-bus and GPIO LEDs are introduced, fixed regulators are described and the SD-card description is corrected. Support for crypto engine is added to SM8150, while Sony Xperia 1 and 5 gains SD-card support, camera regulators and GPIO line names sorted out. SM8250 also gets support for crypto engine, and Sony Xperia 1 II and 5 II gains support for hardware video accelerator. Crypto engine is introduced for SM8350 as well. The HDK gets the USB Type-C graph described for Superspeed orientation switching and DisplayPort output. On SM8450 video clock controller and crypto engine are added, missing opp levels are introduced and the USB Type-C graph is defined for orientation switching and altmode. SM8550 gains GPU and video clock controllers and missing opp levels are added. The WCD9385 audio codec is added for the SM8550 MTP and on the QRD PCIe, USB, audio display and flash LED are added. * tag 'qcom-arm64-for-6.5' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: (195 commits) arm64: dts: qcom: sc8180x: Introduce Lenovo Flex 5G arm64: dts: qcom: sc8180x: Introduce Primus arm64: dts: qcom: sc8180x: Add pmics arm64: dts: qcom: sc8180x: Add display and gpu nodes arm64: dts: qcom: sc8180x: Add remoteprocs, wifi and usb nodes arm64: dts: qcom: sc8180x: Add PCIe instances arm64: dts: qcom: sc8180x: Add QUPs arm64: dts: qcom: sc8180x: Add thermal zones arm64: dts: qcom: sc8180x: Add interconnects and lmh arm64: dts: qcom: Introduce the SC8180x platform arm64: dts: qcom: msm8916: Move aliases to boards arm64: dts: qcom: pm8916: Rename &wcd_codec -> &pm8916_codec arm64: dts: qcom: msm8916/39: Clean up MDSS labels arm64: dts: qcom: msm8916/39: Use consistent name for I2C/SPI pinctrl arm64: dts: qcom: msm8916/39: Rename &blsp1_uartN -> &blsp_uartN arm64: dts: qcom: msm8916: Rename &msmgpio -> &tlmm arm64: dts: qcom: qrb4210-rb2: Enable USB node arm64: dts: qcom: sm6115: Add USB SS qmp phy node arm64: dts: qcom: ipq5332: add support for the RDP442 variant dt-bindings: arm: qcom: document MI01.3 board based on IPQ5332 family ... Link: https://lore.kernel.org/r/20230611004944.2481596-1-andersson@kernel.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 70cdf5e + 20dea72 commit 60c2f54

113 files changed

Lines changed: 16128 additions & 2107 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: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ description: |
4040
msm8939
4141
msm8953
4242
msm8956
43+
msm8960
4344
msm8974
4445
msm8976
4546
msm8992
@@ -85,8 +86,12 @@ description: |
8586
The 'board' element must be one of the following strings:
8687
8788
adp
89+
ap-al02-c2
90+
ap-al02-c6
8891
ap-al02-c7
92+
ap-al02-c8
8993
ap-mi01.2
94+
ap-mi01.3
9095
ap-mi01.6
9196
cdp
9297
cp01-c1
@@ -333,6 +338,7 @@ properties:
333338
- items:
334339
- enum:
335340
- qcom,ipq5332-ap-mi01.2
341+
- qcom,ipq5332-ap-mi01.3
336342
- qcom,ipq5332-ap-mi01.6
337343
- const: qcom,ipq5332
338344

@@ -351,7 +357,10 @@ properties:
351357

352358
- items:
353359
- enum:
360+
- qcom,ipq9574-ap-al02-c2
361+
- qcom,ipq9574-ap-al02-c6
354362
- qcom,ipq9574-ap-al02-c7
363+
- qcom,ipq9574-ap-al02-c8
355364
- const: qcom,ipq9574
356365

357366
- description: Sierra Wireless MangOH Green with WP8548 Module
@@ -380,9 +389,9 @@ properties:
380389
- qcom,qru1000-idp
381390
- const: qcom,qru1000
382391

383-
- description: Qualcomm Technologies, Inc. SC7180 IDP
384-
items:
392+
- items:
385393
- enum:
394+
- acer,aspire1
386395
- qcom,sc7180-idp
387396
- const: qcom,sc7180
388397

@@ -882,6 +891,11 @@ properties:
882891
- const: qcom,qrb4210
883892
- const: qcom,sm4250
884893

894+
- items:
895+
- enum:
896+
- fxtec,pro1x
897+
- const: qcom,sm6115
898+
885899
- items:
886900
- enum:
887901
- lenovo,j606f

‎Documentation/devicetree/bindings/clock/qcom,sm8450-gpucc.yaml‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
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,sm8450-gpucc.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Qualcomm Graphics Clock & Reset Controller on SM8450
8+
9+
maintainers:
10+
- Konrad Dybcio <konrad.dybcio@linaro.org>
11+
12+
description: |
13+
Qualcomm graphics clock control module provides the clocks, resets and power
14+
domains on Qualcomm SoCs.
15+
16+
See also::
17+
include/dt-bindings/clock/qcom,sm8450-gpucc.h
18+
include/dt-bindings/clock/qcom,sm8550-gpucc.h
19+
include/dt-bindings/reset/qcom,sm8450-gpucc.h
20+
21+
properties:
22+
compatible:
23+
enum:
24+
- qcom,sm8450-gpucc
25+
- qcom,sm8550-gpucc
26+
27+
clocks:
28+
items:
29+
- description: Board XO source
30+
- description: GPLL0 main branch source
31+
- description: GPLL0 div branch source
32+
33+
'#clock-cells':
34+
const: 1
35+
36+
'#reset-cells':
37+
const: 1
38+
39+
'#power-domain-cells':
40+
const: 1
41+
42+
reg:
43+
maxItems: 1
44+
45+
required:
46+
- compatible
47+
- reg
48+
- clocks
49+
- '#clock-cells'
50+
- '#reset-cells'
51+
- '#power-domain-cells'
52+
53+
additionalProperties: false
54+
55+
examples:
56+
- |
57+
#include <dt-bindings/clock/qcom,gcc-sm8450.h>
58+
#include <dt-bindings/clock/qcom,rpmh.h>
59+
60+
soc {
61+
#address-cells = <2>;
62+
#size-cells = <2>;
63+
64+
clock-controller@3d90000 {
65+
compatible = "qcom,sm8450-gpucc";
66+
reg = <0 0x03d90000 0 0xa000>;
67+
clocks = <&rpmhcc RPMH_CXO_CLK>,
68+
<&gcc GCC_GPU_GPLL0_CLK_SRC>,
69+
<&gcc GCC_GPU_GPLL0_DIV_CLK_SRC>;
70+
#clock-cells = <1>;
71+
#reset-cells = <1>;
72+
#power-domain-cells = <1>;
73+
};
74+
};
75+
...

‎Documentation/devicetree/bindings/clock/qcom,sm8450-videocc.yaml‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
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,sm8450-videocc.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Qualcomm Video Clock & Reset Controller on SM8450
8+
9+
maintainers:
10+
- Taniya Das <quic_tdas@quicinc.com>
11+
12+
description: |
13+
Qualcomm video clock control module provides the clocks, resets and power
14+
domains on SM8450.
15+
16+
See also:: include/dt-bindings/clock/qcom,videocc-sm8450.h
17+
18+
properties:
19+
compatible:
20+
const: qcom,sm8450-videocc
21+
22+
reg:
23+
maxItems: 1
24+
25+
clocks:
26+
items:
27+
- description: Board XO source
28+
- description: Video AHB clock from GCC
29+
30+
power-domains:
31+
maxItems: 1
32+
description:
33+
MMCX power domain.
34+
35+
required-opps:
36+
maxItems: 1
37+
description:
38+
A phandle to an OPP node describing required MMCX performance point.
39+
40+
'#clock-cells':
41+
const: 1
42+
43+
'#reset-cells':
44+
const: 1
45+
46+
'#power-domain-cells':
47+
const: 1
48+
49+
required:
50+
- compatible
51+
- reg
52+
- clocks
53+
- power-domains
54+
- required-opps
55+
- '#clock-cells'
56+
- '#reset-cells'
57+
- '#power-domain-cells'
58+
59+
additionalProperties: false
60+
61+
examples:
62+
- |
63+
#include <dt-bindings/clock/qcom,gcc-sm8450.h>
64+
#include <dt-bindings/clock/qcom,rpmh.h>
65+
#include <dt-bindings/power/qcom-rpmpd.h>
66+
videocc: clock-controller@aaf0000 {
67+
compatible = "qcom,sm8450-videocc";
68+
reg = <0x0aaf0000 0x10000>;
69+
clocks = <&rpmhcc RPMH_CXO_CLK>,
70+
<&gcc GCC_VIDEO_AHB_CLK>;
71+
power-domains = <&rpmhpd SM8450_MMCX>;
72+
required-opps = <&rpmhpd_opp_low_svs>;
73+
#clock-cells = <1>;
74+
#reset-cells = <1>;
75+
#power-domain-cells = <1>;
76+
};
77+
...

‎Documentation/devicetree/bindings/nvmem/qcom,qfprom.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,11 @@ properties:
1818
- enum:
1919
- qcom,apq8064-qfprom
2020
- qcom,apq8084-qfprom
21+
- qcom,ipq5332-qfprom
22+
- qcom,ipq6018-qfprom
2123
- qcom,ipq8064-qfprom
2224
- qcom,ipq8074-qfprom
25+
- qcom,ipq9574-qfprom
2326
- qcom,msm8916-qfprom
2427
- qcom,msm8974-qfprom
2528
- qcom,msm8976-qfprom

‎Documentation/devicetree/bindings/vendor-prefixes.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1269,6 +1269,8 @@ patternProperties:
12691269
description: SpinalHDL
12701270
"^sprd,.*":
12711271
description: Spreadtrum Communications Inc.
1272+
"^square,.*":
1273+
description: Square
12721274
"^ssi,.*":
12731275
description: SSI Computer Corp
12741276
"^sst,.*":

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,20 @@
11
# SPDX-License-Identifier: GPL-2.0
22
dtb-$(CONFIG_ARCH_QCOM) += apq8016-sbc.dtb
3+
dtb-$(CONFIG_ARCH_QCOM) += apq8039-t2.dtb
34
dtb-$(CONFIG_ARCH_QCOM) += apq8094-sony-xperia-kitakami-karin_windy.dtb
45
dtb-$(CONFIG_ARCH_QCOM) += apq8096-db820c.dtb
56
dtb-$(CONFIG_ARCH_QCOM) += apq8096-ifc6640.dtb
67
dtb-$(CONFIG_ARCH_QCOM) += ipq5332-mi01.2.dtb
8+
dtb-$(CONFIG_ARCH_QCOM) += ipq5332-rdp442.dtb
79
dtb-$(CONFIG_ARCH_QCOM) += ipq5332-rdp468.dtb
810
dtb-$(CONFIG_ARCH_QCOM) += ipq6018-cp01-c1.dtb
911
dtb-$(CONFIG_ARCH_QCOM) += ipq8074-hk01.dtb
1012
dtb-$(CONFIG_ARCH_QCOM) += ipq8074-hk10-c1.dtb
1113
dtb-$(CONFIG_ARCH_QCOM) += ipq8074-hk10-c2.dtb
12-
dtb-$(CONFIG_ARCH_QCOM) += ipq9574-al02-c7.dtb
14+
dtb-$(CONFIG_ARCH_QCOM) += ipq9574-rdp418.dtb
15+
dtb-$(CONFIG_ARCH_QCOM) += ipq9574-rdp433.dtb
16+
dtb-$(CONFIG_ARCH_QCOM) += ipq9574-rdp449.dtb
17+
dtb-$(CONFIG_ARCH_QCOM) += ipq9574-rdp453.dtb
1318
dtb-$(CONFIG_ARCH_QCOM) += msm8916-acer-a1-724.dtb
1419
dtb-$(CONFIG_ARCH_QCOM) += msm8916-alcatel-idol347.dtb
1520
dtb-$(CONFIG_ARCH_QCOM) += msm8916-asus-z00l.dtb
@@ -32,6 +37,7 @@ dtb-$(CONFIG_ARCH_QCOM) += msm8916-thwc-uf896.dtb
3237
dtb-$(CONFIG_ARCH_QCOM) += msm8916-thwc-ufi001c.dtb
3338
dtb-$(CONFIG_ARCH_QCOM) += msm8916-wingtech-wt88047.dtb
3439
dtb-$(CONFIG_ARCH_QCOM) += msm8916-yiming-uz801v3.dtb
40+
dtb-$(CONFIG_ARCH_QCOM) += msm8939-sony-xperia-kanuti-tulip.dtb
3541
dtb-$(CONFIG_ARCH_QCOM) += msm8953-motorola-potter.dtb
3642
dtb-$(CONFIG_ARCH_QCOM) += msm8953-xiaomi-daisy.dtb
3743
dtb-$(CONFIG_ARCH_QCOM) += msm8953-xiaomi-mido.dtb
@@ -82,6 +88,7 @@ dtb-$(CONFIG_ARCH_QCOM) += sa8155p-adp.dtb
8288
dtb-$(CONFIG_ARCH_QCOM) += sa8295p-adp.dtb
8389
dtb-$(CONFIG_ARCH_QCOM) += sa8540p-ride.dtb
8490
dtb-$(CONFIG_ARCH_QCOM) += sa8775p-ride.dtb
91+
dtb-$(CONFIG_ARCH_QCOM) += sc7180-acer-aspire1.dtb
8592
dtb-$(CONFIG_ARCH_QCOM) += sc7180-idp.dtb
8693
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-coachz-r1.dtb
8794
dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-coachz-r1-lte.dtb
@@ -140,6 +147,8 @@ dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-zombie-nvme-lte.dtb
140147
dtb-$(CONFIG_ARCH_QCOM) += sc7280-idp.dtb
141148
dtb-$(CONFIG_ARCH_QCOM) += sc7280-idp2.dtb
142149
dtb-$(CONFIG_ARCH_QCOM) += sc7280-crd-r3.dtb
150+
dtb-$(CONFIG_ARCH_QCOM) += sc8180x-lenovo-flex-5g.dtb
151+
dtb-$(CONFIG_ARCH_QCOM) += sc8180x-primus.dtb
143152
dtb-$(CONFIG_ARCH_QCOM) += sc8280xp-crd.dtb
144153
dtb-$(CONFIG_ARCH_QCOM) += sc8280xp-lenovo-thinkpad-x13s.dtb
145154
dtb-$(CONFIG_ARCH_QCOM) += sda660-inforce-ifc6560.dtb
@@ -174,6 +183,7 @@ dtb-$(CONFIG_ARCH_QCOM) += sdm845-shift-axolotl.dtb
174183
dtb-$(CONFIG_ARCH_QCOM) += sdm850-lenovo-yoga-c630.dtb
175184
dtb-$(CONFIG_ARCH_QCOM) += sdm850-samsung-w737.dtb
176185
dtb-$(CONFIG_ARCH_QCOM) += sm4250-oneplus-billie2.dtb
186+
dtb-$(CONFIG_ARCH_QCOM) += sm6115-fxtec-pro1x.dtb
177187
dtb-$(CONFIG_ARCH_QCOM) += sm6115p-lenovo-j606f.dtb
178188
dtb-$(CONFIG_ARCH_QCOM) += sm6125-sony-xperia-seine-pdx201.dtb
179189
dtb-$(CONFIG_ARCH_QCOM) += sm6125-xiaomi-laurel-sprout.dtb

0 commit comments

Comments
 (0)