Skip to content

Commit e6b3a33

Browse files
masz-nordicMaureenHelm
authored andcommitted
soc: nrf: update dts_fixup.h to SPI DT
Commit 94bed60 introduced separate DT symbols for SPI and SPIM. Update dts_fixup.h for all nRF chips to align with those changes. Signed-off-by: Marcin Szymczyk <[email protected]>
1 parent 03a99e0 commit e6b3a33

File tree

3 files changed

+23
-8
lines changed

3 files changed

+23
-8
lines changed

soc/arm/nordic_nrf/nrf52/dts_fixup.h

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,25 @@
3131
#define DT_I2C_1_NAME DT_NORDIC_NRF_TWI_I2C_1_LABEL
3232
#endif
3333

34+
#if defined(DT_NORDIC_NRF_SPIM_SPI_0_LABEL)
35+
#define DT_SPI_0_NAME DT_NORDIC_NRF_SPIM_SPI_0_LABEL
36+
#else
3437
#define DT_SPI_0_NAME DT_NORDIC_NRF_SPI_SPI_0_LABEL
38+
#endif
39+
40+
#if defined(DT_NORDIC_NRF_SPIM_SPI_1_LABEL)
41+
#define DT_SPI_1_NAME DT_NORDIC_NRF_SPIM_SPI_1_LABEL
42+
#else
3543
#define DT_SPI_1_NAME DT_NORDIC_NRF_SPI_SPI_1_LABEL
44+
#endif
45+
46+
#if defined(DT_NORDIC_NRF_SPIM_SPI_2_LABEL)
47+
#define DT_SPI_2_NAME DT_NORDIC_NRF_SPIM_SPI_2_LABEL
48+
#else
3649
#define DT_SPI_2_NAME DT_NORDIC_NRF_SPI_SPI_2_LABEL
37-
#define DT_SPI_3_NAME DT_NORDIC_NRF_SPI_SPI_3_LABEL
50+
#endif
51+
52+
#define DT_SPI_3_NAME DT_NORDIC_NRF_SPIM_SPI_3_LABEL
3853

3954
#define DT_WDT_0_NAME DT_NORDIC_NRF_WATCHDOG_WDT_0_LABEL
4055

soc/arm/nordic_nrf/nrf53/dts_fixup.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
#define DT_I2C_0_NAME DT_NORDIC_NRF_TWIM_I2C_0_LABEL
2727
#define DT_I2C_1_NAME DT_NORDIC_NRF_TWIM_I2C_1_LABEL
2828

29-
#define DT_SPI_0_NAME DT_NORDIC_NRF_SPI_SPI_0_LABEL
30-
#define DT_SPI_1_NAME DT_NORDIC_NRF_SPI_SPI_1_LABEL
31-
#define DT_SPI_2_NAME DT_NORDIC_NRF_SPI_SPI_2_LABEL
29+
#define DT_SPI_0_NAME DT_NORDIC_NRF_SPIM_SPI_0_LABEL
30+
#define DT_SPI_1_NAME DT_NORDIC_NRF_SPIM_SPI_1_LABEL
31+
#define DT_SPI_2_NAME DT_NORDIC_NRF_SPIM_SPI_2_LABEL
3232

3333
#define DT_WDT_0_NAME DT_NORDIC_NRF_WATCHDOG_WDT_0_LABEL
3434

soc/arm/nordic_nrf/nrf91/dts_fixup.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727
#define DT_I2C_2_NAME DT_NORDIC_NRF_TWIM_I2C_2_LABEL
2828
#define DT_I2C_3_NAME DT_NORDIC_NRF_TWIM_I2C_3_LABEL
2929

30-
#define DT_SPI_0_NAME DT_NORDIC_NRF_SPI_SPI_0_LABEL
31-
#define DT_SPI_1_NAME DT_NORDIC_NRF_SPI_SPI_1_LABEL
32-
#define DT_SPI_2_NAME DT_NORDIC_NRF_SPI_SPI_2_LABEL
33-
#define DT_SPI_3_NAME DT_NORDIC_NRF_SPI_SPI_3_LABEL
30+
#define DT_SPI_0_NAME DT_NORDIC_NRF_SPIM_SPI_0_LABEL
31+
#define DT_SPI_1_NAME DT_NORDIC_NRF_SPIM_SPI_1_LABEL
32+
#define DT_SPI_2_NAME DT_NORDIC_NRF_SPIM_SPI_2_LABEL
33+
#define DT_SPI_3_NAME DT_NORDIC_NRF_SPIM_SPI_3_LABEL
3434

3535
#define DT_WDT_0_NAME DT_NORDIC_NRF_WATCHDOG_WDT_0_LABEL
3636

0 commit comments

Comments
 (0)