Skip to content

Commit 2e368dd

Browse files
committed
Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC-related driver updates from Olof Johansson: "Various driver updates for platforms. A bulk of this is smaller fixes or cleanups, but some of the new material this time around is: - Support for Nvidia Tegra234 SoC - Ring accelerator support for TI AM65x - PRUSS driver for TI platforms - Renesas support for R-Car V3U SoC - Reset support for Cortex-M4 processor on i.MX8MQ There are also new socinfo entries for a handful of different SoCs and platforms" * tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (131 commits) drm/mediatek: reduce clear event soc: mediatek: cmdq: add clear option in cmdq_pkt_wfe api soc: mediatek: cmdq: add jump function soc: mediatek: cmdq: add write_s_mask value function soc: mediatek: cmdq: add write_s value function soc: mediatek: cmdq: add read_s function soc: mediatek: cmdq: add write_s_mask function soc: mediatek: cmdq: add write_s function soc: mediatek: cmdq: add address shift in jump soc: mediatek: mtk-infracfg: Fix kerneldoc soc: amlogic: pm-domains: use always-on flag reset: sti: reset-syscfg: fix struct description warnings reset: imx7: add the cm4 reset for i.MX8MQ dt-bindings: reset: imx8mq: add m4 reset reset: Fix and extend kerneldoc reset: reset-zynqmp: Added support for Versal platform dt-bindings: reset: Updated binding for Versal reset driver reset: imx7: Support module build soc: fsl: qe: Remove unnessesary check in ucc_set_tdm_rxtx_clk soc: fsl: qman: convert to use be32_add_cpu() ...
2 parents e731f31 + 9f7f269 commit 2e368dd

117 files changed

Lines changed: 3901 additions & 912 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/bus/brcm,gisb-arb.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ Required properties:
1010
"brcm,bcm7038-gisb-arb" for 130nm chips
1111
- reg: specifies the base physical address and size of the registers
1212
- interrupts: specifies the two interrupts (timeout and TEA) to be used from
13-
the parent interrupt controller
13+
the parent interrupt controller. A third optional interrupt may be specified
14+
for breakpoints.
1415

1516
Optional properties:
1617

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ The hardware block diagram please check bindings/iommu/mediatek,iommu.txt
55
Mediatek SMI have two generations of HW architecture, here is the list
66
which generation the SoCs use:
77
generation 1: mt2701 and mt7623.
8-
generation 2: mt2712, mt6779, mt8173 and mt8183.
8+
generation 2: mt2712, mt6779, mt8167, mt8173 and mt8183.
99

1010
There's slight differences between the two SMI, for generation 2, the
1111
register which control the iommu port is at each larb's register base. But
@@ -20,6 +20,7 @@ Required properties:
2020
"mediatek,mt2712-smi-common"
2121
"mediatek,mt6779-smi-common"
2222
"mediatek,mt7623-smi-common", "mediatek,mt2701-smi-common"
23+
"mediatek,mt8167-smi-common"
2324
"mediatek,mt8173-smi-common"
2425
"mediatek,mt8183-smi-common"
2526
- reg : the register and size of the SMI block.

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ Required properties:
88
"mediatek,mt2712-smi-larb"
99
"mediatek,mt6779-smi-larb"
1010
"mediatek,mt7623-smi-larb", "mediatek,mt2701-smi-larb"
11+
"mediatek,mt8167-smi-larb"
1112
"mediatek,mt8173-smi-larb"
1213
"mediatek,mt8183-smi-larb"
1314
- reg : the register and size of this local arbiter.
@@ -22,7 +23,7 @@ Required properties:
2223
- "gals": the clock for GALS(Global Async Local Sync).
2324
Here is the list which has this GALS: mt8183.
2425

25-
Required property for mt2701, mt2712, mt6779 and mt7623:
26+
Required property for mt2701, mt2712, mt6779, mt7623 and mt8167:
2627
- mediatek,larb-id :the hardware id of this larb.
2728

2829
Example:

Documentation/devicetree/bindings/power/amlogic,meson-ee-pwrc.yaml

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ properties:
2727
- amlogic,meson8b-pwrc
2828
- amlogic,meson8m2-pwrc
2929
- amlogic,meson-gxbb-pwrc
30+
- amlogic,meson-axg-pwrc
3031
- amlogic,meson-g12a-pwrc
3132
- amlogic,meson-sm1-pwrc
3233

@@ -42,11 +43,11 @@ properties:
4243
- const: vapb
4344

4445
resets:
45-
minItems: 11
46+
minItems: 5
4647
maxItems: 12
4748

4849
reset-names:
49-
minItems: 11
50+
minItems: 5
5051
maxItems: 12
5152

5253
"#power-domain-cells":
@@ -107,6 +108,24 @@ allOf:
107108
- resets
108109
- reset-names
109110

111+
- if:
112+
properties:
113+
compatible:
114+
enum:
115+
- amlogic,meson-axg-pwrc
116+
then:
117+
properties:
118+
reset-names:
119+
items:
120+
- const: viu
121+
- const: venc
122+
- const: vcbus
123+
- const: vencl
124+
- const: vid_lock
125+
required:
126+
- resets
127+
- reset-names
128+
110129
- if:
111130
properties:
112131
compatible:
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: "http://devicetree.org/schemas/power/brcm,bcm63xx-power.yaml#"
5+
$schema: "http://devicetree.org/meta-schemas/core.yaml#"
6+
7+
title: BCM63xx power domain driver
8+
9+
maintainers:
10+
- Álvaro Fernández Rojas <noltari@gmail.com>
11+
12+
description: |
13+
BCM6318, BCM6328, BCM6362 and BCM63268 SoCs have a power domain controller
14+
to enable/disable certain components in order to save power.
15+
16+
properties:
17+
compatible:
18+
items:
19+
- enum:
20+
- brcm,bcm6318-power-controller
21+
- brcm,bcm6328-power-controller
22+
- brcm,bcm6362-power-controller
23+
- brcm,bcm63268-power-controller
24+
25+
reg:
26+
maxItems: 1
27+
28+
"#power-domain-cells":
29+
const: 1
30+
31+
required:
32+
- compatible
33+
- reg
34+
- "#power-domain-cells"
35+
36+
additionalProperties: false
37+
38+
examples:
39+
- |
40+
periph_pwr: power-controller@10001848 {
41+
compatible = "brcm,bcm6328-power-controller";
42+
reg = <0x10001848 0x4>;
43+
#power-domain-cells = <1>;
44+
};

Documentation/devicetree/bindings/reset/xlnx,zynqmp-reset.txt

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
--------------------------------------------------------------------------
2-
= Zynq UltraScale+ MPSoC reset driver binding =
2+
= Zynq UltraScale+ MPSoC and Versal reset driver binding =
33
--------------------------------------------------------------------------
4-
The Zynq UltraScale+ MPSoC has several different resets.
4+
The Zynq UltraScale+ MPSoC and Versal has several different resets.
55

66
See Chapter 36 of the Zynq UltraScale+ MPSoC TRM (UG) for more information
77
about zynqmp resets.
@@ -10,7 +10,8 @@ Please also refer to reset.txt in this directory for common reset
1010
controller binding usage.
1111

1212
Required Properties:
13-
- compatible: "xlnx,zynqmp-reset"
13+
- compatible: "xlnx,zynqmp-reset" for Zynq UltraScale+ MPSoC platform
14+
"xlnx,versal-reset" for Versal platform
1415
- #reset-cells: Specifies the number of cells needed to encode reset
1516
line, should be 1
1617

@@ -37,8 +38,10 @@ Device nodes that need access to reset lines should
3738
specify them as a reset phandle in their corresponding node as
3839
specified in reset.txt.
3940

40-
For list of all valid reset indicies see
41+
For list of all valid reset indices for Zynq UltraScale+ MPSoC see
4142
<dt-bindings/reset/xlnx-zynqmp-resets.h>
43+
For list of all valid reset indices for Versal see
44+
<dt-bindings/reset/xlnx-versal-resets.h>
4245

4346
Example:
4447

Documentation/devicetree/bindings/soc/ti/k3-ringacc.yaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,6 @@ properties:
6262
$ref: /schemas/types.yaml#/definitions/uint32
6363
description: TI-SCI device id of the ring accelerator
6464

65-
ti,dma-ring-reset-quirk:
66-
$ref: /schemas/types.yaml#definitions/flag
67-
description: |
68-
enable ringacc/udma ring state interoperability issue software w/a
69-
7065
required:
7166
- compatible
7267
- reg
@@ -94,7 +89,6 @@ examples:
9489
reg-names = "rt", "fifos", "proxy_gcfg", "proxy_target";
9590
ti,num-rings = <818>;
9691
ti,sci-rm-range-gp-rings = <0x2>; /* GP ring range */
97-
ti,dma-ring-reset-quirk;
9892
ti,sci = <&dmsc>;
9993
ti,sci-dev-id = <187>;
10094
msi-parent = <&inta_main_udmass>;

0 commit comments

Comments
 (0)