[nrf fromlist] drivers: i2c: i2c_nrfx_twi: Use iterable device definition

Using explicit instance number in driver no longer needed.

Upstream PR #: 93083

Signed-off-by: Michał Stasiak <[email protected]>

Author: mstasiaknordic

drivers/i2c/i2c_nrfx_twim.c

@@ -301,78 +301,7 @@ static DEVICE_API(i2c, i2c_nrfx_twim_driver_api) = {
 			DT_PHANDLE(I2C(idx), memory_regions)))))),	       \
 		())
 
-#ifdef CONFIG_HAS_HW_NRF_TWIM0
-I2C_NRFX_TWIM_DEVICE(0);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_TWIM1
-I2C_NRFX_TWIM_DEVICE(1);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_TWIM2
-I2C_NRFX_TWIM_DEVICE(2);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_TWIM3
-I2C_NRFX_TWIM_DEVICE(3);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_TWIM20
-I2C_NRFX_TWIM_DEVICE(20);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_TWIM21
-I2C_NRFX_TWIM_DEVICE(21);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_TWIM22
-I2C_NRFX_TWIM_DEVICE(22);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_TWIM23
-I2C_NRFX_TWIM_DEVICE(23);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_TWIM24
-I2C_NRFX_TWIM_DEVICE(24);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_TWIM30
-I2C_NRFX_TWIM_DEVICE(30);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_TWIM120
-I2C_NRFX_TWIM_DEVICE(120);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_TWIM130
-I2C_NRFX_TWIM_DEVICE(130);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_TWIM131
-I2C_NRFX_TWIM_DEVICE(131);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_TWIM132
-I2C_NRFX_TWIM_DEVICE(132);
-#endif
+#define COND_I2C_NRF_TWIM_DEVICE(unused, prefix, i, _) \
+	IF_ENABLED(CONFIG_HAS_HW_NRF_TWIM##prefix##i, (I2C_NRFX_TWIM_DEVICE(prefix##i);))
 
-#ifdef CONFIG_HAS_HW_NRF_TWIM133
-I2C_NRFX_TWIM_DEVICE(133);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_TWIM134
-I2C_NRFX_TWIM_DEVICE(134);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_TWIM135
-I2C_NRFX_TWIM_DEVICE(135);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_TWIM136
-I2C_NRFX_TWIM_DEVICE(136);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_TWIM137
-I2C_NRFX_TWIM_DEVICE(137);
-#endif
+NRFX_FOREACH_PRESENT(TWIM, COND_I2C_NRF_TWIM_DEVICE, (), ())

drivers/i2c/i2c_nrfx_twim_rtio.c

@@ -292,78 +292,7 @@ static int i2c_nrfx_twim_rtio_deinit(const struct device *dev)
 			     &twim_##idx##z_config, POST_KERNEL, CONFIG_I2C_INIT_PRIORITY,         \
 			     &i2c_nrfx_twim_driver_api);
 
-#ifdef CONFIG_HAS_HW_NRF_TWIM0
-I2C_NRFX_TWIM_RTIO_DEVICE(0);
-#endif
+#define COND_I2C_NRF_TWIM_RTIO_DEVICE(unused, prefix, i, _) \
+	IF_ENABLED(CONFIG_HAS_HW_NRF_TWIM##prefix##i, (I2C_NRFX_TWIM_RTIO_DEVICE(prefix##i);))
 
-#ifdef CONFIG_HAS_HW_NRF_TWIM1
-I2C_NRFX_TWIM_RTIO_DEVICE(1);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_TWIM2
-I2C_NRFX_TWIM_RTIO_DEVICE(2);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_TWIM3
-I2C_NRFX_TWIM_RTIO_DEVICE(3);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_TWIM20
-I2C_NRFX_TWIM_RTIO_DEVICE(20);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_TWIM21
-I2C_NRFX_TWIM_RTIO_DEVICE(21);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_TWIM22
-I2C_NRFX_TWIM_RTIO_DEVICE(22);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_TWIM23
-I2C_NRFX_TWIM_RTIO_DEVICE(23);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_TWIM24
-I2C_NRFX_TWIM_RTIO_DEVICE(24);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_TWIM30
-I2C_NRFX_TWIM_RTIO_DEVICE(30);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_TWIM120
-I2C_NRFX_TWIM_RTIO_DEVICE(120);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_TWIM130
-I2C_NRFX_TWIM_RTIO_DEVICE(130);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_TWIM131
-I2C_NRFX_TWIM_RTIO_DEVICE(131);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_TWIM132
-I2C_NRFX_TWIM_RTIO_DEVICE(132);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_TWIM133
-I2C_NRFX_TWIM_RTIO_DEVICE(133);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_TWIM134
-I2C_NRFX_TWIM_RTIO_DEVICE(134);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_TWIM135
-I2C_NRFX_TWIM_RTIO_DEVICE(135);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_TWIM136
-I2C_NRFX_TWIM_RTIO_DEVICE(136);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_TWIM137
-I2C_NRFX_TWIM_RTIO_DEVICE(137);
-#endif
+NRFX_FOREACH_PRESENT(TWIM, COND_I2C_NRF_TWIM_RTIO_DEVICE, (), ())

drivers/i2c/i2c_nrfx_twis.c

@@ -373,70 +373,7 @@ static int shim_nrf_twis_deinit(const struct device *dev)
 		&shim_nrf_twis_api								\
 	);
 
-#ifdef CONFIG_HAS_HW_NRF_TWIS0
-SHIM_NRF_TWIS_DEVICE_DEFINE(0);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_TWIS1
-SHIM_NRF_TWIS_DEVICE_DEFINE(1);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_TWIS2
-SHIM_NRF_TWIS_DEVICE_DEFINE(2);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_TWIS3
-SHIM_NRF_TWIS_DEVICE_DEFINE(3);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_TWIS20
-SHIM_NRF_TWIS_DEVICE_DEFINE(20);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_TWIS21
-SHIM_NRF_TWIS_DEVICE_DEFINE(21);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_TWIS22
-SHIM_NRF_TWIS_DEVICE_DEFINE(22);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_TWIS23
-SHIM_NRF_TWIS_DEVICE_DEFINE(23);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_TWIS24
-SHIM_NRF_TWIS_DEVICE_DEFINE(24);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_TWIS30
-SHIM_NRF_TWIS_DEVICE_DEFINE(30);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_TWIS130
-SHIM_NRF_TWIS_DEVICE_DEFINE(130);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_TWIS131
-SHIM_NRF_TWIS_DEVICE_DEFINE(131);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_TWIS133
-SHIM_NRF_TWIS_DEVICE_DEFINE(133);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_TWIS134
-SHIM_NRF_TWIS_DEVICE_DEFINE(134);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_TWIS135
-SHIM_NRF_TWIS_DEVICE_DEFINE(135);
-#endif
-
-#ifdef CONFIG_HAS_HW_NRF_TWIS136
-SHIM_NRF_TWIS_DEVICE_DEFINE(136);
-#endif
+#define COND_SHIM_NRF_TWIS_DEVICE(unused, prefix, i, _) \
+	IF_ENABLED(CONFIG_HAS_HW_NRF_TWIS##prefix##i, (SHIM_NRF_TWIS_DEVICE_DEFINE(prefix##i);))
 
-#ifdef CONFIG_HAS_HW_NRF_TWIS137
-SHIM_NRF_TWIS_DEVICE_DEFINE(137);
-#endif
+NRFX_FOREACH_PRESENT(TWIS, COND_SHIM_NRF_TWIS_DEVICE, (), ())