Skip to content

Commit a907047

Browse files
committed
Merge tag 'soc-drivers-6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC driver updates from Arnd Bergmann: "The most notable updates this time are for Qualcomm Snapdragon platforms. The Inline-Crypto-Engine gets a new DT binding and driver, and a number of drivers now support additional Snapdragon variants, in particular the rsc, scm, geni, bwm, glink and socinfo, while the llcc (edac) and rpm drivers get notable functionality updates. Updates on other platforms include: - Various updates to the Mediatek mutex and mmsys drivers, including support for the Helio X10 SoC - Support for unidirectional mailbox channels in Arm SCMI firmware - Support for per cpu asynchronous notification in OP-TEE firmware - Minor updates for memory controller drivers. - Minor updates for Renesas, TI, Amlogic, Apple, Broadcom, Tegra, Allwinner, Versatile Express, Canaan, Microchip, Mediatek and i.MX SoC drivers, mainly updating the use of MODULE_LICENSE() macros and obsolete DT driver interfaces" * tag 'soc-drivers-6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (165 commits) soc: ti: smartreflex: Simplify getting the opam_sr pointer bus: vexpress-config: Add explicit of_platform.h include soc: mediatek: Kconfig: Add MTK_CMDQ dependency to MTK_MMSYS memory: mtk-smi: mt8365: Add SMI Support dt-bindings: memory-controllers: mediatek,smi-larb: add mt8365 dt-bindings: memory-controllers: mediatek,smi-common: add mt8365 memory: tegra: read values from correct device dt-bindings: crypto: Add Qualcomm Inline Crypto Engine soc: qcom: Make the Qualcomm UFS/SDCC ICE a dedicated driver dt-bindings: firmware: document Qualcomm QCM2290 SCM soc: qcom: rpmh-rsc: Support RSC v3 minor versions soc: qcom: smd-rpm: Use GFP_ATOMIC in write path soc/tegra: fuse: Remove nvmem root only access soc/tegra: cbb: tegra194: Use of_address_count() helper soc/tegra: cbb: Remove MODULE_LICENSE in non-modules ARM: tegra: Remove MODULE_LICENSE in non-modules soc/tegra: flowctrl: Use devm_platform_get_and_ioremap_resource() soc: tegra: cbb: Drop empty platform remove function firmware: arm_scmi: Add support for unidirectional mailbox channels dt-bindings: firmware: arm,scmi: Support mailboxes unidirectional channels ...
2 parents 18032df + 4c87f3f commit a907047

File tree

129 files changed

+3008
-2013
lines changed

Some content is hidden

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

129 files changed

+3008
-2013
lines changed

Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-secure.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
# Copyright 2019 BayLibre, SAS
33
%YAML 1.2
44
---
5-
$id: "http://devicetree.org/schemas/arm/amlogic/amlogic,meson-gx-ao-secure.yaml#"
6-
$schema: "http://devicetree.org/meta-schemas/core.yaml#"
5+
$id: http://devicetree.org/schemas/arm/amlogic/amlogic,meson-gx-ao-secure.yaml#
6+
$schema: http://devicetree.org/meta-schemas/core.yaml#
77

88
title: Amlogic Meson Firmware registers Interface
99

Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-mx-secbus2.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
22
%YAML 1.2
33
---
4-
$id: "http://devicetree.org/schemas/arm/amlogic/amlogic,meson-mx-secbus2.yaml#"
5-
$schema: "http://devicetree.org/meta-schemas/core.yaml#"
4+
$id: http://devicetree.org/schemas/arm/amlogic/amlogic,meson-mx-secbus2.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
66

77
title: Amlogic Meson8/Meson8b/Meson8m2 SECBUS2 register interface
88

Documentation/devicetree/bindings/arm/firmware/linaro,optee-tz.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ properties:
2828
maxItems: 1
2929
description: |
3030
This interrupt which is used to signal an event by the secure world
31-
software is expected to be edge-triggered.
31+
software is expected to be either a per-cpu interrupt or an
32+
edge-triggered peripheral interrupt.
3233
3334
method:
3435
enum: [smc, hvc]

Documentation/devicetree/bindings/arm/msm/qcom,llcc.yaml

Lines changed: 116 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Last Level Cache Controller
88

99
maintainers:
10-
- Rishabh Bhatnagar <[email protected]>
11-
- Sai Prakash Ranjan <[email protected]>
10+
- Bjorn Andersson <[email protected]>
1211

1312
description: |
1413
LLCC (Last Level Cache Controller) provides last level of cache memory in SoC,
@@ -27,21 +26,20 @@ properties:
2726
- qcom,sc8280xp-llcc
2827
- qcom,sdm845-llcc
2928
- qcom,sm6350-llcc
29+
- qcom,sm7150-llcc
3030
- qcom,sm8150-llcc
3131
- qcom,sm8250-llcc
3232
- qcom,sm8350-llcc
3333
- qcom,sm8450-llcc
3434
- qcom,sm8550-llcc
3535

3636
reg:
37-
items:
38-
- description: LLCC base register region
39-
- description: LLCC broadcast base register region
37+
minItems: 2
38+
maxItems: 9
4039

4140
reg-names:
42-
items:
43-
- const: llcc_base
44-
- const: llcc_broadcast_base
41+
minItems: 2
42+
maxItems: 9
4543

4644
interrupts:
4745
maxItems: 1
@@ -51,15 +49,120 @@ required:
5149
- reg
5250
- reg-names
5351

52+
allOf:
53+
- if:
54+
properties:
55+
compatible:
56+
contains:
57+
enum:
58+
- qcom,sc7180-llcc
59+
- qcom,sm6350-llcc
60+
then:
61+
properties:
62+
reg:
63+
items:
64+
- description: LLCC0 base register region
65+
- description: LLCC broadcast base register region
66+
reg-names:
67+
items:
68+
- const: llcc0_base
69+
- const: llcc_broadcast_base
70+
71+
- if:
72+
properties:
73+
compatible:
74+
contains:
75+
enum:
76+
- qcom,sc7280-llcc
77+
then:
78+
properties:
79+
reg:
80+
items:
81+
- description: LLCC0 base register region
82+
- description: LLCC1 base register region
83+
- description: LLCC broadcast base register region
84+
reg-names:
85+
items:
86+
- const: llcc0_base
87+
- const: llcc1_base
88+
- const: llcc_broadcast_base
89+
90+
- if:
91+
properties:
92+
compatible:
93+
contains:
94+
enum:
95+
- qcom,sc8180x-llcc
96+
- qcom,sc8280xp-llcc
97+
then:
98+
properties:
99+
reg:
100+
items:
101+
- description: LLCC0 base register region
102+
- description: LLCC1 base register region
103+
- description: LLCC2 base register region
104+
- description: LLCC3 base register region
105+
- description: LLCC4 base register region
106+
- description: LLCC5 base register region
107+
- description: LLCC6 base register region
108+
- description: LLCC7 base register region
109+
- description: LLCC broadcast base register region
110+
reg-names:
111+
items:
112+
- const: llcc0_base
113+
- const: llcc1_base
114+
- const: llcc2_base
115+
- const: llcc3_base
116+
- const: llcc4_base
117+
- const: llcc5_base
118+
- const: llcc6_base
119+
- const: llcc7_base
120+
- const: llcc_broadcast_base
121+
122+
- if:
123+
properties:
124+
compatible:
125+
contains:
126+
enum:
127+
- qcom,sdm845-llcc
128+
- qcom,sm8150-llcc
129+
- qcom,sm8250-llcc
130+
- qcom,sm8350-llcc
131+
- qcom,sm8450-llcc
132+
then:
133+
properties:
134+
reg:
135+
items:
136+
- description: LLCC0 base register region
137+
- description: LLCC1 base register region
138+
- description: LLCC2 base register region
139+
- description: LLCC3 base register region
140+
- description: LLCC broadcast base register region
141+
reg-names:
142+
items:
143+
- const: llcc0_base
144+
- const: llcc1_base
145+
- const: llcc2_base
146+
- const: llcc3_base
147+
- const: llcc_broadcast_base
148+
54149
additionalProperties: false
55150

56151
examples:
57152
- |
58153
#include <dt-bindings/interrupt-controller/arm-gic.h>
59154
60-
system-cache-controller@1100000 {
61-
compatible = "qcom,sdm845-llcc";
62-
reg = <0x1100000 0x200000>, <0x1300000 0x50000> ;
63-
reg-names = "llcc_base", "llcc_broadcast_base";
64-
interrupts = <GIC_SPI 582 IRQ_TYPE_LEVEL_HIGH>;
155+
soc {
156+
#address-cells = <2>;
157+
#size-cells = <2>;
158+
159+
system-cache-controller@1100000 {
160+
compatible = "qcom,sdm845-llcc";
161+
reg = <0 0x01100000 0 0x50000>, <0 0x01180000 0 0x50000>,
162+
<0 0x01200000 0 0x50000>, <0 0x01280000 0 0x50000>,
163+
<0 0x01300000 0 0x50000>;
164+
reg-names = "llcc0_base", "llcc1_base", "llcc2_base",
165+
"llcc3_base", "llcc_broadcast_base";
166+
interrupts = <GIC_SPI 582 IRQ_TYPE_LEVEL_HIGH>;
167+
};
65168
};
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/crypto/qcom,inline-crypto-engine.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Qualcomm Technologies, Inc. (QTI) Inline Crypto Engine
8+
9+
maintainers:
10+
- Bjorn Andersson <[email protected]>
11+
12+
properties:
13+
compatible:
14+
items:
15+
- enum:
16+
- qcom,sm8550-inline-crypto-engine
17+
- const: qcom,inline-crypto-engine
18+
19+
reg:
20+
maxItems: 1
21+
22+
clocks:
23+
maxItems: 1
24+
25+
required:
26+
- compatible
27+
- reg
28+
- clocks
29+
30+
additionalProperties: false
31+
32+
examples:
33+
- |
34+
#include <dt-bindings/clock/qcom,sm8550-gcc.h>
35+
36+
crypto@1d88000 {
37+
compatible = "qcom,sm8550-inline-crypto-engine",
38+
"qcom,inline-crypto-engine";
39+
reg = <0x01d88000 0x8000>;
40+
clocks = <&gcc GCC_UFS_PHY_ICE_CORE_CLK>;
41+
};
42+
...

Documentation/devicetree/bindings/firmware/arm,scmi.yaml

Lines changed: 38 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -56,17 +56,38 @@ properties:
5656
description:
5757
Specifies the mailboxes used to communicate with SCMI compliant
5858
firmware.
59-
items:
60-
- const: tx
61-
- const: rx
59+
oneOf:
60+
- items:
61+
- const: tx
62+
- const: rx
63+
minItems: 1
64+
- items:
65+
- const: tx
66+
- const: tx_reply
67+
- const: rx
68+
minItems: 2
6269

6370
mboxes:
6471
description:
6572
List of phandle and mailbox channel specifiers. It should contain
66-
exactly one or two mailboxes, one for transmitting messages("tx")
67-
and another optional for receiving the notifications("rx") if supported.
73+
exactly one, two or three mailboxes; the first one or two for transmitting
74+
messages ("tx") and another optional ("rx") for receiving notifications
75+
and delayed responses, if supported by the platform.
76+
The number of mailboxes needed for transmitting messages depends on the
77+
type of channels exposed by the specific underlying mailbox controller;
78+
one single channel descriptor is enough if such channel is bidirectional,
79+
while two channel descriptors are needed to represent the SCMI ("tx")
80+
channel if the underlying mailbox channels are of unidirectional type.
81+
The effective combination in numbers of mboxes and shmem descriptors let
82+
the SCMI subsystem determine unambiguosly which type of SCMI channels are
83+
made available by the underlying mailbox controller and how to use them.
84+
1 mbox / 1 shmem => SCMI TX over 1 mailbox bidirectional channel
85+
2 mbox / 2 shmem => SCMI TX and RX over 2 mailbox bidirectional channels
86+
2 mbox / 1 shmem => SCMI TX over 2 mailbox unidirectional channels
87+
3 mbox / 2 shmem => SCMI TX and RX over 3 mailbox unidirectional channels
88+
Any other combination of mboxes and shmem is invalid.
6889
minItems: 1
69-
maxItems: 2
90+
maxItems: 3
7091

7192
shmem:
7293
description:
@@ -228,13 +249,20 @@ $defs:
228249
maxItems: 1
229250

230251
mbox-names:
231-
items:
232-
- const: tx
233-
- const: rx
252+
oneOf:
253+
- items:
254+
- const: tx
255+
- const: rx
256+
minItems: 1
257+
- items:
258+
- const: tx
259+
- const: tx_reply
260+
- const: rx
261+
minItems: 2
234262

235263
mboxes:
236264
minItems: 1
237-
maxItems: 2
265+
maxItems: 3
238266

239267
shmem:
240268
minItems: 1

Documentation/devicetree/bindings/firmware/qcom,scm.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,11 @@ properties:
2424
- qcom,scm-apq8064
2525
- qcom,scm-apq8084
2626
- qcom,scm-ipq4019
27+
- qcom,scm-ipq5332
2728
- qcom,scm-ipq6018
2829
- qcom,scm-ipq806x
2930
- qcom,scm-ipq8074
31+
- qcom,scm-ipq9574
3032
- qcom,scm-mdm9607
3133
- qcom,scm-msm8226
3234
- qcom,scm-msm8660
@@ -38,10 +40,12 @@ properties:
3840
- qcom,scm-msm8994
3941
- qcom,scm-msm8996
4042
- qcom,scm-msm8998
43+
- qcom,scm-qcm2290
4144
- qcom,scm-qdu1000
4245
- qcom,scm-sa8775p
4346
- qcom,scm-sc7180
4447
- qcom,scm-sc7280
48+
- qcom,scm-sc8180x
4549
- qcom,scm-sc8280xp
4650
- qcom,scm-sdm670
4751
- qcom,scm-sdm845
@@ -107,6 +111,7 @@ allOf:
107111
- qcom,scm-msm8960
108112
- qcom,scm-msm8974
109113
- qcom,scm-msm8976
114+
- qcom,scm-qcm2290
110115
- qcom,scm-sm6375
111116
then:
112117
required:
@@ -125,6 +130,7 @@ allOf:
125130
- qcom,scm-apq8064
126131
- qcom,scm-msm8660
127132
- qcom,scm-msm8960
133+
- qcom,scm-qcm2290
128134
- qcom,scm-sm6375
129135
then:
130136
properties:
@@ -166,6 +172,7 @@ allOf:
166172
compatible:
167173
contains:
168174
enum:
175+
- qcom,scm-qdu1000
169176
- qcom,scm-sm8450
170177
- qcom,scm-sm8550
171178
then:

Documentation/devicetree/bindings/memory-controllers/mediatek,smi-common.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ properties:
4343
- mediatek,mt8195-smi-common-vdo
4444
- mediatek,mt8195-smi-common-vpp
4545
- mediatek,mt8195-smi-sub-common
46+
- mediatek,mt8365-smi-common
4647

4748
- description: for mt7623
4849
items:
@@ -133,6 +134,7 @@ allOf:
133134
- mediatek,mt8192-smi-common
134135
- mediatek,mt8195-smi-common-vdo
135136
- mediatek,mt8195-smi-common-vpp
137+
- mediatek,mt8365-smi-common
136138

137139
then:
138140
properties:

Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ properties:
3434
- const: mediatek,mt7623-smi-larb
3535
- const: mediatek,mt2701-smi-larb
3636

37+
- items:
38+
- const: mediatek,mt8365-smi-larb
39+
- const: mediatek,mt8186-smi-larb
40+
3741
reg:
3842
maxItems: 1
3943

Documentation/devicetree/bindings/memory-controllers/renesas,dbsc.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
22
%YAML 1.2
33
---
4-
$id: "http://devicetree.org/schemas/memory-controllers/renesas,dbsc.yaml#"
5-
$schema: "http://devicetree.org/meta-schemas/core.yaml#"
4+
$id: http://devicetree.org/schemas/memory-controllers/renesas,dbsc.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
66

77
title: Renesas DDR Bus Controllers
88

0 commit comments

Comments
 (0)