Skip to content

Commit b8979c6

Browse files
committed
Merge tag 'soc-drivers-6.12' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull SoC driver updates from Arnd Bergmann: "The driver updates seem larger this time around, with changes is many of the SoC specific drivers, both the custom drivers/soc ones and the closely related subsystems (memory, bus, firmware, reset, ...). The at91 platform gains support for sam9x7 chips in the soc and power management code. This is the latest variant of one of the oldest still supported SoC families, using the ARM9 (ARMv5) core. As usual, the qualcomm snapdragon platform gets a ton of updates in many of their drivers to add more features and additional SoC support. Most of these are somewhat firmware related as the platform has a number of firmware based interfaces to the kernel. A notable addition here is the inclusion of trace events to two of these drivers. Herve Codina and Christophe Leroy are now sending updates for drivers/soc/fsl/ code through the SoC tree, this contains both PowerPC and Arm specific platforms and has previously been problematic to maintain. The first update here contains support for newer PowerPC variants and some cleanups. The turris mox firmware driver has a number of updates, mostly cleanups. The Arm SCMI firmware driver gets a major rework to modularize the existing code into separately loadable drivers for the various transports, the addition of custom NXP i.MX9 interfaces and a number of smaller updates. The Arm FF-A firmware driver gets a feature update to support the v1.2 version of the specification. The reset controller drivers have some smaller cleanups and a newly added driver for the Intel/Mobileye EyeQ5/EyeQ6 MIPS SoCs. The memory controller drivers get some cleanups and refactoring for Tegra, TI, Freescale/NXP and a couple more platforms. Finally there are lots of minor updates to firmware (raspberry pi, tegra, imx), bus (sunxi, omap, tegra) and soc (rockchips, tegra, amlogic, mediatek) drivers and their DT bindings" * tag 'soc-drivers-6.12' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (212 commits) firmware: imx: remove duplicate scmi_imx_misc_ctrl_get() platform: cznic: turris-omnia-mcu: Fix error check in omnia_mcu_register_trng() bus: sunxi-rsb: Simplify code with dev_err_probe() soc: fsl: qe: ucc: Export ucc_mux_set_grant_tsa_bkpt soc: fsl: cpm1: qmc: Fix dependency on fsl_soc.h dt-bindings: arm: rockchip: Add rk3576 compatible string to pmu.yaml soc: fsl: qbman: Remove redundant warnings soc: fsl: qbman: Use iommu_paging_domain_alloc() MAINTAINERS: Add QE files related to the Freescale QMC controller soc: fsl: cpm1: qmc: Handle QUICC Engine (QE) soft-qmc firmware soc: fsl: cpm1: qmc: Add support for QUICC Engine (QE) implementation soc: fsl: qe: Add missing PUSHSCHED command soc: fsl: qe: Add resource-managed muram allocators soc: fsl: cpm1: qmc: Introduce qmc_version soc: fsl: cpm1: qmc: Rename SCC_GSMRL_MODE_QMC soc: fsl: cpm1: qmc: Handle RPACK initialization soc: fsl: cpm1: qmc: Rename qmc_chan_command() soc: fsl: cpm1: qmc: Introduce qmc_{init,exit}_xcc() and their CPM1 version soc: fsl: cpm1: qmc: Introduce qmc_init_resource() and its CPM1 version soc: fsl: cpm1: qmc: Re-order probe() operations ...
2 parents 7b17f5e + b628007 commit b8979c6

File tree

147 files changed

+6697
-2457
lines changed

Some content is hidden

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

147 files changed

+6697
-2457
lines changed

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

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,18 @@ select:
2525

2626
properties:
2727
compatible:
28-
items:
29-
- const: amlogic,meson-gx-ao-secure
30-
- const: syscon
31-
28+
oneOf:
29+
- items:
30+
- const: amlogic,meson-gx-ao-secure
31+
- const: syscon
32+
- items:
33+
- enum:
34+
- amlogic,a4-ao-secure
35+
- amlogic,c3-ao-secure
36+
- amlogic,s4-ao-secure
37+
- amlogic,t7-ao-secure
38+
- const: amlogic,meson-gx-ao-secure
39+
- const: syscon
3240
reg:
3341
maxItems: 1
3442

Documentation/devicetree/bindings/arm/atmel-sysregs.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ PIT Timer required properties:
1111
shared across all System Controller members.
1212

1313
PIT64B Timer required properties:
14-
- compatible: Should be "microchip,sam9x60-pit64b"
14+
- compatible: Should be "microchip,sam9x60-pit64b" or
15+
"microchip,sam9x7-pit64b", "microchip,sam9x60-pit64b"
1516
- reg: Should contain registers location and length
1617
- interrupts: Should contain interrupt for PIT64B timer
1718
- clocks: Should contain the available clock sources for PIT64B timer.
@@ -31,7 +32,8 @@ RAMC SDRAM/DDR Controller required properties:
3132
"atmel,at91sam9g45-ddramc",
3233
"atmel,sama5d3-ddramc",
3334
"microchip,sam9x60-ddramc",
34-
"microchip,sama7g5-uddrc"
35+
"microchip,sama7g5-uddrc",
36+
"microchip,sam9x7-ddramc", "atmel,sama5d3-ddramc".
3537
- reg: Should contain registers location and length
3638

3739
Examples:

Documentation/devicetree/bindings/arm/rockchip/pmu.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ select:
2626
- rockchip,rk3368-pmu
2727
- rockchip,rk3399-pmu
2828
- rockchip,rk3568-pmu
29+
- rockchip,rk3576-pmu
2930
- rockchip,rk3588-pmu
3031
- rockchip,rv1126-pmu
3132

@@ -43,6 +44,7 @@ properties:
4344
- rockchip,rk3368-pmu
4445
- rockchip,rk3399-pmu
4546
- rockchip,rk3568-pmu
47+
- rockchip,rk3576-pmu
4648
- rockchip,rk3588-pmu
4749
- rockchip,rv1126-pmu
4850
- const: syscon

Documentation/devicetree/bindings/clock/qcom,rpmcc.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ examples:
139139
- |
140140
rpm {
141141
rpm-requests {
142-
compatible = "qcom,rpm-msm8916";
142+
compatible = "qcom,rpm-msm8916", "qcom,smd-rpm";
143143
qcom,smd-channels = "rpm_requests";
144144
145145
clock-controller {

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

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ description: |
2222
2323
[0] https://developer.arm.com/documentation/den0056/latest
2424
25+
anyOf:
26+
- $ref: /schemas/firmware/nxp,imx95-scmi.yaml
27+
2528
properties:
2629
$nodename:
2730
const: scmi
@@ -121,6 +124,13 @@ properties:
121124
atomic mode of operation, even if requested.
122125
default: 0
123126

127+
max-rx-timeout-ms:
128+
description:
129+
An optional time value, expressed in milliseconds, representing the
130+
transport maximum timeout value for the receive channel. The value should
131+
be a non-zero value if set.
132+
minimum: 1
133+
124134
arm,smc-id:
125135
$ref: /schemas/types.yaml#/definitions/uint32
126136
description:
@@ -145,6 +155,14 @@ properties:
145155
required:
146156
- '#power-domain-cells'
147157

158+
protocol@12:
159+
$ref: '#/$defs/protocol-node'
160+
unevaluatedProperties: false
161+
162+
properties:
163+
reg:
164+
const: 0x12
165+
148166
protocol@13:
149167
$ref: '#/$defs/protocol-node'
150168
unevaluatedProperties: false
@@ -284,7 +302,7 @@ properties:
284302
required:
285303
- reg
286304

287-
additionalProperties: false
305+
unevaluatedProperties: false
288306

289307
$defs:
290308
protocol-node:
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
# Copyright 2024 NXP
3+
%YAML 1.2
4+
---
5+
$id: http://devicetree.org/schemas/firmware/nxp,imx95-scmi.yaml#
6+
$schema: http://devicetree.org/meta-schemas/core.yaml#
7+
8+
title: i.MX95 System Control and Management Interface(SCMI) Vendor Protocols Extension
9+
10+
maintainers:
11+
- Peng Fan <[email protected]>
12+
13+
properties:
14+
protocol@81:
15+
$ref: '/schemas/firmware/arm,scmi.yaml#/$defs/protocol-node'
16+
unevaluatedProperties: false
17+
18+
properties:
19+
reg:
20+
const: 0x81
21+
22+
protocol@84:
23+
$ref: '/schemas/firmware/arm,scmi.yaml#/$defs/protocol-node'
24+
unevaluatedProperties: false
25+
26+
properties:
27+
reg:
28+
const: 0x84
29+
30+
nxp,ctrl-ids:
31+
description:
32+
Each entry consists of 2 integers, represents the ctrl id and the value
33+
items:
34+
items:
35+
- description: the ctrl id index
36+
enum: [0, 1, 2, 3, 4, 5, 6, 7, 0x8000, 0x8001, 0x8002, 0x8003,
37+
0x8004, 0x8005, 0x8006, 0x8007]
38+
- description: the value assigned to the ctrl id
39+
minItems: 1
40+
maxItems: 16
41+
$ref: /schemas/types.yaml#/definitions/uint32-matrix
42+
43+
additionalProperties: true

Documentation/devicetree/bindings/media/s5p-mfc.txt

Whitespace-only changes.

Documentation/devicetree/bindings/memory-controllers/fsl/fsl,imx-weim.yaml

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,8 @@ allOf:
134134
properties:
135135
fsl,weim-cs-timing:
136136
items:
137-
items:
138-
- description: CSxU
139-
- description: CSxL
137+
- description: CSxU
138+
- description: CSxL
140139
- if:
141140
properties:
142141
compatible:
@@ -151,10 +150,9 @@ allOf:
151150
properties:
152151
fsl,weim-cs-timing:
153152
items:
154-
items:
155-
- description: CSCRxU
156-
- description: CSCRxL
157-
- description: CSCRxA
153+
- description: CSCRxU
154+
- description: CSCRxL
155+
- description: CSCRxA
158156
- if:
159157
properties:
160158
compatible:
@@ -171,13 +169,12 @@ allOf:
171169
properties:
172170
fsl,weim-cs-timing:
173171
items:
174-
items:
175-
- description: CSxGCR1
176-
- description: CSxGCR2
177-
- description: CSxRCR1
178-
- description: CSxRCR2
179-
- description: CSxWCR1
180-
- description: CSxWCR2
172+
- description: CSxGCR1
173+
- description: CSxGCR2
174+
- description: CSxRCR1
175+
- description: CSxRCR2
176+
- description: CSxWCR1
177+
- description: CSxWCR2
181178

182179
additionalProperties: false
183180

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,9 @@ properties:
6767
- const: dirmap
6868
- const: wbuf
6969

70-
clocks: true
70+
clocks:
71+
minItems: 1
72+
maxItems: 2
7173

7274
interrupts:
7375
maxItems: 1

Documentation/devicetree/bindings/power/rockchip-io-domain.yaml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ properties:
5050
- rockchip,rk3188-io-voltage-domain
5151
- rockchip,rk3228-io-voltage-domain
5252
- rockchip,rk3288-io-voltage-domain
53+
- rockchip,rk3308-io-voltage-domain
5354
- rockchip,rk3328-io-voltage-domain
5455
- rockchip,rk3368-io-voltage-domain
5556
- rockchip,rk3368-pmu-io-voltage-domain
@@ -71,6 +72,7 @@ allOf:
7172
- $ref: "#/$defs/rk3188"
7273
- $ref: "#/$defs/rk3228"
7374
- $ref: "#/$defs/rk3288"
75+
- $ref: "#/$defs/rk3308"
7476
- $ref: "#/$defs/rk3328"
7577
- $ref: "#/$defs/rk3368"
7678
- $ref: "#/$defs/rk3368-pmu"
@@ -194,6 +196,28 @@ $defs:
194196
wifi-supply:
195197
description: The supply connected to APIO3_VDD. Also known as SDIO0.
196198

199+
rk3308:
200+
if:
201+
properties:
202+
compatible:
203+
contains:
204+
const: rockchip,rk3308-io-voltage-domain
205+
206+
then:
207+
properties:
208+
vccio0-supply:
209+
description: The supply connected to VCCIO0.
210+
vccio1-supply:
211+
description: The supply connected to VCCIO1.
212+
vccio2-supply:
213+
description: The supply connected to VCCIO2.
214+
vccio3-supply:
215+
description: The supply connected to VCCIO3.
216+
vccio4-supply:
217+
description: The supply connected to VCCIO4.
218+
vccio5-supply:
219+
description: The supply connected to VCCIO5.
220+
197221
rk3328:
198222
if:
199223
properties:

0 commit comments

Comments
 (0)