Skip to content

Commit 03a99e0

Browse files
masz-nordicMaureenHelm
masz-nordic
authored and
MaureenHelm
committed
soc: nrf: update dts_fixup.h to I2C DT
Commit a8a85c2 introduced separate DT symbols for TWI and TWIM. Update dts_fixup.h for all nRF chips to align with those changes. Signed-off-by: Marcin Szymczyk <[email protected]>
1 parent 39444ba commit 03a99e0

File tree

4 files changed

+19
-10
lines changed

4 files changed

+19
-10
lines changed

‎soc/arm/nordic_nrf/nrf51/dts_fixup.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212

1313
#define DT_GPIO_P0_DEV_NAME DT_NORDIC_NRF_GPIO_GPIO_0_LABEL
1414

15-
#define DT_I2C_0_NAME DT_NORDIC_NRF_I2C_I2C_0_LABEL
16-
#define DT_I2C_1_NAME DT_NORDIC_NRF_I2C_I2C_1_LABEL
15+
#define DT_I2C_0_NAME DT_NORDIC_NRF_TWI_I2C_0_LABEL
16+
#define DT_I2C_1_NAME DT_NORDIC_NRF_TWI_I2C_1_LABEL
1717

1818
#define DT_SPI_0_NAME DT_NORDIC_NRF_SPI_SPI_0_LABEL
1919
#define DT_SPI_1_NAME DT_NORDIC_NRF_SPI_SPI_1_LABEL

‎soc/arm/nordic_nrf/nrf52/dts_fixup.h‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,17 @@
1919
#define DT_GPIO_P0_DEV_NAME DT_NORDIC_NRF_GPIO_GPIO_0_LABEL
2020
#define DT_GPIO_P1_DEV_NAME DT_NORDIC_NRF_GPIO_GPIO_1_LABEL
2121

22-
#define DT_I2C_0_NAME DT_NORDIC_NRF_I2C_I2C_0_LABEL
23-
#define DT_I2C_1_NAME DT_NORDIC_NRF_I2C_I2C_1_LABEL
22+
#if defined(DT_NORDIC_NRF_TWIM_I2C_0_LABEL)
23+
#define DT_I2C_0_NAME DT_NORDIC_NRF_TWIM_I2C_0_LABEL
24+
#else
25+
#define DT_I2C_0_NAME DT_NORDIC_NRF_TWI_I2C_0_LABEL
26+
#endif
27+
28+
#if defined(DT_NORDIC_NRF_TWIM_I2C_1_LABEL)
29+
#define DT_I2C_1_NAME DT_NORDIC_NRF_TWIM_I2C_1_LABEL
30+
#else
31+
#define DT_I2C_1_NAME DT_NORDIC_NRF_TWI_I2C_1_LABEL
32+
#endif
2433

2534
#define DT_SPI_0_NAME DT_NORDIC_NRF_SPI_SPI_0_LABEL
2635
#define DT_SPI_1_NAME DT_NORDIC_NRF_SPI_SPI_1_LABEL

‎soc/arm/nordic_nrf/nrf53/dts_fixup.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
#define DT_GPIO_P0_DEV_NAME DT_NORDIC_NRF_GPIO_GPIO_0_LABEL
2424
#define DT_GPIO_P1_DEV_NAME DT_NORDIC_NRF_GPIO_GPIO_1_LABEL
2525

26-
#define DT_I2C_0_NAME DT_NORDIC_NRF_I2C_I2C_0_LABEL
27-
#define DT_I2C_1_NAME DT_NORDIC_NRF_I2C_I2C_1_LABEL
26+
#define DT_I2C_0_NAME DT_NORDIC_NRF_TWIM_I2C_0_LABEL
27+
#define DT_I2C_1_NAME DT_NORDIC_NRF_TWIM_I2C_1_LABEL
2828

2929
#define DT_SPI_0_NAME DT_NORDIC_NRF_SPI_SPI_0_LABEL
3030
#define DT_SPI_1_NAME DT_NORDIC_NRF_SPI_SPI_1_LABEL

‎soc/arm/nordic_nrf/nrf91/dts_fixup.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222

2323
#define DT_GPIO_P0_DEV_NAME DT_NORDIC_NRF_GPIO_GPIO_0_LABEL
2424

25-
#define DT_I2C_0_NAME DT_NORDIC_NRF_I2C_I2C_0_LABEL
26-
#define DT_I2C_1_NAME DT_NORDIC_NRF_I2C_I2C_1_LABEL
27-
#define DT_I2C_2_NAME DT_NORDIC_NRF_I2C_I2C_2_LABEL
28-
#define DT_I2C_3_NAME DT_NORDIC_NRF_I2C_I2C_3_LABEL
25+
#define DT_I2C_0_NAME DT_NORDIC_NRF_TWIM_I2C_0_LABEL
26+
#define DT_I2C_1_NAME DT_NORDIC_NRF_TWIM_I2C_1_LABEL
27+
#define DT_I2C_2_NAME DT_NORDIC_NRF_TWIM_I2C_2_LABEL
28+
#define DT_I2C_3_NAME DT_NORDIC_NRF_TWIM_I2C_3_LABEL
2929

3030
#define DT_SPI_0_NAME DT_NORDIC_NRF_SPI_SPI_0_LABEL
3131
#define DT_SPI_1_NAME DT_NORDIC_NRF_SPI_SPI_1_LABEL

0 commit comments

Comments
 (0)