[nrf fromlist] drivers: i2c: i2c_nrfx_twim: use standard instantiation

Removed Kconfig symbols for each TWIM instance
which are no longer needed.

Upstream PR #: 98569

Signed-off-by: Adam Kondraciuk <[email protected]>

Author: adamkondraciuk

drivers/i2c/Kconfig.nrfx

@@ -23,25 +23,7 @@ config I2C_NRFX_TWI
 config I2C_NRFX_TWIM
 	def_bool y
 	depends on DT_HAS_NORDIC_NRF_TWIM_ENABLED
-	select NRFX_TWIM0 if HAS_HW_NRF_TWIM0
-	select NRFX_TWIM1 if HAS_HW_NRF_TWIM1
-	select NRFX_TWIM2 if HAS_HW_NRF_TWIM2
-	select NRFX_TWIM3 if HAS_HW_NRF_TWIM3
-	select NRFX_TWIM20 if HAS_HW_NRF_TWIM20
-	select NRFX_TWIM21 if HAS_HW_NRF_TWIM21
-	select NRFX_TWIM22 if HAS_HW_NRF_TWIM22
-	select NRFX_TWIM23 if HAS_HW_NRF_TWIM23
-	select NRFX_TWIM24 if HAS_HW_NRF_TWIM24
-	select NRFX_TWIM30 if HAS_HW_NRF_TWIM30
-	select NRFX_TWIM120 if HAS_HW_NRF_TWIM120
-	select NRFX_TWIM130 if HAS_HW_NRF_TWIM130
-	select NRFX_TWIM131 if HAS_HW_NRF_TWIM131
-	select NRFX_TWIM132 if HAS_HW_NRF_TWIM132
-	select NRFX_TWIM133 if HAS_HW_NRF_TWIM133
-	select NRFX_TWIM134 if HAS_HW_NRF_TWIM134
-	select NRFX_TWIM135 if HAS_HW_NRF_TWIM135
-	select NRFX_TWIM136 if HAS_HW_NRF_TWIM136
-	select NRFX_TWIM137 if HAS_HW_NRF_TWIM137
+	select NRFX_TWIM
 
 config I2C_NRFX_TRANSFER_TIMEOUT
 	int "Transfer timeout [ms]"

modules/hal_nordic/nrfx/Kconfig

@@ -631,102 +631,7 @@ config NRFX_TWI1
 	select NRFX_TWI
 
 config NRFX_TWIM
-	bool
-
-config NRFX_TWIM0
-	bool "TWIM0 driver instance"
-	depends on $(dt_nodelabel_exists,i2c0) && !SOC_SERIES_NRF51X
-	select NRFX_TWIM
-
-config NRFX_TWIM1
-	bool "TWIM1 driver instance"
-	depends on $(dt_nodelabel_exists,i2c1) && !SOC_SERIES_NRF51X
-	select NRFX_TWIM
-
-config NRFX_TWIM2
-	bool "TWIM2 driver instance"
-	depends on $(dt_nodelabel_exists,i2c2)
-	select NRFX_TWIM
-
-config NRFX_TWIM3
-	bool "TWIM3 driver instance"
-	depends on $(dt_nodelabel_exists,i2c3)
-	select NRFX_TWIM
-
-config NRFX_TWIM20
-	bool "TWIM20 driver instance"
-	depends on $(dt_nodelabel_exists,i2c20)
-	select NRFX_TWIM
-
-config NRFX_TWIM21
-	bool "TWIM21 driver instance"
-	depends on $(dt_nodelabel_exists,i2c21)
-	select NRFX_TWIM
-
-config NRFX_TWIM22
-	bool "TWIM22 driver instance"
-	depends on $(dt_nodelabel_exists,i2c22)
-	select NRFX_TWIM
-
-config NRFX_TWIM23
-	bool "TWIM23 driver instance"
-	depends on $(dt_nodelabel_exists,i2c23)
-	select NRFX_TWIM
-
-config NRFX_TWIM24
-	bool "TWIM24 driver instance"
-	depends on $(dt_nodelabel_exists,i2c24)
-	select NRFX_TWIM
-
-config NRFX_TWIM30
-	bool "TWIM30 driver instance"
-	depends on $(dt_nodelabel_exists,i2c30)
-	select NRFX_TWIM
-
-config NRFX_TWIM120
-	bool "TWIM120 driver instance"
-	depends on $(dt_nodelabel_exists,i2c120)
-	select NRFX_TWIM
-
-config NRFX_TWIM130
-	bool "TWIM130 driver instance"
-	depends on $(dt_nodelabel_exists,i2c130)
-	select NRFX_TWIM
-
-config NRFX_TWIM131
-	bool "TWIM131 driver instance"
-	depends on $(dt_nodelabel_exists,i2c131)
-	select NRFX_TWIM
-
-config NRFX_TWIM132
-	bool "TWIM132 driver instance"
-	depends on $(dt_nodelabel_exists,i2c132)
-	select NRFX_TWIM
-
-config NRFX_TWIM133
-	bool "TWIM133 driver instance"
-	depends on $(dt_nodelabel_exists,i2c133)
-	select NRFX_TWIM
-
-config NRFX_TWIM134
-	bool "TWIM134 driver instance"
-	depends on $(dt_nodelabel_exists,i2c134)
-	select NRFX_TWIM
-
-config NRFX_TWIM135
-	bool "TWIM135 driver instance"
-	depends on $(dt_nodelabel_exists,i2c135)
-	select NRFX_TWIM
-
-config NRFX_TWIM136
-	bool "TWIM136 driver instance"
-	depends on $(dt_nodelabel_exists,i2c136)
-	select NRFX_TWIM
-
-config NRFX_TWIM137
-	bool "TWIM137 driver instance"
-	depends on $(dt_nodelabel_exists,i2c137)
-	select NRFX_TWIM
+	bool "NRFX driver for TWIM peripheral"
 
 config NRFX_TWIS
 	bool

modules/hal_nordic/nrfx/nrfx_kconfig.h

@@ -594,63 +594,6 @@
 #ifdef CONFIG_NRFX_TWIM_LOG
 #define NRFX_TWIM_CONFIG_LOG_ENABLED 1
 #endif
-#ifdef CONFIG_NRFX_TWIM0
-#define NRFX_TWIM0_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIM1
-#define NRFX_TWIM1_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIM2
-#define NRFX_TWIM2_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIM3
-#define NRFX_TWIM3_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIM20
-#define NRFX_TWIM20_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIM21
-#define NRFX_TWIM21_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIM22
-#define NRFX_TWIM22_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIM23
-#define NRFX_TWIM23_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIM24
-#define NRFX_TWIM24_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIM30
-#define NRFX_TWIM30_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIM120
-#define NRFX_TWIM120_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIM130
-#define NRFX_TWIM130_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIM131
-#define NRFX_TWIM131_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIM132
-#define NRFX_TWIM132_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIM133
-#define NRFX_TWIM133_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIM134
-#define NRFX_TWIM134_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIM135
-#define NRFX_TWIM135_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIM136
-#define NRFX_TWIM136_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIM137
-#define NRFX_TWIM137_ENABLED 1
-#endif
 #ifdef CONFIG_NRF52_ANOMALY_219_WORKAROUND
 #define NRF52_ERRATA_219_ENABLE_WORKAROUND 1
 #endif

soc/nordic/common/Kconfig.peripherals

@@ -336,63 +336,6 @@ config HAS_HW_NRF_TWI0
 config HAS_HW_NRF_TWI1
 	def_bool $(dt_nodelabel_enabled_with_compat,i2c1,$(DT_COMPAT_NORDIC_NRF_TWI))
 
-config HAS_HW_NRF_TWIM0
-	def_bool $(dt_nodelabel_enabled_with_compat,i2c0,$(DT_COMPAT_NORDIC_NRF_TWIM))
-
-config HAS_HW_NRF_TWIM1
-	def_bool $(dt_nodelabel_enabled_with_compat,i2c1,$(DT_COMPAT_NORDIC_NRF_TWIM))
-
-config HAS_HW_NRF_TWIM2
-	def_bool $(dt_nodelabel_enabled_with_compat,i2c2,$(DT_COMPAT_NORDIC_NRF_TWIM))
-
-config HAS_HW_NRF_TWIM3
-	def_bool $(dt_nodelabel_enabled_with_compat,i2c3,$(DT_COMPAT_NORDIC_NRF_TWIM))
-
-config HAS_HW_NRF_TWIM20
-	def_bool $(dt_nodelabel_enabled_with_compat,i2c20,$(DT_COMPAT_NORDIC_NRF_TWIM))
-
-config HAS_HW_NRF_TWIM21
-	def_bool $(dt_nodelabel_enabled_with_compat,i2c21,$(DT_COMPAT_NORDIC_NRF_TWIM))
-
-config HAS_HW_NRF_TWIM22
-	def_bool $(dt_nodelabel_enabled_with_compat,i2c22,$(DT_COMPAT_NORDIC_NRF_TWIM))
-
-config HAS_HW_NRF_TWIM23
-	def_bool $(dt_nodelabel_enabled_with_compat,i2c23,$(DT_COMPAT_NORDIC_NRF_TWIM))
-
-config HAS_HW_NRF_TWIM24
-	def_bool $(dt_nodelabel_enabled_with_compat,i2c24,$(DT_COMPAT_NORDIC_NRF_TWIM))
-
-config HAS_HW_NRF_TWIM30
-	def_bool $(dt_nodelabel_enabled_with_compat,i2c30,$(DT_COMPAT_NORDIC_NRF_TWIM))
-
-config HAS_HW_NRF_TWIM120
-	def_bool $(dt_nodelabel_enabled_with_compat,i2c120,$(DT_COMPAT_NORDIC_NRF_TWIM))
-
-config HAS_HW_NRF_TWIM130
-	def_bool $(dt_nodelabel_enabled_with_compat,i2c130,$(DT_COMPAT_NORDIC_NRF_TWIM))
-
-config HAS_HW_NRF_TWIM131
-	def_bool $(dt_nodelabel_enabled_with_compat,i2c131,$(DT_COMPAT_NORDIC_NRF_TWIM))
-
-config HAS_HW_NRF_TWIM132
-	def_bool $(dt_nodelabel_enabled_with_compat,i2c132,$(DT_COMPAT_NORDIC_NRF_TWIM))
-
-config HAS_HW_NRF_TWIM133
-	def_bool $(dt_nodelabel_enabled_with_compat,i2c133,$(DT_COMPAT_NORDIC_NRF_TWIM))
-
-config HAS_HW_NRF_TWIM134
-	def_bool $(dt_nodelabel_enabled_with_compat,i2c134,$(DT_COMPAT_NORDIC_NRF_TWIM))
-
-config HAS_HW_NRF_TWIM135
-	def_bool $(dt_nodelabel_enabled_with_compat,i2c135,$(DT_COMPAT_NORDIC_NRF_TWIM))
-
-config HAS_HW_NRF_TWIM136
-	def_bool $(dt_nodelabel_enabled_with_compat,i2c136,$(DT_COMPAT_NORDIC_NRF_TWIM))
-
-config HAS_HW_NRF_TWIM137
-	def_bool $(dt_nodelabel_enabled_with_compat,i2c137,$(DT_COMPAT_NORDIC_NRF_TWIM))
-
 config HAS_HW_NRF_TWIS0
 	def_bool $(dt_nodelabel_enabled_with_compat,i2c0,$(DT_COMPAT_NORDIC_NRF_TWIS))