Skip to content

Commit 9784f80

Browse files
galakMaureenHelm
authored andcommitted
i2c: Rename CONFIG_I2C_[0..5]_NAME -> DT_I2C_[0..5]_NAME
Now that everything is DT based for I2C drivers we can rename the CONFIG_I2C_[0..5]_NAME define to DT_I2C_[0..5]_NAME. Signed-off-by: Kumar Gala <[email protected]>
1 parent 669e0f3 commit 9784f80

File tree

30 files changed

+69
-69
lines changed

30 files changed

+69
-69
lines changed

boards/nios2/altera_max10/dts_fixup.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@
99
* generated data matches the driver definitions.
1010
*/
1111

12-
#define CONFIG_I2C_0_NAME DT_NIOS2_I2C_100200_LABEL
12+
#define DT_I2C_0_NAME DT_NIOS2_I2C_100200_LABEL

drivers/i2c/i2c_ll_stm32.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ static const struct i2c_stm32_config i2c_stm32_cfg_##name = { \
297297
\
298298
static struct i2c_stm32_data i2c_stm32_dev_data_##name; \
299299
\
300-
DEVICE_AND_API_INIT(i2c_stm32_##name, CONFIG_##name##_NAME, \
300+
DEVICE_AND_API_INIT(i2c_stm32_##name, DT_##name##_NAME, \
301301
&i2c_stm32_init, &i2c_stm32_dev_data_##name, \
302302
&i2c_stm32_cfg_##name, \
303303
POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, \

drivers/i2c/i2c_mcux.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ static const struct i2c_driver_api i2c_mcux_driver_api = {
210210
\
211211
static struct i2c_mcux_data i2c_mcux_data_ ## n; \
212212
\
213-
DEVICE_AND_API_INIT(i2c_mcux_ ## n, CONFIG_I2C_ ## n ## _NAME, \
213+
DEVICE_AND_API_INIT(i2c_mcux_ ## n, DT_I2C_ ## n ## _NAME, \
214214
&i2c_mcux_init, &i2c_mcux_data_ ## n, \
215215
&i2c_mcux_config_ ## n, POST_KERNEL, \
216216
CONFIG_KERNEL_INIT_PRIORITY_DEVICE, \

drivers/i2c/i2c_mcux_lpi2c.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ static const struct mcux_lpi2c_config mcux_lpi2c_config_0 = {
228228

229229
static struct mcux_lpi2c_data mcux_lpi2c_data_0;
230230

231-
DEVICE_AND_API_INIT(mcux_lpi2c_0, CONFIG_I2C_0_NAME, &mcux_lpi2c_init,
231+
DEVICE_AND_API_INIT(mcux_lpi2c_0, DT_I2C_0_NAME, &mcux_lpi2c_init,
232232
&mcux_lpi2c_data_0, &mcux_lpi2c_config_0,
233233
POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
234234
&mcux_lpi2c_driver_api);
@@ -256,7 +256,7 @@ static const struct mcux_lpi2c_config mcux_lpi2c_config_1 = {
256256

257257
static struct mcux_lpi2c_data mcux_lpi2c_data_1;
258258

259-
DEVICE_AND_API_INIT(mcux_lpi2c_1, CONFIG_I2C_1_NAME, &mcux_lpi2c_init,
259+
DEVICE_AND_API_INIT(mcux_lpi2c_1, DT_I2C_1_NAME, &mcux_lpi2c_init,
260260
&mcux_lpi2c_data_1, &mcux_lpi2c_config_1,
261261
POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
262262
&mcux_lpi2c_driver_api);
@@ -284,7 +284,7 @@ static const struct mcux_lpi2c_config mcux_lpi2c_config_2 = {
284284

285285
static struct mcux_lpi2c_data mcux_lpi2c_data_2;
286286

287-
DEVICE_AND_API_INIT(mcux_lpi2c_2, CONFIG_I2C_2_NAME, &mcux_lpi2c_init,
287+
DEVICE_AND_API_INIT(mcux_lpi2c_2, DT_I2C_2_NAME, &mcux_lpi2c_init,
288288
&mcux_lpi2c_data_2, &mcux_lpi2c_config_2,
289289
POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
290290
&mcux_lpi2c_driver_api);
@@ -312,7 +312,7 @@ static const struct mcux_lpi2c_config mcux_lpi2c_config_3 = {
312312

313313
static struct mcux_lpi2c_data mcux_lpi2c_data_3;
314314

315-
DEVICE_AND_API_INIT(mcux_lpi2c_3, CONFIG_I2C_3_NAME, &mcux_lpi2c_init,
315+
DEVICE_AND_API_INIT(mcux_lpi2c_3, DT_I2C_3_NAME, &mcux_lpi2c_init,
316316
&mcux_lpi2c_data_3, &mcux_lpi2c_config_3,
317317
POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
318318
&mcux_lpi2c_driver_api);
@@ -340,7 +340,7 @@ static const struct mcux_lpi2c_config mcux_lpi2c_config_4 = {
340340

341341
static struct mcux_lpi2c_data mcux_lpi2c_data_4;
342342

343-
DEVICE_AND_API_INIT(mcux_lpi2c_4, CONFIG_I2C_4_NAME, &mcux_lpi2c_init,
343+
DEVICE_AND_API_INIT(mcux_lpi2c_4, DT_I2C_4_NAME, &mcux_lpi2c_init,
344344
&mcux_lpi2c_data_4, &mcux_lpi2c_config_4,
345345
POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
346346
&mcux_lpi2c_driver_api);

drivers/i2c/i2c_sam_twi.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ static const struct i2c_sam_twi_dev_cfg i2c0_sam_config = {
361361

362362
static struct i2c_sam_twi_dev_data i2c0_sam_data;
363363

364-
DEVICE_AND_API_INIT(i2c0_sam, CONFIG_I2C_0_NAME, &i2c_sam_twi_initialize,
364+
DEVICE_AND_API_INIT(i2c0_sam, DT_I2C_0_NAME, &i2c_sam_twi_initialize,
365365
&i2c0_sam_data, &i2c0_sam_config, POST_KERNEL,
366366
CONFIG_I2C_INIT_PRIORITY, &i2c_sam_twi_driver_api);
367367
#endif
@@ -391,7 +391,7 @@ static const struct i2c_sam_twi_dev_cfg i2c1_sam_config = {
391391

392392
static struct i2c_sam_twi_dev_data i2c1_sam_data;
393393

394-
DEVICE_AND_API_INIT(i2c1_sam, CONFIG_I2C_1_NAME, &i2c_sam_twi_initialize,
394+
DEVICE_AND_API_INIT(i2c1_sam, DT_I2C_1_NAME, &i2c_sam_twi_initialize,
395395
&i2c1_sam_data, &i2c1_sam_config, POST_KERNEL,
396396
CONFIG_I2C_INIT_PRIORITY, &i2c_sam_twi_driver_api);
397397
#endif

drivers/i2c/i2c_sam_twihs.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ static const struct i2c_sam_twihs_dev_cfg i2c0_sam_config = {
348348

349349
static struct i2c_sam_twihs_dev_data i2c0_sam_data;
350350

351-
DEVICE_AND_API_INIT(i2c0_sam, CONFIG_I2C_0_NAME, &i2c_sam_twihs_initialize,
351+
DEVICE_AND_API_INIT(i2c0_sam, DT_I2C_0_NAME, &i2c_sam_twihs_initialize,
352352
&i2c0_sam_data, &i2c0_sam_config, POST_KERNEL,
353353
CONFIG_I2C_INIT_PRIORITY, &i2c_sam_twihs_driver_api);
354354
#endif
@@ -378,7 +378,7 @@ static const struct i2c_sam_twihs_dev_cfg i2c1_sam_config = {
378378

379379
static struct i2c_sam_twihs_dev_data i2c1_sam_data;
380380

381-
DEVICE_AND_API_INIT(i2c1_sam, CONFIG_I2C_1_NAME, &i2c_sam_twihs_initialize,
381+
DEVICE_AND_API_INIT(i2c1_sam, DT_I2C_1_NAME, &i2c_sam_twihs_initialize,
382382
&i2c1_sam_data, &i2c1_sam_config, POST_KERNEL,
383383
CONFIG_I2C_INIT_PRIORITY, &i2c_sam_twihs_driver_api);
384384
#endif
@@ -408,7 +408,7 @@ static const struct i2c_sam_twihs_dev_cfg i2c2_sam_config = {
408408

409409
static struct i2c_sam_twihs_dev_data i2c2_sam_data;
410410

411-
DEVICE_AND_API_INIT(i2c2_sam, CONFIG_I2C_2_NAME, &i2c_sam_twihs_initialize,
411+
DEVICE_AND_API_INIT(i2c2_sam, DT_I2C_2_NAME, &i2c_sam_twihs_initialize,
412412
&i2c2_sam_data, &i2c2_sam_config, POST_KERNEL,
413413
CONFIG_I2C_INIT_PRIORITY, &i2c_sam_twihs_driver_api);
414414
#endif

soc/arm/atmel_sam/sam3x/dts_fixup.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@
3737
#define DT_GPIO_SAM_PORTE_PERIPHERAL_ID DT_ATMEL_SAM_GPIO_400E1600_PERIPHERAL_ID
3838

3939
#define DT_I2C_0_BASE_ADDRESS DT_ATMEL_SAM_I2C_TWI_4008C000_BASE_ADDRESS
40-
#define CONFIG_I2C_0_NAME DT_ATMEL_SAM_I2C_TWI_4008C000_LABEL
40+
#define DT_I2C_0_NAME DT_ATMEL_SAM_I2C_TWI_4008C000_LABEL
4141
#define DT_I2C_0_BITRATE DT_ATMEL_SAM_I2C_TWI_4008C000_CLOCK_FREQUENCY
4242
#define DT_I2C_0_IRQ DT_ATMEL_SAM_I2C_TWI_4008C000_IRQ_0
4343
#define DT_I2C_0_IRQ_PRI DT_ATMEL_SAM_I2C_TWI_4008C000_IRQ_0_PRIORITY
4444
#define DT_I2C_0_PERIPHERAL_ID DT_ATMEL_SAM_I2C_TWI_4008C000_PERIPHERAL_ID
4545
#define DT_I2C_1_BASE_ADDRESS DT_ATMEL_SAM_I2C_TWI_40090000_BASE_ADDRESS
46-
#define CONFIG_I2C_1_NAME DT_ATMEL_SAM_I2C_TWI_40090000_LABEL
46+
#define DT_I2C_1_NAME DT_ATMEL_SAM_I2C_TWI_40090000_LABEL
4747
#define DT_I2C_1_BITRATE DT_ATMEL_SAM_I2C_TWI_40090000_CLOCK_FREQUENCY
4848
#define DT_I2C_1_IRQ DT_ATMEL_SAM_I2C_TWI_40090000_IRQ_0
4949
#define DT_I2C_1_IRQ_PRI DT_ATMEL_SAM_I2C_TWI_40090000_IRQ_0_PRIORITY

soc/arm/atmel_sam/sam4s/dts_fixup.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@
2727
#define DT_GPIO_SAM_PORTC_PERIPHERAL_ID DT_ATMEL_SAM_GPIO_400E1200_PERIPHERAL_ID
2828

2929
#define DT_I2C_0_BASE_ADDRESS DT_ATMEL_SAM_I2C_TWI_40018000_BASE_ADDRESS
30-
#define CONFIG_I2C_0_NAME DT_ATMEL_SAM_I2C_TWI_40018000_LABEL
30+
#define DT_I2C_0_NAME DT_ATMEL_SAM_I2C_TWI_40018000_LABEL
3131
#define DT_I2C_0_BITRATE DT_ATMEL_SAM_I2C_TWI_40018000_CLOCK_FREQUENCY
3232
#define DT_I2C_0_IRQ DT_ATMEL_SAM_I2C_TWI_40018000_IRQ_0
3333
#define DT_I2C_0_IRQ_PRI DT_ATMEL_SAM_I2C_TWI_40018000_IRQ_0_PRIORITY
3434
#define DT_I2C_0_PERIPHERAL_ID DT_ATMEL_SAM_I2C_TWI_40018000_PERIPHERAL_ID
3535
#define DT_I2C_1_BASE_ADDRESS DT_ATMEL_SAM_I2C_TWI_4001C000_BASE_ADDRESS
36-
#define CONFIG_I2C_1_NAME DT_ATMEL_SAM_I2C_TWI_4001C000_LABEL
36+
#define DT_I2C_1_NAME DT_ATMEL_SAM_I2C_TWI_4001C000_LABEL
3737
#define DT_I2C_1_BITRATE DT_ATMEL_SAM_I2C_TWI_4001C000_CLOCK_FREQUENCY
3838
#define DT_I2C_1_IRQ DT_ATMEL_SAM_I2C_TWI_4001C000_IRQ_0
3939
#define DT_I2C_1_IRQ_PRI DT_ATMEL_SAM_I2C_TWI_4001C000_IRQ_0_PRIORITY

soc/arm/atmel_sam/same70/dts_fixup.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -40,21 +40,21 @@
4040
#define DT_GPIO_SAM_PORTE_PERIPHERAL_ID DT_ATMEL_SAM_GPIO_400E1600_PERIPHERAL_ID
4141

4242
#define DT_I2C_0_BASE_ADDRESS DT_ATMEL_SAM_I2C_TWIHS_40018000_BASE_ADDRESS
43-
#define CONFIG_I2C_0_NAME DT_ATMEL_SAM_I2C_TWIHS_40018000_LABEL
43+
#define DT_I2C_0_NAME DT_ATMEL_SAM_I2C_TWIHS_40018000_LABEL
4444
#define DT_I2C_0_BITRATE DT_ATMEL_SAM_I2C_TWIHS_40018000_CLOCK_FREQUENCY
4545
#define DT_I2C_0_IRQ DT_ATMEL_SAM_I2C_TWIHS_40018000_IRQ_0
4646
#define DT_I2C_0_IRQ_PRI DT_ATMEL_SAM_I2C_TWIHS_40018000_IRQ_0_PRIORITY
4747
#define DT_I2C_0_PERIPHERAL_ID DT_ATMEL_SAM_I2C_TWIHS_40018000_PERIPHERAL_ID
4848

4949
#define DT_I2C_1_BASE_ADDRESS DT_ATMEL_SAM_I2C_TWIHS_4001C000_BASE_ADDRESS
50-
#define CONFIG_I2C_1_NAME DT_ATMEL_SAM_I2C_TWIHS_4001C000_LABEL
50+
#define DT_I2C_1_NAME DT_ATMEL_SAM_I2C_TWIHS_4001C000_LABEL
5151
#define DT_I2C_1_BITRATE DT_ATMEL_SAM_I2C_TWIHS_4001C000_CLOCK_FREQUENCY
5252
#define DT_I2C_1_IRQ DT_ATMEL_SAM_I2C_TWIHS_4001C000_IRQ_0
5353
#define DT_I2C_1_IRQ_PRI DT_ATMEL_SAM_I2C_TWIHS_4001C000_IRQ_0_PRIORITY
5454
#define DT_I2C_1_PERIPHERAL_ID DT_ATMEL_SAM_I2C_TWIHS_4001C000_PERIPHERAL_ID
5555

5656
#define DT_I2C_2_BASE_ADDRESS DT_ATMEL_SAM_I2C_TWIHS_40060000_BASE_ADDRESS
57-
#define CONFIG_I2C_2_NAME DT_ATMEL_SAM_I2C_TWIHS_40060000_LABEL
57+
#define DT_I2C_2_NAME DT_ATMEL_SAM_I2C_TWIHS_40060000_LABEL
5858
#define DT_I2C_2_BITRATE DT_ATMEL_SAM_I2C_TWIHS_40060000_CLOCK_FREQUENCY
5959
#define DT_I2C_2_IRQ DT_ATMEL_SAM_I2C_TWIHS_40060000_IRQ_0
6060
#define DT_I2C_2_IRQ_PRI DT_ATMEL_SAM_I2C_TWIHS_40060000_IRQ_0_PRIORITY

soc/arm/atmel_sam0/samd20/dts_fixup.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#define CONFIG_WDT_0_NAME DT_INST_0_ATMEL_SAM0_WATCHDOG_LABEL
88

9-
#define CONFIG_I2C_0_NAME DT_INST_0_ATMEL_SAM0_I2C_LABEL
9+
#define DT_I2C_0_NAME DT_INST_0_ATMEL_SAM0_I2C_LABEL
1010

1111
#define DT_NUM_IRQ_PRIO_BITS DT_ARM_V6M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS
1212

soc/arm/atmel_sam0/samd21/dts_fixup.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#define CONFIG_WDT_0_NAME DT_INST_0_ATMEL_SAM0_WATCHDOG_LABEL
88

9-
#define CONFIG_I2C_0_NAME DT_INST_0_ATMEL_SAM0_I2C_LABEL
9+
#define DT_I2C_0_NAME DT_INST_0_ATMEL_SAM0_I2C_LABEL
1010

1111
#define DT_NUM_IRQ_PRIO_BITS DT_ARM_V6M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS
1212

soc/arm/atmel_sam0/samr21/dts_fixup.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
#define CONFIG_WDT_0_NAME DT_INST_0_ATMEL_SAM0_WATCHDOG_LABEL
1212

13-
#define CONFIG_I2C_0_NAME DT_INST_0_ATMEL_SAM0_I2C_LABEL
13+
#define DT_I2C_0_NAME DT_INST_0_ATMEL_SAM0_I2C_LABEL
1414

1515
#define DT_NUM_IRQ_PRIO_BITS DT_ARM_V6M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS
1616

soc/arm/nxp_imx/rt/dts_fixup.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -48,31 +48,31 @@
4848
#define DT_MCUX_IGPIO_5_IRQ_1 DT_NXP_IMX_GPIO_400C0000_IRQ_1
4949
#define DT_MCUX_IGPIO_5_IRQ_1_PRI DT_NXP_IMX_GPIO_400C0000_IRQ_1_PRIORITY
5050

51-
#define CONFIG_I2C_1_NAME DT_NXP_IMX_LPI2C_403F0000_LABEL
51+
#define DT_I2C_1_NAME DT_NXP_IMX_LPI2C_403F0000_LABEL
5252
#define DT_I2C_MCUX_LPI2C_1_BASE_ADDRESS DT_NXP_IMX_LPI2C_403F0000_BASE_ADDRESS
5353
#define DT_I2C_MCUX_LPI2C_1_IRQ DT_NXP_IMX_LPI2C_403F0000_IRQ_0
5454
#define DT_I2C_MCUX_LPI2C_1_IRQ_PRI DT_NXP_IMX_LPI2C_403F0000_IRQ_0_PRIORITY
5555
#define DT_I2C_MCUX_LPI2C_1_BITRATE DT_NXP_IMX_LPI2C_403F0000_CLOCK_FREQUENCY
5656
#define DT_I2C_MCUX_LPI2C_1_CLOCK_NAME DT_NXP_IMX_LPI2C_403F0000_CLOCK_CONTROLLER
5757
#define DT_I2C_MCUX_LPI2C_1_CLOCK_SUBSYS DT_NXP_IMX_LPI2C_403F0000_CLOCK_NAME
5858

59-
#define CONFIG_I2C_2_NAME DT_NXP_IMX_LPI2C_403F4000_LABEL
59+
#define DT_I2C_2_NAME DT_NXP_IMX_LPI2C_403F4000_LABEL
6060
#define DT_I2C_MCUX_LPI2C_2_BASE_ADDRESS DT_NXP_IMX_LPI2C_403F4000_BASE_ADDRESS
6161
#define DT_I2C_MCUX_LPI2C_2_IRQ DT_NXP_IMX_LPI2C_403F4000_IRQ_0
6262
#define DT_I2C_MCUX_LPI2C_2_IRQ_PRI DT_NXP_IMX_LPI2C_403F4000_IRQ_0_PRIORITY
6363
#define DT_I2C_MCUX_LPI2C_2_BITRATE DT_NXP_IMX_LPI2C_403F4000_CLOCK_FREQUENCY
6464
#define DT_I2C_MCUX_LPI2C_2_CLOCK_NAME DT_NXP_IMX_LPI2C_403F4000_CLOCK_CONTROLLER
6565
#define DT_I2C_MCUX_LPI2C_2_CLOCK_SUBSYS DT_NXP_IMX_LPI2C_403F4000_CLOCK_NAME
6666

67-
#define CONFIG_I2C_3_NAME DT_NXP_IMX_LPI2C_403F8000_LABEL
67+
#define DT_I2C_3_NAME DT_NXP_IMX_LPI2C_403F8000_LABEL
6868
#define DT_I2C_MCUX_LPI2C_3_BASE_ADDRESS DT_NXP_IMX_LPI2C_403F8000_BASE_ADDRESS
6969
#define DT_I2C_MCUX_LPI2C_3_IRQ DT_NXP_IMX_LPI2C_403F8000_IRQ_0
7070
#define DT_I2C_MCUX_LPI2C_3_IRQ_PRI DT_NXP_IMX_LPI2C_403F8000_IRQ_0_PRIORITY
7171
#define DT_I2C_MCUX_LPI2C_3_BITRATE DT_NXP_IMX_LPI2C_403F8000_CLOCK_FREQUENCY
7272
#define DT_I2C_MCUX_LPI2C_3_CLOCK_NAME DT_NXP_IMX_LPI2C_403F8000_CLOCK_CONTROLLER
7373
#define DT_I2C_MCUX_LPI2C_3_CLOCK_SUBSYS DT_NXP_IMX_LPI2C_403F8000_CLOCK_NAME
7474

75-
#define CONFIG_I2C_4_NAME DT_NXP_IMX_LPI2C_403FC000_LABEL
75+
#define DT_I2C_4_NAME DT_NXP_IMX_LPI2C_403FC000_LABEL
7676
#define DT_I2C_MCUX_LPI2C_4_BASE_ADDRESS DT_NXP_IMX_LPI2C_403FC000_BASE_ADDRESS
7777
#define DT_I2C_MCUX_LPI2C_4_IRQ DT_NXP_IMX_LPI2C_403FC000_IRQ_0
7878
#define DT_I2C_MCUX_LPI2C_4_IRQ_PRI DT_NXP_IMX_LPI2C_403FC000_IRQ_0_PRIORITY

soc/arm/nxp_kinetis/k2x/dts_fixup.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,13 @@
4949
#define DT_SIM_BASE_ADDRESS DT_NXP_KINETIS_SIM_40047000_BASE_ADDRESS
5050
#define DT_SIM_NAME DT_NXP_KINETIS_SIM_40047000_LABEL
5151

52-
#define CONFIG_I2C_0_NAME DT_NXP_KINETIS_I2C_40066000_LABEL
52+
#define DT_I2C_0_NAME DT_NXP_KINETIS_I2C_40066000_LABEL
5353
#define DT_I2C_MCUX_0_BASE_ADDRESS DT_NXP_KINETIS_I2C_40066000_BASE_ADDRESS
5454
#define DT_I2C_MCUX_0_IRQ DT_NXP_KINETIS_I2C_40066000_IRQ_0
5555
#define DT_I2C_MCUX_0_IRQ_PRI DT_NXP_KINETIS_I2C_40066000_IRQ_0_PRIORITY
5656
#define DT_I2C_MCUX_0_BITRATE DT_NXP_KINETIS_I2C_40066000_CLOCK_FREQUENCY
5757

58-
#define CONFIG_I2C_1_NAME DT_NXP_KINETIS_I2C_40067000_LABEL
58+
#define DT_I2C_1_NAME DT_NXP_KINETIS_I2C_40067000_LABEL
5959
#define DT_I2C_MCUX_1_BASE_ADDRESS DT_NXP_KINETIS_I2C_40067000_BASE_ADDRESS
6060
#define DT_I2C_MCUX_1_IRQ DT_NXP_KINETIS_I2C_40067000_IRQ_0
6161
#define DT_I2C_MCUX_1_IRQ_PRI DT_NXP_KINETIS_I2C_40067000_IRQ_0_PRIORITY

soc/arm/nxp_kinetis/k6x/dts_fixup.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -85,13 +85,13 @@
8585

8686
#define DT_MCG_NAME DT_NXP_KINETIS_MCG_40064000_LABEL
8787

88-
#define CONFIG_I2C_0_NAME DT_NXP_KINETIS_I2C_40066000_LABEL
88+
#define DT_I2C_0_NAME DT_NXP_KINETIS_I2C_40066000_LABEL
8989
#define DT_I2C_MCUX_0_BASE_ADDRESS DT_NXP_KINETIS_I2C_40066000_BASE_ADDRESS
9090
#define DT_I2C_MCUX_0_IRQ DT_NXP_KINETIS_I2C_40066000_IRQ_0
9191
#define DT_I2C_MCUX_0_IRQ_PRI DT_NXP_KINETIS_I2C_40066000_IRQ_0_PRIORITY
9292
#define DT_I2C_MCUX_0_BITRATE DT_NXP_KINETIS_I2C_40066000_CLOCK_FREQUENCY
9393

94-
#define CONFIG_I2C_1_NAME DT_NXP_KINETIS_I2C_40067000_LABEL
94+
#define DT_I2C_1_NAME DT_NXP_KINETIS_I2C_40067000_LABEL
9595
#define DT_I2C_MCUX_1_BASE_ADDRESS DT_NXP_KINETIS_I2C_40067000_BASE_ADDRESS
9696
#define DT_I2C_MCUX_1_IRQ DT_NXP_KINETIS_I2C_40067000_IRQ_0
9797
#define DT_I2C_MCUX_1_IRQ_PRI DT_NXP_KINETIS_I2C_40067000_IRQ_0_PRIORITY

soc/arm/nxp_kinetis/k8x/dts_fixup.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -59,25 +59,25 @@
5959
#define DT_FTM_3_CLOCK_NAME DT_NXP_KINETIS_FTM_400B9000_CLOCK_CONTROLLER
6060
#define DT_FTM_3_CLOCK_SUBSYS DT_NXP_KINETIS_FTM_400B9000_CLOCK_NAME
6161

62-
#define CONFIG_I2C_0_NAME DT_NXP_KINETIS_I2C_40066000_LABEL
62+
#define DT_I2C_0_NAME DT_NXP_KINETIS_I2C_40066000_LABEL
6363
#define DT_I2C_MCUX_0_BASE_ADDRESS DT_NXP_KINETIS_I2C_40066000_BASE_ADDRESS
6464
#define DT_I2C_MCUX_0_IRQ DT_NXP_KINETIS_I2C_40066000_IRQ_0
6565
#define DT_I2C_MCUX_0_IRQ_PRI DT_NXP_KINETIS_I2C_40066000_IRQ_0_PRIORITY
6666
#define DT_I2C_MCUX_0_BITRATE DT_NXP_KINETIS_I2C_40066000_CLOCK_FREQUENCY
6767

68-
#define CONFIG_I2C_1_NAME DT_NXP_KINETIS_I2C_40067000_LABEL
68+
#define DT_I2C_1_NAME DT_NXP_KINETIS_I2C_40067000_LABEL
6969
#define DT_I2C_MCUX_1_BASE_ADDRESS DT_NXP_KINETIS_I2C_40067000_BASE_ADDRESS
7070
#define DT_I2C_MCUX_1_IRQ DT_NXP_KINETIS_I2C_40067000_IRQ_0
7171
#define DT_I2C_MCUX_1_IRQ_PRI DT_NXP_KINETIS_I2C_40067000_IRQ_0_PRIORITY
7272
#define DT_I2C_MCUX_1_BITRATE DT_NXP_KINETIS_I2C_40067000_CLOCK_FREQUENCY
7373

74-
#define CONFIG_I2C_2_NAME DT_NXP_KINETIS_I2C_400E6000_LABEL
74+
#define DT_I2C_2_NAME DT_NXP_KINETIS_I2C_400E6000_LABEL
7575
#define DT_I2C_MCUX_2_BASE_ADDRESS DT_NXP_KINETIS_I2C_400E6000_BASE_ADDRESS
7676
#define DT_I2C_MCUX_2_IRQ DT_NXP_KINETIS_I2C_400E6000_IRQ_0
7777
#define DT_I2C_MCUX_2_IRQ_PRI DT_NXP_KINETIS_I2C_400E6000_IRQ_0_PRIORITY
7878
#define DT_I2C_MCUX_2_BITRATE DT_NXP_KINETIS_I2C_400E6000_CLOCK_FREQUENCY
7979

80-
#define CONFIG_I2C_3_NAME DT_NXP_KINETIS_I2C_400E7000_LABEL
80+
#define DT_I2C_3_NAME DT_NXP_KINETIS_I2C_400E7000_LABEL
8181
#define DT_I2C_MCUX_3_BASE_ADDRESS DT_NXP_KINETIS_I2C_400E7000_BASE_ADDRESS
8282
#define DT_I2C_MCUX_3_IRQ DT_NXP_KINETIS_I2C_400E7000_IRQ_0
8383
#define DT_I2C_MCUX_3_IRQ_PRI DT_NXP_KINETIS_I2C_400E7000_IRQ_0_PRIORITY

soc/arm/nxp_kinetis/ke1xf/dts_fixup.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,15 @@
6060
#define DT_UART_MCUX_LPUART_2_CLOCK_NAME DT_NXP_KINETIS_LPUART_4006C000_CLOCK_CONTROLLER
6161
#define DT_UART_MCUX_LPUART_2_CLOCK_SUBSYS DT_NXP_KINETIS_LPUART_4006C000_CLOCK_NAME
6262

63-
#define CONFIG_I2C_0_NAME DT_NXP_IMX_LPI2C_40066000_LABEL
63+
#define DT_I2C_0_NAME DT_NXP_IMX_LPI2C_40066000_LABEL
6464
#define DT_I2C_MCUX_LPI2C_0_BASE_ADDRESS DT_NXP_IMX_LPI2C_40066000_BASE_ADDRESS
6565
#define DT_I2C_MCUX_LPI2C_0_IRQ DT_NXP_IMX_LPI2C_40066000_IRQ_0
6666
#define DT_I2C_MCUX_LPI2C_0_IRQ_PRI DT_NXP_IMX_LPI2C_40066000_IRQ_0_PRIORITY
6767
#define DT_I2C_MCUX_LPI2C_0_BITRATE DT_NXP_IMX_LPI2C_40066000_CLOCK_FREQUENCY
6868
#define DT_I2C_MCUX_LPI2C_0_CLOCK_NAME DT_NXP_IMX_LPI2C_40066000_CLOCK_CONTROLLER
6969
#define DT_I2C_MCUX_LPI2C_0_CLOCK_SUBSYS DT_NXP_IMX_LPI2C_40066000_CLOCK_NAME
7070

71-
#define CONFIG_I2C_1_NAME DT_NXP_IMX_LPI2C_40067000_LABEL
71+
#define DT_I2C_1_NAME DT_NXP_IMX_LPI2C_40067000_LABEL
7272
#define DT_I2C_MCUX_LPI2C_1_BASE_ADDRESS DT_NXP_IMX_LPI2C_40067000_BASE_ADDRESS
7373
#define DT_I2C_MCUX_LPI2C_1_IRQ DT_NXP_IMX_LPI2C_40067000_IRQ_0
7474
#define DT_I2C_MCUX_LPI2C_1_IRQ_PRI DT_NXP_IMX_LPI2C_40067000_IRQ_0_PRIORITY

soc/arm/nxp_kinetis/kl2x/dts_fixup.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#define DT_SIM_BASE_ADDRESS DT_NXP_KINETIS_SIM_40047000_BASE_ADDRESS
1515
#define DT_SIM_NAME DT_NXP_KINETIS_SIM_40047000_LABEL
1616

17-
#define CONFIG_I2C_0_NAME DT_NXP_KINETIS_I2C_40066000_LABEL
17+
#define DT_I2C_0_NAME DT_NXP_KINETIS_I2C_40066000_LABEL
1818
#define DT_I2C_MCUX_0_BASE_ADDRESS DT_NXP_KINETIS_I2C_40066000_BASE_ADDRESS
1919
#define DT_I2C_MCUX_0_IRQ DT_NXP_KINETIS_I2C_40066000_IRQ_0
2020
#define DT_I2C_MCUX_0_IRQ_PRI DT_NXP_KINETIS_I2C_40066000_IRQ_0_PRIORITY

soc/arm/nxp_kinetis/kwx/dts_fixup.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
#define DT_ADC_0_IRQ_PRI DT_NXP_KINETIS_ADC16_4003B000_IRQ_0_PRIORITY
88
#define DT_ADC_0_NAME DT_NXP_KINETIS_ADC16_4003B000_LABEL
99

10-
#define CONFIG_I2C_0_NAME DT_NXP_KINETIS_I2C_40066000_LABEL
10+
#define DT_I2C_0_NAME DT_NXP_KINETIS_I2C_40066000_LABEL
1111
#define DT_I2C_MCUX_0_BASE_ADDRESS DT_NXP_KINETIS_I2C_40066000_BASE_ADDRESS
1212
#define DT_I2C_MCUX_0_IRQ DT_NXP_KINETIS_I2C_40066000_IRQ_0
1313
#define DT_I2C_MCUX_0_IRQ_PRI DT_NXP_KINETIS_I2C_40066000_IRQ_0_PRIORITY
1414
#define DT_I2C_MCUX_0_BITRATE DT_NXP_KINETIS_I2C_40066000_CLOCK_FREQUENCY
1515

16-
#define CONFIG_I2C_1_NAME DT_NXP_KINETIS_I2C_40067000_LABEL
16+
#define DT_I2C_1_NAME DT_NXP_KINETIS_I2C_40067000_LABEL
1717
#define DT_I2C_MCUX_1_BASE_ADDRESS DT_NXP_KINETIS_I2C_40067000_BASE_ADDRESS
1818
#define DT_I2C_MCUX_1_IRQ DT_NXP_KINETIS_I2C_40067000_IRQ_0
1919
#define DT_I2C_MCUX_1_IRQ_PRI DT_NXP_KINETIS_I2C_40067000_IRQ_0_PRIORITY

soc/arm/st_stm32/stm32f0/dts_fixup.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -78,15 +78,15 @@
7878

7979
#define DT_I2C_1_BASE_ADDRESS DT_ST_STM32_I2C_V2_40005400_BASE_ADDRESS
8080
#define DT_I2C_1_COMBINED_IRQ_PRI DT_ST_STM32_I2C_V2_40005400_IRQ_COMBINED_PRIORITY
81-
#define CONFIG_I2C_1_NAME DT_ST_STM32_I2C_V2_40005400_LABEL
81+
#define DT_I2C_1_NAME DT_ST_STM32_I2C_V2_40005400_LABEL
8282
#define DT_I2C_1_COMBINED_IRQ DT_ST_STM32_I2C_V2_40005400_IRQ_COMBINED
8383
#define DT_I2C_1_BITRATE DT_ST_STM32_I2C_V2_40005400_CLOCK_FREQUENCY
8484
#define DT_I2C_1_CLOCK_BITS DT_ST_STM32_I2C_V2_40005400_CLOCK_BITS
8585
#define DT_I2C_1_CLOCK_BUS DT_ST_STM32_I2C_V2_40005400_CLOCK_BUS
8686

8787
#define DT_I2C_2_BASE_ADDRESS DT_ST_STM32_I2C_V2_40005800_BASE_ADDRESS
8888
#define DT_I2C_2_COMBINED_IRQ_PRI DT_ST_STM32_I2C_V2_40005800_IRQ_COMBINED_PRIORITY
89-
#define CONFIG_I2C_2_NAME DT_ST_STM32_I2C_V2_40005800_LABEL
89+
#define DT_I2C_2_NAME DT_ST_STM32_I2C_V2_40005800_LABEL
9090
#define DT_I2C_2_COMBINED_IRQ DT_ST_STM32_I2C_V2_40005800_IRQ_COMBINED
9191
#define DT_I2C_2_BITRATE DT_ST_STM32_I2C_V2_40005800_CLOCK_FREQUENCY
9292
#define DT_I2C_2_CLOCK_BITS DT_ST_STM32_I2C_V2_40005800_CLOCK_BITS

soc/arm/st_stm32/stm32f1/dts_fixup.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@
115115
#define DT_I2C_1_BASE_ADDRESS DT_ST_STM32_I2C_V1_40005400_BASE_ADDRESS
116116
#define DT_I2C_1_EVENT_IRQ_PRI DT_ST_STM32_I2C_V1_40005400_IRQ_EVENT_PRIORITY
117117
#define DT_I2C_1_ERROR_IRQ_PRI DT_ST_STM32_I2C_V1_40005400_IRQ_ERROR_PRIORITY
118-
#define CONFIG_I2C_1_NAME DT_ST_STM32_I2C_V1_40005400_LABEL
118+
#define DT_I2C_1_NAME DT_ST_STM32_I2C_V1_40005400_LABEL
119119
#define DT_I2C_1_EVENT_IRQ DT_ST_STM32_I2C_V1_40005400_IRQ_EVENT
120120
#define DT_I2C_1_ERROR_IRQ DT_ST_STM32_I2C_V1_40005400_IRQ_ERROR
121121
#define DT_I2C_1_BITRATE DT_ST_STM32_I2C_V1_40005400_CLOCK_FREQUENCY
@@ -125,7 +125,7 @@
125125
#define DT_I2C_2_BASE_ADDRESS DT_ST_STM32_I2C_V1_40005800_BASE_ADDRESS
126126
#define DT_I2C_2_EVENT_IRQ_PRI DT_ST_STM32_I2C_V1_40005800_IRQ_EVENT_PRIORITY
127127
#define DT_I2C_2_ERROR_IRQ_PRI DT_ST_STM32_I2C_V1_40005800_IRQ_ERROR_PRIORITY
128-
#define CONFIG_I2C_2_NAME DT_ST_STM32_I2C_V1_40005800_LABEL
128+
#define DT_I2C_2_NAME DT_ST_STM32_I2C_V1_40005800_LABEL
129129
#define DT_I2C_2_EVENT_IRQ DT_ST_STM32_I2C_V1_40005800_IRQ_EVENT
130130
#define DT_I2C_2_ERROR_IRQ DT_ST_STM32_I2C_V1_40005800_IRQ_ERROR
131131
#define DT_I2C_2_BITRATE DT_ST_STM32_I2C_V1_40005800_CLOCK_FREQUENCY

0 commit comments

Comments
 (0)