Skip to content

Commit 9966d29

Browse files
decsnykartben
decsny
authored and
kartben
committed
dts: nxp,lpspi: Fifo property and fix delay desc
Add properties for describing RX and TX fifo sizes. Also reformat some descriptions and fix the description of the transfer-delay property which was incorrect. Since zephyr spi bufs are not continuous, every possible Zephyr LPSPI driver must use continuous transfer mode, for which the meaning of this delay has nothing to do with the chip select. Signed-off-by: Declan Snyder <[email protected]>
1 parent 0e4a5ac commit 9966d29

17 files changed

+185
-4
lines changed

‎drivers/spi/spi_nxp_lpspi/spi_nxp_lpspi_priv.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ struct spi_mcux_config {
4242
const struct pinctrl_dev_config *pincfg;
4343
lpspi_pin_config_t data_pin_config;
4444
bool output_config;
45+
uint8_t tx_fifo_size;
46+
uint8_t rx_fifo_size;
4547
};
4648

4749
struct spi_mcux_data {
@@ -99,6 +101,8 @@ int spi_mcux_release(const struct device *dev, const struct spi_config *spi_cfg)
99101
.pincfg = PINCTRL_DT_INST_DEV_CONFIG_GET(n), \
100102
.data_pin_config = DT_INST_ENUM_IDX(n, data_pin_config), \
101103
.output_config = DT_INST_PROP(n, tristate_output), \
104+
.rx_fifo_size = (uint8_t)DT_INST_PROP(n, rx_fifo_size), \
105+
.tx_fifo_size = (uint8_t)DT_INST_PROP(n, tx_fifo_size), \
102106
};
103107

104108
#define SPI_NXP_LPSPI_COMMON_INIT(n) \

‎dts/arm/nxp/nxp_imx95_m7.dtsi

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,8 @@
156156
status = "disabled";
157157
#address-cells = <1>;
158158
#size-cells = <0>;
159+
tx-fifo-size = <16>;
160+
rx-fifo-size = <16>;
159161
};
160162

161163
lpspi4: spi@42560000 {
@@ -166,6 +168,8 @@
166168
status = "disabled";
167169
#address-cells = <1>;
168170
#size-cells = <0>;
171+
tx-fifo-size = <16>;
172+
rx-fifo-size = <16>;
169173
};
170174

171175
lpuart3: serial@42570000 {
@@ -281,6 +285,8 @@
281285
status = "disabled";
282286
#address-cells = <1>;
283287
#size-cells = <0>;
288+
tx-fifo-size = <16>;
289+
rx-fifo-size = <16>;
284290
};
285291

286292
lpspi6: spi@42700000 {
@@ -291,6 +297,8 @@
291297
status = "disabled";
292298
#address-cells = <1>;
293299
#size-cells = <0>;
300+
tx-fifo-size = <16>;
301+
rx-fifo-size = <16>;
294302
};
295303

296304
lpspi7: spi@42710000 {
@@ -301,6 +309,8 @@
301309
status = "disabled";
302310
#address-cells = <1>;
303311
#size-cells = <0>;
312+
tx-fifo-size = <16>;
313+
rx-fifo-size = <16>;
304314
};
305315

306316
lpspi8: spi@42720000 {
@@ -311,6 +321,8 @@
311321
status = "disabled";
312322
#address-cells = <1>;
313323
#size-cells = <0>;
324+
tx-fifo-size = <16>;
325+
rx-fifo-size = <16>;
314326
};
315327

316328
tpm1: pwm@44310000 {
@@ -363,6 +375,8 @@
363375
status = "disabled";
364376
#address-cells = <1>;
365377
#size-cells = <0>;
378+
tx-fifo-size = <16>;
379+
rx-fifo-size = <16>;
366380
};
367381

368382
lpspi2: spi@44370000 {
@@ -373,6 +387,8 @@
373387
status = "disabled";
374388
#address-cells = <1>;
375389
#size-cells = <0>;
390+
tx-fifo-size = <16>;
391+
rx-fifo-size = <16>;
376392
};
377393

378394
lpuart1: serial@44380000 {

‎dts/arm/nxp/nxp_ke1xf.dtsi

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -387,6 +387,8 @@
387387
status = "disabled";
388388
#address-cells = <1>;
389389
#size-cells = <0>;
390+
tx-fifo-size = <4>;
391+
rx-fifo-size = <4>;
390392
};
391393

392394
lpspi1: spi@4002d000 {
@@ -397,6 +399,8 @@
397399
status = "disabled";
398400
#address-cells = <1>;
399401
#size-cells = <0>;
402+
tx-fifo-size = <4>;
403+
rx-fifo-size = <4>;
400404
};
401405

402406
flexcan0: can@40024000 {

‎dts/arm/nxp/nxp_ke1xz.dtsi

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -429,6 +429,8 @@
429429
status = "disabled";
430430
#address-cells = <1>;
431431
#size-cells = <0>;
432+
tx-fifo-size = <4>;
433+
rx-fifo-size = <4>;
432434
};
433435

434436
lpspi1: spi@4002d000 {
@@ -439,6 +441,8 @@
439441
status = "disabled";
440442
#address-cells = <1>;
441443
#size-cells = <0>;
444+
tx-fifo-size = <4>;
445+
rx-fifo-size = <4>;
442446
};
443447

444448
edma: dma-controller@40008000 {

‎dts/arm/nxp/nxp_mcxa156.dtsi

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -445,6 +445,8 @@
445445
reg = <0x4009c000 0x1000>;
446446
interrupts = <28 0>;
447447
clocks = <&syscon MCUX_LPSPI0_CLK>;
448+
tx-fifo-size = <4>;
449+
rx-fifo-size = <4>;
448450
#address-cells = <1>;
449451
#size-cells = <0>;
450452
status = "disabled";
@@ -455,6 +457,8 @@
455457
reg = <0x4009d000 0x1000>;
456458
interrupts = <29 0>;
457459
clocks = <&syscon MCUX_LPSPI1_CLK>;
460+
tx-fifo-size = <4>;
461+
rx-fifo-size = <4>;
458462
#address-cells = <1>;
459463
#size-cells = <0>;
460464
status = "disabled";

‎dts/arm/nxp/nxp_mcxn23x_common.dtsi

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,8 @@
192192
#address-cells = <1>;
193193
#size-cells = <0>;
194194
status = "disabled";
195+
tx-fifo-size = <16>;
196+
rx-fifo-size = <16>;
195197
};
196198
flexcomm0_lpi2c0: lpi2c@92800 {
197199
compatible = "nxp,lpi2c";
@@ -231,6 +233,8 @@
231233
/* DMA channels 0 and 1, muxed to LPSPI1 RX and TX */
232234
dmas = <&edma0 0 71>, <&edma0 1 72>;
233235
dma-names = "rx", "tx";
236+
tx-fifo-size = <16>;
237+
rx-fifo-size = <16>;
234238
status = "disabled";
235239
};
236240
flexcomm1_lpi2c1: lpi2c@93800 {
@@ -271,6 +275,8 @@
271275
/* DMA channels 4 and 5, muxed to LPSPI2 RX and TX */
272276
dmas = <&edma0 4 73>, <&edma0 5 74>;
273277
dma-names = "rx", "tx";
278+
tx-fifo-size = <16>;
279+
rx-fifo-size = <16>;
274280
status = "disabled";
275281
};
276282
flexcomm2_lpi2c2: lpi2c@94800 {
@@ -305,6 +311,8 @@
305311
clocks = <&syscon MCUX_FLEXCOMM3_CLK>;
306312
#address-cells = <1>;
307313
#size-cells = <0>;
314+
tx-fifo-size = <16>;
315+
rx-fifo-size = <16>;
308316
status = "disabled";
309317
};
310318
flexcomm3_lpi2c3: lpi2c@95800 {
@@ -345,6 +353,8 @@
345353
/* DMA channels 2 and 3, muxed to LPSPI4 RX and TX */
346354
dmas = <&edma0 2 77>, <&edma0 3 78>;
347355
dma-names = "rx", "tx";
356+
tx-fifo-size = <16>;
357+
rx-fifo-size = <16>;
348358
status = "disabled";
349359
};
350360
flexcomm4_lpi2c4: lpi2c@b4800 {
@@ -379,6 +389,8 @@
379389
clocks = <&syscon MCUX_FLEXCOMM5_CLK>;
380390
#address-cells = <1>;
381391
#size-cells = <0>;
392+
tx-fifo-size = <16>;
393+
rx-fifo-size = <16>;
382394
status = "disabled";
383395
};
384396
flexcomm5_lpi2c5: lpi2c@b5800 {
@@ -413,6 +425,8 @@
413425
clocks = <&syscon MCUX_FLEXCOMM6_CLK>;
414426
#address-cells = <1>;
415427
#size-cells = <0>;
428+
tx-fifo-size = <16>;
429+
rx-fifo-size = <16>;
416430
status = "disabled";
417431
};
418432
flexcomm6_lpi2c6: lpi2c@b6800 {
@@ -447,6 +461,8 @@
447461
clocks = <&syscon MCUX_FLEXCOMM7_CLK>;
448462
#address-cells = <1>;
449463
#size-cells = <0>;
464+
tx-fifo-size = <16>;
465+
rx-fifo-size = <16>;
450466
status = "disabled";
451467
};
452468
flexcomm7_lpi2c7: lpi2c@b7800 {

‎dts/arm/nxp/nxp_mcxn94x_common.dtsi

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,8 @@
198198
clocks = <&syscon MCUX_FLEXCOMM0_CLK>;
199199
#address-cells = <1>;
200200
#size-cells = <0>;
201+
tx-fifo-size = <8>;
202+
rx-fifo-size = <8>;
201203
status = "disabled";
202204
};
203205
flexcomm0_lpi2c0: lpi2c@92800 {
@@ -238,6 +240,8 @@
238240
/* DMA channels 0 and 1, muxed to LPSPI1 RX and TX */
239241
dmas = <&edma0 0 71>, <&edma0 1 72>;
240242
dma-names = "rx", "tx";
243+
tx-fifo-size = <8>;
244+
rx-fifo-size = <8>;
241245
status = "disabled";
242246
};
243247
flexcomm1_lpi2c1: lpi2c@93800 {
@@ -278,6 +282,8 @@
278282
/* DMA channels 4 and 5, muxed to LPSPI2 RX and TX */
279283
dmas = <&edma0 4 73>, <&edma0 5 74>;
280284
dma-names = "rx", "tx";
285+
tx-fifo-size = <8>;
286+
rx-fifo-size = <8>;
281287
status = "disabled";
282288
};
283289
flexcomm2_lpi2c2: lpi2c@94800 {
@@ -312,6 +318,8 @@
312318
clocks = <&syscon MCUX_FLEXCOMM3_CLK>;
313319
#address-cells = <1>;
314320
#size-cells = <0>;
321+
tx-fifo-size = <8>;
322+
rx-fifo-size = <8>;
315323
status = "disabled";
316324
};
317325
flexcomm3_lpi2c3: lpi2c@95800 {
@@ -352,6 +360,8 @@
352360
/* DMA channels 2 and 3, muxed to LPSPI4 RX and TX */
353361
dmas = <&edma0 2 77>, <&edma0 3 78>;
354362
dma-names = "rx", "tx";
363+
tx-fifo-size = <8>;
364+
rx-fifo-size = <8>;
355365
status = "disabled";
356366
};
357367
flexcomm4_lpi2c4: lpi2c@b4800 {
@@ -386,6 +396,8 @@
386396
clocks = <&syscon MCUX_FLEXCOMM5_CLK>;
387397
#address-cells = <1>;
388398
#size-cells = <0>;
399+
tx-fifo-size = <8>;
400+
rx-fifo-size = <8>;
389401
status = "disabled";
390402
};
391403
flexcomm5_lpi2c5: lpi2c@b5800 {
@@ -420,6 +432,8 @@
420432
clocks = <&syscon MCUX_FLEXCOMM6_CLK>;
421433
#address-cells = <1>;
422434
#size-cells = <0>;
435+
tx-fifo-size = <8>;
436+
rx-fifo-size = <8>;
423437
status = "disabled";
424438
};
425439
flexcomm6_lpi2c6: lpi2c@b6800 {
@@ -454,6 +468,8 @@
454468
clocks = <&syscon MCUX_FLEXCOMM7_CLK>;
455469
#address-cells = <1>;
456470
#size-cells = <0>;
471+
tx-fifo-size = <8>;
472+
rx-fifo-size = <8>;
457473
status = "disabled";
458474
};
459475
flexcomm7_lpi2c7: lpi2c@b7800 {
@@ -488,6 +504,8 @@
488504
clocks = <&syscon MCUX_FLEXCOMM8_CLK>;
489505
#address-cells = <1>;
490506
#size-cells = <0>;
507+
tx-fifo-size = <8>;
508+
rx-fifo-size = <8>;
491509
status = "disabled";
492510
};
493511
flexcomm8_lpi2c8: lpi2c@b8800 {
@@ -522,6 +540,8 @@
522540
clocks = <&syscon MCUX_FLEXCOMM9_CLK>;
523541
#address-cells = <1>;
524542
#size-cells = <0>;
543+
tx-fifo-size = <8>;
544+
rx-fifo-size = <8>;
525545
status = "disabled";
526546
};
527547
flexcomm9_lpi2c9: lpi2c@b9800 {

‎dts/arm/nxp/nxp_mcxw71.dtsi

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,8 @@
200200
clocks = <&scg SCG_K4_FIRC_CLK 0xd8>;
201201
#address-cells = <1>;
202202
#size-cells = <0>;
203+
tx-fifo-size = <8>;
204+
rx-fifo-size = <8>;
203205
status = "disabled";
204206
};
205207

@@ -210,6 +212,8 @@
210212
clocks = <&scg SCG_K4_FIRC_CLK 0xdc>;
211213
#address-cells = <1>;
212214
#size-cells = <0>;
215+
tx-fifo-size = <8>;
216+
rx-fifo-size = <8>;
213217
status = "disabled";
214218
};
215219

‎dts/arm/nxp/nxp_rt1010.dtsi

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,8 @@
164164
clocks = <&ccm IMX_CCM_LPSPI_CLK 0x6c 0>;
165165
#address-cells = <1>;
166166
#size-cells = <0>;
167+
tx-fifo-size = <16>;
168+
rx-fifo-size = <16>;
167169
};
168170

169171
lpspi2: spi@40198000 {
@@ -174,6 +176,8 @@
174176
clocks = <&ccm IMX_CCM_LPSPI_CLK 0x6c 2>;
175177
#address-cells = <1>;
176178
#size-cells = <0>;
179+
tx-fifo-size = <16>;
180+
rx-fifo-size = <16>;
177181
};
178182

179183
/* Remove LPUART5-8, they don't exist on RT1010 */

‎dts/arm/nxp/nxp_rt10xx.dtsi

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -458,6 +458,8 @@
458458
interrupts = <32 3>;
459459
status = "disabled";
460460
clocks = <&ccm IMX_CCM_LPSPI_CLK 0x6c 0>;
461+
rx-fifo-size = <16>;
462+
tx-fifo-size = <16>;
461463
#address-cells = <1>;
462464
#size-cells = <0>;
463465
};
@@ -468,6 +470,8 @@
468470
interrupts = <33 3>;
469471
status = "disabled";
470472
clocks = <&ccm IMX_CCM_LPSPI_CLK 0x6c 2>;
473+
rx-fifo-size = <16>;
474+
tx-fifo-size = <16>;
471475
#address-cells = <1>;
472476
#size-cells = <0>;
473477
};
@@ -478,6 +482,8 @@
478482
interrupts = <34 3>;
479483
status = "disabled";
480484
clocks = <&ccm IMX_CCM_LPSPI_CLK 0x6c 4>;
485+
rx-fifo-size = <16>;
486+
tx-fifo-size = <16>;
481487
#address-cells = <1>;
482488
#size-cells = <0>;
483489
};
@@ -488,6 +494,8 @@
488494
interrupts = <35 3>;
489495
status = "disabled";
490496
clocks = <&ccm IMX_CCM_LPSPI_CLK 0x6c 6>;
497+
rx-fifo-size = <16>;
498+
tx-fifo-size = <16>;
491499
#address-cells = <1>;
492500
#size-cells = <0>;
493501
};

0 commit comments

Comments
 (0)