Skip to content

Commit 41d7004

Browse files
krzkkrzk
committed
Merge tag 'ti-k3-dt-for-v7.1-part2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/ti/linux into soc/dt
TI K3 device tree updates for v7.1 part2 Late addition: - Use memory-region-names for r5f across K3 SoCs * tag 'ti-k3-dt-for-v7.1-part2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/ti/linux: arm64: dts: ti: k3: Use memory-region-names for r5f Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
2 parents 5b3a6cf + abe76f9 commit 41d7004

10 files changed

Lines changed: 38 additions & 0 deletions

‎arch/arm64/boot/dts/ti/k3-am62-ti-ipc-firmware.dtsi‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,5 +48,6 @@
4848
mboxes = <&mailbox0_cluster0 &mbox_r5_0>;
4949
memory-region = <&wkup_r5fss0_core0_dma_memory_region>,
5050
<&wkup_r5fss0_core0_memory_region>;
51+
memory-region-names = "dma", "firmware";
5152
status = "okay";
5253
};

‎arch/arm64/boot/dts/ti/k3-am62a-ti-ipc-firmware.dtsi‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
mboxes = <&mailbox0_cluster0>, <&mbox_r5_0>;
6767
memory-region = <&wkup_r5fss0_core0_dma_memory_region>,
6868
<&wkup_r5fss0_core0_memory_region>;
69+
memory-region-names = "dma", "firmware";
6970
status = "okay";
7071
};
7172

@@ -77,6 +78,7 @@
7778
mboxes = <&mailbox0_cluster2>, <&mbox_mcu_r5_0>;
7879
memory-region = <&mcu_r5fss0_core0_dma_memory_region>,
7980
<&mcu_r5fss0_core0_memory_region>;
81+
memory-region-names = "dma", "firmware";
8082
status = "okay";
8183
};
8284

‎arch/arm64/boot/dts/ti/k3-am62p-ti-ipc-firmware.dtsi‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
mboxes = <&mailbox0_cluster0 &mbox_r5_0>;
4646
memory-region = <&wkup_r5fss0_core0_dma_memory_region>,
4747
<&wkup_r5fss0_core0_memory_region>;
48+
memory-region-names = "dma", "firmware";
4849
status = "okay";
4950
};
5051

@@ -56,5 +57,6 @@
5657
mboxes = <&mailbox0_cluster1 &mbox_mcu_r5_0>;
5758
memory-region = <&mcu_r5fss0_core0_dma_memory_region>,
5859
<&mcu_r5fss0_core0_memory_region>;
60+
memory-region-names = "dma", "firmware";
5961
status = "okay";
6062
};

‎arch/arm64/boot/dts/ti/k3-am64-ti-ipc-firmware.dtsi‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,13 +126,15 @@
126126
mboxes = <&mailbox0_cluster2 &mbox_main_r5fss0_core0>;
127127
memory-region = <&main_r5fss0_core0_dma_memory_region>,
128128
<&main_r5fss0_core0_memory_region>;
129+
memory-region-names = "dma", "firmware";
129130
status = "okay";
130131
};
131132

132133
&main_r5fss0_core1 {
133134
mboxes = <&mailbox0_cluster2 &mbox_main_r5fss0_core1>;
134135
memory-region = <&main_r5fss0_core1_dma_memory_region>,
135136
<&main_r5fss0_core1_memory_region>;
137+
memory-region-names = "dma", "firmware";
136138
status = "okay";
137139
};
138140

@@ -144,13 +146,15 @@
144146
mboxes = <&mailbox0_cluster4 &mbox_main_r5fss1_core0>;
145147
memory-region = <&main_r5fss1_core0_dma_memory_region>,
146148
<&main_r5fss1_core0_memory_region>;
149+
memory-region-names = "dma", "firmware";
147150
status = "okay";
148151
};
149152

150153
&main_r5fss1_core1 {
151154
mboxes = <&mailbox0_cluster4 &mbox_main_r5fss1_core1>;
152155
memory-region = <&main_r5fss1_core1_dma_memory_region>,
153156
<&main_r5fss1_core1_memory_region>;
157+
memory-region-names = "dma", "firmware";
154158
status = "okay";
155159
};
156160

‎arch/arm64/boot/dts/ti/k3-am65-ti-ipc-firmware.dtsi‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,15 @@
5252
&mcu_r5fss0_core0 {
5353
memory-region = <&mcu_r5fss0_core0_dma_memory_region>,
5454
<&mcu_r5fss0_core0_memory_region>;
55+
memory-region-names = "dma", "firmware";
5556
mboxes = <&mailbox0_cluster0 &mbox_mcu_r5fss0_core0>;
5657
status = "okay";
5758
};
5859

5960
&mcu_r5fss0_core1 {
6061
memory-region = <&mcu_r5fss0_core1_dma_memory_region>,
6162
<&mcu_r5fss0_core1_memory_region>;
63+
memory-region-names = "dma", "firmware";
6264
mboxes = <&mailbox0_cluster1 &mbox_mcu_r5fss0_core1>;
6365
status = "okay";
6466
};

‎arch/arm64/boot/dts/ti/k3-j7200-ti-ipc-firmware.dtsi‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,13 +100,15 @@
100100
mboxes = <&mailbox0_cluster0 &mbox_mcu_r5fss0_core0>;
101101
memory-region = <&mcu_r5fss0_core0_dma_memory_region>,
102102
<&mcu_r5fss0_core0_memory_region>;
103+
memory-region-names = "dma", "firmware";
103104
status = "okay";
104105
};
105106

106107
&mcu_r5fss0_core1 {
107108
mboxes = <&mailbox0_cluster0 &mbox_mcu_r5fss0_core1>;
108109
memory-region = <&mcu_r5fss0_core1_dma_memory_region>,
109110
<&mcu_r5fss0_core1_memory_region>;
111+
memory-region-names = "dma", "firmware";
110112
status = "okay";
111113
};
112114

@@ -119,12 +121,14 @@
119121
mboxes = <&mailbox0_cluster1 &mbox_main_r5fss0_core0>;
120122
memory-region = <&main_r5fss0_core0_dma_memory_region>,
121123
<&main_r5fss0_core0_memory_region>;
124+
memory-region-names = "dma", "firmware";
122125
status = "okay";
123126
};
124127

125128
&main_r5fss0_core1 {
126129
mboxes = <&mailbox0_cluster1 &mbox_main_r5fss0_core1>;
127130
memory-region = <&main_r5fss0_core1_dma_memory_region>,
128131
<&main_r5fss0_core1_memory_region>;
132+
memory-region-names = "dma", "firmware";
129133
status = "okay";
130134
};

‎arch/arm64/boot/dts/ti/k3-j721e-ti-ipc-firmware.dtsi‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,13 +219,15 @@
219219
mboxes = <&mailbox0_cluster0 &mbox_mcu_r5fss0_core0>;
220220
memory-region = <&mcu_r5fss0_core0_dma_memory_region>,
221221
<&mcu_r5fss0_core0_memory_region>;
222+
memory-region-names = "dma", "firmware";
222223
};
223224

224225
&mcu_r5fss0_core1 {
225226
status = "okay";
226227
mboxes = <&mailbox0_cluster0 &mbox_mcu_r5fss0_core1>;
227228
memory-region = <&mcu_r5fss0_core1_dma_memory_region>,
228229
<&mcu_r5fss0_core1_memory_region>;
230+
memory-region-names = "dma", "firmware";
229231
};
230232

231233
&main_r5fss0 {
@@ -238,13 +240,15 @@
238240
mboxes = <&mailbox0_cluster1 &mbox_main_r5fss0_core0>;
239241
memory-region = <&main_r5fss0_core0_dma_memory_region>,
240242
<&main_r5fss0_core0_memory_region>;
243+
memory-region-names = "dma", "firmware";
241244
};
242245

243246
&main_r5fss0_core1 {
244247
status = "okay";
245248
mboxes = <&mailbox0_cluster1 &mbox_main_r5fss0_core1>;
246249
memory-region = <&main_r5fss0_core1_dma_memory_region>,
247250
<&main_r5fss0_core1_memory_region>;
251+
memory-region-names = "dma", "firmware";
248252
};
249253

250254
&main_r5fss1 {
@@ -257,13 +261,15 @@
257261
mboxes = <&mailbox0_cluster2 &mbox_main_r5fss1_core0>;
258262
memory-region = <&main_r5fss1_core0_dma_memory_region>,
259263
<&main_r5fss1_core0_memory_region>;
264+
memory-region-names = "dma", "firmware";
260265
};
261266

262267
&main_r5fss1_core1 {
263268
status = "okay";
264269
mboxes = <&mailbox0_cluster2 &mbox_main_r5fss1_core1>;
265270
memory-region = <&main_r5fss1_core1_dma_memory_region>,
266271
<&main_r5fss1_core1_memory_region>;
272+
memory-region-names = "dma", "firmware";
267273
};
268274

269275
&c66_0 {

‎arch/arm64/boot/dts/ti/k3-j721s2-ti-ipc-firmware.dtsi‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,13 +190,15 @@
190190
mboxes = <&mailbox0_cluster0 &mbox_mcu_r5fss0_core0>;
191191
memory-region = <&mcu_r5fss0_core0_dma_memory_region>,
192192
<&mcu_r5fss0_core0_memory_region>;
193+
memory-region-names = "dma", "firmware";
193194
status = "okay";
194195
};
195196

196197
&mcu_r5fss0_core1 {
197198
mboxes = <&mailbox0_cluster0 &mbox_mcu_r5fss0_core1>;
198199
memory-region = <&mcu_r5fss0_core1_dma_memory_region>,
199200
<&mcu_r5fss0_core1_memory_region>;
201+
memory-region-names = "dma", "firmware";
200202
status = "okay";
201203
};
202204

@@ -209,13 +211,15 @@
209211
mboxes = <&mailbox0_cluster1 &mbox_main_r5fss0_core0>;
210212
memory-region = <&main_r5fss0_core0_dma_memory_region>,
211213
<&main_r5fss0_core0_memory_region>;
214+
memory-region-names = "dma", "firmware";
212215
status = "okay";
213216
};
214217

215218
&main_r5fss0_core1 {
216219
mboxes = <&mailbox0_cluster1 &mbox_main_r5fss0_core1>;
217220
memory-region = <&main_r5fss0_core1_dma_memory_region>,
218221
<&main_r5fss0_core1_memory_region>;
222+
memory-region-names = "dma", "firmware";
219223
status = "okay";
220224
};
221225

@@ -228,13 +232,15 @@
228232
mboxes = <&mailbox0_cluster2 &mbox_main_r5fss1_core0>;
229233
memory-region = <&main_r5fss1_core0_dma_memory_region>,
230234
<&main_r5fss1_core0_memory_region>;
235+
memory-region-names = "dma", "firmware";
231236
status = "okay";
232237
};
233238

234239
&main_r5fss1_core1 {
235240
mboxes = <&mailbox0_cluster2 &mbox_main_r5fss1_core1>;
236241
memory-region = <&main_r5fss1_core1_dma_memory_region>,
237242
<&main_r5fss1_core1_memory_region>;
243+
memory-region-names = "dma", "firmware";
238244
status = "okay";
239245
};
240246

‎arch/arm64/boot/dts/ti/k3-j722s-ti-ipc-firmware.dtsi‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@
123123
mboxes = <&mailbox0_cluster0 &mbox_wkup_r5_0>;
124124
memory-region = <&wkup_r5fss0_core0_dma_memory_region>,
125125
<&wkup_r5fss0_core0_memory_region>;
126+
memory-region-names = "dma", "firmware";
126127
status = "okay";
127128
};
128129

@@ -134,6 +135,7 @@
134135
mboxes = <&mailbox0_cluster1 &mbox_mcu_r5_0>;
135136
memory-region = <&mcu_r5fss0_core0_dma_memory_region>,
136137
<&mcu_r5fss0_core0_memory_region>;
138+
memory-region-names = "dma", "firmware";
137139
status = "okay";
138140
};
139141

@@ -145,6 +147,7 @@
145147
mboxes = <&mailbox0_cluster3 &mbox_main_r5_0>;
146148
memory-region = <&main_r5fss0_core0_dma_memory_region>,
147149
<&main_r5fss0_core0_memory_region>;
150+
memory-region-names = "dma", "firmware";
148151
status = "okay";
149152
};
150153

‎arch/arm64/boot/dts/ti/k3-j784s4-j742s2-ti-ipc-firmware-common.dtsi‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,13 +262,15 @@
262262
mboxes = <&mailbox0_cluster0 &mbox_mcu_r5fss0_core0>;
263263
memory-region = <&mcu_r5fss0_core0_dma_memory_region>,
264264
<&mcu_r5fss0_core0_memory_region>;
265+
memory-region-names = "dma", "firmware";
265266
};
266267

267268
&mcu_r5fss0_core1 {
268269
status = "okay";
269270
mboxes = <&mailbox0_cluster0 &mbox_mcu_r5fss0_core1>;
270271
memory-region = <&mcu_r5fss0_core1_dma_memory_region>,
271272
<&mcu_r5fss0_core1_memory_region>;
273+
memory-region-names = "dma", "firmware";
272274
};
273275

274276
&main_r5fss0 {
@@ -281,13 +283,15 @@
281283
mboxes = <&mailbox0_cluster1 &mbox_main_r5fss0_core0>;
282284
memory-region = <&main_r5fss0_core0_dma_memory_region>,
283285
<&main_r5fss0_core0_memory_region>;
286+
memory-region-names = "dma", "firmware";
284287
};
285288

286289
&main_r5fss0_core1 {
287290
status = "okay";
288291
mboxes = <&mailbox0_cluster1 &mbox_main_r5fss0_core1>;
289292
memory-region = <&main_r5fss0_core1_dma_memory_region>,
290293
<&main_r5fss0_core1_memory_region>;
294+
memory-region-names = "dma", "firmware";
291295
};
292296

293297
&main_r5fss1 {
@@ -300,13 +304,15 @@
300304
mboxes = <&mailbox0_cluster2 &mbox_main_r5fss1_core0>;
301305
memory-region = <&main_r5fss1_core0_dma_memory_region>,
302306
<&main_r5fss1_core0_memory_region>;
307+
memory-region-names = "dma", "firmware";
303308
};
304309

305310
&main_r5fss1_core1 {
306311
status = "okay";
307312
mboxes = <&mailbox0_cluster2 &mbox_main_r5fss1_core1>;
308313
memory-region = <&main_r5fss1_core1_dma_memory_region>,
309314
<&main_r5fss1_core1_memory_region>;
315+
memory-region-names = "dma", "firmware";
310316
};
311317

312318
&main_r5fss2 {
@@ -319,13 +325,15 @@
319325
mboxes = <&mailbox0_cluster3 &mbox_main_r5fss2_core0>;
320326
memory-region = <&main_r5fss2_core0_dma_memory_region>,
321327
<&main_r5fss2_core0_memory_region>;
328+
memory-region-names = "dma", "firmware";
322329
};
323330

324331
&main_r5fss2_core1 {
325332
status = "okay";
326333
mboxes = <&mailbox0_cluster3 &mbox_main_r5fss2_core1>;
327334
memory-region = <&main_r5fss2_core1_dma_memory_region>,
328335
<&main_r5fss2_core1_memory_region>;
336+
memory-region-names = "dma", "firmware";
329337
};
330338

331339
&c71_0 {

0 commit comments

Comments
 (0)