Skip to content

Commit cc3c470

Browse files
committed
Merge tag 'arm-drivers-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM driver updates from Arnd Bergmann: "There are minor updates to SoC specific drivers for chips by Rockchip, Samsung, NVIDIA, TI, NXP, i.MX, Qualcomm, and Broadcom. Noteworthy driver changes include: - Several conversions of DT bindings to yaml format. - Renesas adds driver support for R-Car V4H, RZ/V2M and RZ/G2UL SoCs. - Qualcomm adds a bus driver for the SSC (Snapdragon Sensor Core), and support for more chips in the RPMh power domains and the soc-id. - NXP has a new driver for the HDMI blk-ctrl on i.MX8MP. - Apple M1 gains support for the on-chip NVMe controller, making it possible to finally use the internal disks. This also includes SoC drivers for their RTKit IPC and for the SART DMA address filter. For other subsystems that merge their drivers through the SoC tree, we have - Firmware drivers for the ARM firmware stack including TEE, OP-TEE, SCMI and FF-A get a number of smaller updates and cleanups. OP-TEE now has a cache for firmware argument structures as an optimization, and SCMI now supports the 3.1 version of the specification. - Reset controller updates to Amlogic, ASpeed, Renesas and ACPI drivers - Memory controller updates for Tegra, and a few updates for other platforms" * tag 'arm-drivers-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (159 commits) memory: tegra: Add MC error logging on Tegra186 onward memory: tegra: Add memory controller channels support memory: tegra: Add APE memory clients for Tegra234 memory: tegra: Add Tegra234 support nvme-apple: fix sparse endianess warnings soc/tegra: pmc: Document core domain fields soc: qcom: pdr: use static for servreg_* variables soc: imx: fix semicolon.cocci warnings soc: renesas: R-Car V3U is R-Car Gen4 soc: imx: add i.MX8MP HDMI blk-ctrl soc: imx: imx8m-blk-ctrl: Add i.MX8MP media blk-ctrl soc: imx: add i.MX8MP HSIO blk-ctrl soc: imx: imx8m-blk-ctrl: set power device name soc: qcom: llcc: Add sc8180x and sc8280xp configurations dt-bindings: arm: msm: Add sc8180x and sc8280xp LLCC compatibles soc/tegra: pmc: Select REGMAP dt-bindings: reset: st,sti-powerdown: Convert to yaml dt-bindings: reset: st,sti-picophyreset: Convert to yaml dt-bindings: reset: socfpga: Convert to yaml dt-bindings: reset: snps,axs10x-reset: Convert to yaml ...
2 parents ae86218 + d4a3b44 commit cc3c470

File tree

158 files changed

+10339
-2252
lines changed

Some content is hidden

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

158 files changed

+10339
-2252
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ properties:
2323
enum:
2424
- qcom,sc7180-llcc
2525
- qcom,sc7280-llcc
26+
- qcom,sc8180x-llcc
27+
- qcom,sc8280xp-llcc
2628
- qcom,sdm845-llcc
2729
- qcom,sm6350-llcc
2830
- qcom,sm8150-llcc

Documentation/devicetree/bindings/arm/qcom.yaml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,11 @@ description: |
3939
msm8994
4040
msm8996
4141
sa8155p
42+
sa8540p
4243
sc7180
4344
sc7280
45+
sc8180x
46+
sc8280xp
4447
sdm630
4548
sdm632
4649
sdm660
@@ -226,6 +229,18 @@ properties:
226229
- google,senor
227230
- const: qcom,sc7280
228231

232+
- items:
233+
- enum:
234+
- lenovo,flex-5g
235+
- microsoft,surface-prox
236+
- qcom,sc8180x-primus
237+
- const: qcom,sc8180x
238+
239+
- items:
240+
- enum:
241+
- qcom,sc8280xp-qrd
242+
- const: qcom,sc8280xp
243+
229244
- items:
230245
- enum:
231246
- fairphone,fp3
@@ -259,6 +274,11 @@ properties:
259274
- qcom,sa8155p-adp
260275
- const: qcom,sa8155p
261276

277+
- items:
278+
- enum:
279+
- qcom,sa8295p-adp
280+
- const: qcom,sa8540p
281+
262282
- items:
263283
- enum:
264284
- fairphone,fp4
Lines changed: 147 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,147 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/bus/qcom,ssc-block-bus.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: The AHB Bus Providing a Global View of the SSC Block on (some) qcom SoCs
8+
9+
maintainers:
10+
- Michael Srba <[email protected]>
11+
12+
description: |
13+
This binding describes the dependencies (clocks, resets, power domains) which
14+
need to be turned on in a sequence before communication over the AHB bus
15+
becomes possible.
16+
17+
Additionally, the reg property is used to pass to the driver the location of
18+
two sadly undocumented registers which need to be poked as part of the sequence.
19+
20+
The SSC (Snapdragon Sensor Core) block contains a gpio controller, i2c/spi/uart
21+
controllers, a hexagon core, and a clock controller which provides clocks for
22+
the above.
23+
24+
properties:
25+
compatible:
26+
items:
27+
- const: qcom,msm8998-ssc-block-bus
28+
- const: qcom,ssc-block-bus
29+
30+
reg:
31+
description: |
32+
Shall contain the addresses of the SSCAON_CONFIG0 and SSCAON_CONFIG1
33+
registers
34+
minItems: 2
35+
maxItems: 2
36+
37+
reg-names:
38+
items:
39+
- const: mpm_sscaon_config0
40+
- const: mpm_sscaon_config1
41+
42+
'#address-cells':
43+
enum: [ 1, 2 ]
44+
45+
'#size-cells':
46+
enum: [ 1, 2 ]
47+
48+
ranges: true
49+
50+
clocks:
51+
minItems: 6
52+
maxItems: 6
53+
54+
clock-names:
55+
items:
56+
- const: xo
57+
- const: aggre2
58+
- const: gcc_im_sleep
59+
- const: aggre2_north
60+
- const: ssc_xo
61+
- const: ssc_ahbs
62+
63+
power-domains:
64+
description: Power domain phandles for the ssc_cx and ssc_mx power domains
65+
minItems: 2
66+
maxItems: 2
67+
68+
power-domain-names:
69+
items:
70+
- const: ssc_cx
71+
- const: ssc_mx
72+
73+
resets:
74+
description: |
75+
Reset phandles for the ssc_reset and ssc_bcr resets (note: ssc_bcr is the
76+
branch control register associated with the ssc_xo and ssc_ahbs clocks)
77+
minItems: 2
78+
maxItems: 2
79+
80+
reset-names:
81+
items:
82+
- const: ssc_reset
83+
- const: ssc_bcr
84+
85+
qcom,halt-regs:
86+
$ref: /schemas/types.yaml#/definitions/phandle-array
87+
description: describes how to locate the ssc AXI halt register
88+
items:
89+
- items:
90+
- description: Phandle reference to a syscon representing TCSR
91+
- description: offset for the ssc AXI halt register
92+
93+
required:
94+
- compatible
95+
- reg
96+
- reg-names
97+
- '#address-cells'
98+
- '#size-cells'
99+
- ranges
100+
- clocks
101+
- clock-names
102+
- power-domains
103+
- power-domain-names
104+
- resets
105+
- reset-names
106+
- qcom,halt-regs
107+
108+
additionalProperties:
109+
type: object
110+
111+
examples:
112+
- |
113+
#include <dt-bindings/clock/qcom,gcc-msm8998.h>
114+
#include <dt-bindings/clock/qcom,rpmcc.h>
115+
#include <dt-bindings/power/qcom-rpmpd.h>
116+
117+
soc {
118+
#address-cells = <1>;
119+
#size-cells = <1>;
120+
121+
// devices under this node are physically located in the SSC block, connected to an ssc-internal bus;
122+
ssc_ahb_slave: bus@10ac008 {
123+
#address-cells = <1>;
124+
#size-cells = <1>;
125+
ranges;
126+
127+
compatible = "qcom,msm8998-ssc-block-bus", "qcom,ssc-block-bus";
128+
reg = <0x10ac008 0x4>, <0x10ac010 0x4>;
129+
reg-names = "mpm_sscaon_config0", "mpm_sscaon_config1";
130+
131+
clocks = <&xo>,
132+
<&rpmcc RPM_SMD_AGGR2_NOC_CLK>,
133+
<&gcc GCC_IM_SLEEP>,
134+
<&gcc AGGRE2_SNOC_NORTH_AXI>,
135+
<&gcc SSC_XO>,
136+
<&gcc SSC_CNOC_AHBS_CLK>;
137+
clock-names = "xo", "aggre2", "gcc_im_sleep", "aggre2_north", "ssc_xo", "ssc_ahbs";
138+
139+
resets = <&gcc GCC_SSC_RESET>, <&gcc GCC_SSC_BCR>;
140+
reset-names = "ssc_reset", "ssc_bcr";
141+
142+
power-domains = <&rpmpd MSM8998_SSCCX>, <&rpmpd MSM8998_SSCMX>;
143+
power-domain-names = "ssc_cx", "ssc_mx";
144+
145+
qcom,halt-regs = <&tcsr_mutex_regs 0x26000>;
146+
};
147+
};

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ Required properties:
1919
* "qcom,scm-msm8953"
2020
* "qcom,scm-msm8960"
2121
* "qcom,scm-msm8974"
22+
* "qcom,scm-msm8976"
2223
* "qcom,scm-msm8994"
2324
* "qcom,scm-msm8996"
2425
* "qcom,scm-msm8998"
@@ -37,7 +38,7 @@ Required properties:
3738
* core clock required for "qcom,scm-apq8064", "qcom,scm-msm8660" and
3839
"qcom,scm-msm8960"
3940
* core, iface and bus clocks required for "qcom,scm-apq8084",
40-
"qcom,scm-msm8916", "qcom,scm-msm8953" and "qcom,scm-msm8974"
41+
"qcom,scm-msm8916", "qcom,scm-msm8953", "qcom,scm-msm8974" and "qcom,scm-msm8976"
4142
- clock-names: Must contain "core" for the core clock, "iface" for the interface
4243
clock and "bus" for the bus clock per the requirements of the compatible.
4344
- qcom,dload-mode: phandle to the TCSR hardware block and offset of the

Documentation/devicetree/bindings/interconnect/qcom,bcm-voter.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,20 +45,20 @@ additionalProperties: false
4545

4646
examples:
4747
# Example 1: apps bcm_voter on SDM845 SoC should be defined inside &apps_rsc node
48-
# as defined in Documentation/devicetree/bindings/soc/qcom/rpmh-rsc.txt
48+
# as defined in Documentation/devicetree/bindings/soc/qcom/qcom,rpmh-rsc.yaml
4949
- |
5050
51-
apps_bcm_voter: bcm_voter {
51+
apps_bcm_voter: bcm-voter {
5252
compatible = "qcom,bcm-voter";
5353
};
5454
5555
# Example 2: disp bcm_voter on SDM845 should be defined inside &disp_rsc node
56-
# as defined in Documentation/devicetree/bindings/soc/qcom/rpmh-rsc.txt
56+
# as defined in Documentation/devicetree/bindings/soc/qcom/qcom,rpmh-rsc.yaml
5757
- |
5858
5959
#include <dt-bindings/interconnect/qcom,icc.h>
6060
61-
disp_bcm_voter: bcm_voter {
61+
disp_bcm_voter: bcm-voter {
6262
compatible = "qcom,bcm-voter";
6363
qcom,tcs-wait = <QCOM_ICC_TAG_AMC>;
6464
};
Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
# SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/iommu/apple,sart.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Apple SART DMA address filter
8+
9+
maintainers:
10+
- Sven Peter <[email protected]>
11+
12+
description:
13+
Apple SART is a simple address filter for DMA transactions. Regions of
14+
physical memory must be added to the SART's allow list before any
15+
DMA can target these. Unlike a proper IOMMU no remapping can be done and
16+
special support in the consumer driver is required since not all DMA
17+
transactions of a single device are subject to SART filtering.
18+
19+
SART1 has first been used since at least the A11 (iPhone 8 and iPhone X)
20+
and allows 36 bit of physical address space and filter entries with sizes
21+
up to 24 bit.
22+
23+
SART2, first seen in A14 and M1, allows 36 bit of physical address space
24+
and filter entry size up to 36 bit.
25+
26+
SART3, first seen in M1 Pro/Max, extends both the address space and filter
27+
entry size to 42 bit.
28+
29+
properties:
30+
compatible:
31+
enum:
32+
- apple,t6000-sart
33+
- apple,t8103-sart
34+
35+
reg:
36+
maxItems: 1
37+
38+
power-domains:
39+
maxItems: 1
40+
41+
required:
42+
- compatible
43+
- reg
44+
45+
additionalProperties: false
46+
47+
examples:
48+
- |
49+
iommu@7bc50000 {
50+
compatible = "apple,t8103-sart";
51+
reg = <0x7bc50000 0x4000>;
52+
};

Documentation/devicetree/bindings/memory-controllers/renesas,rpc-if.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,13 @@ properties:
3131
- renesas,r8a774b1-rpc-if # RZ/G2N
3232
- renesas,r8a774c0-rpc-if # RZ/G2E
3333
- renesas,r8a774e1-rpc-if # RZ/G2H
34+
- renesas,r8a7795-rpc-if # R-Car H3
35+
- renesas,r8a7796-rpc-if # R-Car M3-W
36+
- renesas,r8a77961-rpc-if # R-Car M3-W+
37+
- renesas,r8a77965-rpc-if # R-Car M3-N
3438
- renesas,r8a77970-rpc-if # R-Car V3M
3539
- renesas,r8a77980-rpc-if # R-Car V3H
40+
- renesas,r8a77990-rpc-if # R-Car E3
3641
- renesas,r8a77995-rpc-if # R-Car D3
3742
- renesas,r8a779a0-rpc-if # R-Car V3U
3843
- const: renesas,rcar-gen3-rpc-if # a generic R-Car gen3 or RZ/G2{E,H,M,N} device

0 commit comments

Comments
 (0)