Skip to content

Commit 19a4eaa

Browse files
arndbarndb
committed
Merge tag 'memory-controller-drv-6.9-2' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl into soc/drivers
Memory controller drivers for v6.9, part two 1. Renesas RPC-IF: add bindings for R-Car V4M. 2. Tegra MC: correct and extend support for Tegra234 memory controller. 3. STM32: add support for Flexible Memory Controller on MP25 SoC. 4. NXP WEIM bindings: convert to DT schema. * tag 'memory-controller-drv-6.9-2' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl: memory: stm32-fmc2-ebi: keep power domain on memory: stm32-fmc2-ebi: add MP25 RIF support memory: stm32-fmc2-ebi: add MP25 support memory: stm32-fmc2-ebi: check regmap_read return value dt-bindings: memory-controller: st,stm32: add MP25 support dt-bindings: bus: imx-weim: convert to YAML memory: tegra: Fix indentation memory: tegra: Add BPMP and ICC info for DLA clients memory: tegra: Correct DLA client names dt-bindings: memory: renesas,rpc-if: Document R-Car V4M support Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 9398cee + e460769 commit 19a4eaa

File tree

9 files changed

+963
-177
lines changed

9 files changed

+963
-177
lines changed

‎Documentation/devicetree/bindings/bus/imx-weim.txt

Lines changed: 0 additions & 117 deletions
This file was deleted.

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

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/memory-controllers/fsl/fsl,imx-weim-peripherals.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: i.MX WEIM Bus Peripheral Nodes
8+
9+
maintainers:
10+
- Shawn Guo <[email protected]>
11+
- Sascha Hauer <[email protected]>
12+
13+
description:
14+
This binding is meant for the child nodes of the WEIM node. The node
15+
represents any device connected to the WEIM bus. It may be a Flash chip,
16+
RAM chip or Ethernet controller, etc. These properties are meant for
17+
configuring the WEIM settings/timings and will accompany the bindings
18+
supported by the respective device.
19+
20+
properties:
21+
reg: true
22+
23+
fsl,weim-cs-timing:
24+
$ref: /schemas/types.yaml#/definitions/uint32-array
25+
description:
26+
Timing values for the child node.
27+
minItems: 2
28+
maxItems: 6
29+
30+
# the WEIM child will have its own native properties
31+
additionalProperties: true

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

Lines changed: 204 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,204 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/memory-controllers/fsl/fsl,imx-weim.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: i.MX Wireless External Interface Module (WEIM)
8+
9+
maintainers:
10+
- Shawn Guo <[email protected]>
11+
- Sascha Hauer <[email protected]>
12+
13+
description:
14+
The term "wireless" does not imply that the WEIM is literally an interface
15+
without wires. It simply means that this module was originally designed for
16+
wireless and mobile applications that use low-power technology. The actual
17+
devices are instantiated from the child nodes of a WEIM node.
18+
19+
properties:
20+
$nodename:
21+
pattern: "^memory-controller@[0-9a-f]+$"
22+
23+
compatible:
24+
oneOf:
25+
- enum:
26+
- fsl,imx1-weim
27+
- fsl,imx27-weim
28+
- fsl,imx50-weim
29+
- fsl,imx51-weim
30+
- fsl,imx6q-weim
31+
- items:
32+
- enum:
33+
- fsl,imx31-weim
34+
- fsl,imx35-weim
35+
- const: fsl,imx27-weim
36+
- items:
37+
- enum:
38+
- fsl,imx6sx-weim
39+
- fsl,imx6ul-weim
40+
- const: fsl,imx6q-weim
41+
42+
"#address-cells":
43+
const: 2
44+
45+
"#size-cells":
46+
const: 1
47+
48+
reg:
49+
maxItems: 1
50+
51+
clocks:
52+
maxItems: 1
53+
54+
interrupts:
55+
maxItems: 1
56+
57+
ranges: true
58+
59+
fsl,weim-cs-gpr:
60+
$ref: /schemas/types.yaml#/definitions/phandle
61+
description: |
62+
Phandle to the system General Purpose Register controller that contains
63+
WEIM CS GPR register, e.g. IOMUXC_GPR1 on i.MX6Q. IOMUXC_GPR1[11:0]
64+
should be set up as one of the following 4 possible values depending on
65+
the CS space configuration.
66+
67+
IOMUXC_GPR1[11:0] CS0 CS1 CS2 CS3
68+
---------------------------------------------
69+
05 128M 0M 0M 0M
70+
033 64M 64M 0M 0M
71+
0113 64M 32M 32M 0M
72+
01111 32M 32M 32M 32M
73+
74+
In case that the property is absent, the reset value or what bootloader
75+
sets up in IOMUXC_GPR1[11:0] will be used.
76+
77+
fsl,burst-clk-enable:
78+
type: boolean
79+
description:
80+
The presence of this property indicates that the weim bus should operate
81+
in Burst Clock Mode.
82+
83+
fsl,continuous-burst-clk:
84+
type: boolean
85+
description:
86+
Make Burst Clock to output continuous clock. Without this option Burst
87+
Clock will output clock only when necessary.
88+
89+
patternProperties:
90+
"^.*@[0-7],[0-9a-f]+$":
91+
type: object
92+
description: Devices attached to chip selects are represented as subnodes.
93+
$ref: fsl,imx-weim-peripherals.yaml
94+
additionalProperties: true
95+
required:
96+
- fsl,weim-cs-timing
97+
98+
required:
99+
- compatible
100+
- reg
101+
- clocks
102+
- "#address-cells"
103+
- "#size-cells"
104+
- ranges
105+
106+
allOf:
107+
- if:
108+
properties:
109+
compatible:
110+
not:
111+
contains:
112+
enum:
113+
- fsl,imx50-weim
114+
- fsl,imx6q-weim
115+
then:
116+
properties:
117+
fsl,weim-cs-gpr: false
118+
fsl,burst-clk-enable: false
119+
- if:
120+
not:
121+
required:
122+
- fsl,burst-clk-enable
123+
then:
124+
properties:
125+
fsl,continuous-burst-clk: false
126+
- if:
127+
properties:
128+
compatible:
129+
contains:
130+
const: fsl,imx1-weim
131+
then:
132+
patternProperties:
133+
"^.*@[0-7],[0-9a-f]+$":
134+
properties:
135+
fsl,weim-cs-timing:
136+
items:
137+
items:
138+
- description: CSxU
139+
- description: CSxL
140+
- if:
141+
properties:
142+
compatible:
143+
contains:
144+
enum:
145+
- fsl,imx27-weim
146+
- fsl,imx31-weim
147+
- fsl,imx35-weim
148+
then:
149+
patternProperties:
150+
"^.*@[0-7],[0-9a-f]+$":
151+
properties:
152+
fsl,weim-cs-timing:
153+
items:
154+
items:
155+
- description: CSCRxU
156+
- description: CSCRxL
157+
- description: CSCRxA
158+
- if:
159+
properties:
160+
compatible:
161+
contains:
162+
enum:
163+
- fsl,imx50-weim
164+
- fsl,imx51-weim
165+
- fsl,imx6q-weim
166+
- fsl,imx6sx-weim
167+
- fsl,imx6ul-weim
168+
then:
169+
patternProperties:
170+
"^.*@[0-7],[0-9a-f]+$":
171+
properties:
172+
fsl,weim-cs-timing:
173+
items:
174+
items:
175+
- description: CSxGCR1
176+
- description: CSxGCR2
177+
- description: CSxRCR1
178+
- description: CSxRCR2
179+
- description: CSxWCR1
180+
- description: CSxWCR2
181+
182+
additionalProperties: false
183+
184+
examples:
185+
- |
186+
memory-controller@21b8000 {
187+
compatible = "fsl,imx6q-weim";
188+
reg = <0x021b8000 0x4000>;
189+
clocks = <&clks 196>;
190+
#address-cells = <2>;
191+
#size-cells = <1>;
192+
ranges = <0 0 0x08000000 0x08000000>;
193+
fsl,weim-cs-gpr = <&gpr>;
194+
195+
flash@0,0 {
196+
compatible = "cfi-flash";
197+
reg = <0 0 0x02000000>;
198+
#address-cells = <1>;
199+
#size-cells = <1>;
200+
bank-width = <2>;
201+
fsl,weim-cs-timing = <0x00620081 0x00000001 0x1c022000
202+
0x0000c000 0x1404a38e 0x00000000>;
203+
};
204+
};

‎Documentation/devicetree/bindings/memory-controllers/mc-peripheral-props.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,6 @@ allOf:
3737
- $ref: ingenic,nemc-peripherals.yaml#
3838
- $ref: intel,ixp4xx-expansion-peripheral-props.yaml#
3939
- $ref: ti,gpmc-child.yaml#
40+
- $ref: fsl/fsl,imx-weim-peripherals.yaml
4041

4142
additionalProperties: true

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ properties:
4545
- items:
4646
- enum:
4747
- renesas,r8a779g0-rpc-if # R-Car V4H
48+
- renesas,r8a779h0-rpc-if # R-Car V4M
4849
- const: renesas,rcar-gen4-rpc-if # a generic R-Car gen4 device
4950

5051
- items:

‎Documentation/devicetree/bindings/memory-controllers/st,stm32-fmc2-ebi.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ maintainers:
2323

2424
properties:
2525
compatible:
26-
const: st,stm32mp1-fmc2-ebi
26+
enum:
27+
- st,stm32mp1-fmc2-ebi
28+
- st,stm32mp25-fmc2-ebi
2729

2830
reg:
2931
maxItems: 1
@@ -34,6 +36,9 @@ properties:
3436
resets:
3537
maxItems: 1
3638

39+
power-domains:
40+
maxItems: 1
41+
3742
"#address-cells":
3843
const: 2
3944

0 commit comments

Comments
 (0)