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

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

Upstream PR #: 98569

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

Author: adamkondraciuk

drivers/i2c/Kconfig.nrfx

@@ -38,23 +38,7 @@ config I2C_NRFX_TWIS
 	depends on DT_HAS_NORDIC_NRF_TWIS_ENABLED
 	depends on I2C_TARGET
 	depends on I2C_TARGET_BUFFER_MODE
-	select NRFX_TWIS0 if HAS_HW_NRF_TWIS0
-	select NRFX_TWIS1 if HAS_HW_NRF_TWIS1
-	select NRFX_TWIS2 if HAS_HW_NRF_TWIS2
-	select NRFX_TWIS3 if HAS_HW_NRF_TWIS3
-	select NRFX_TWIS20 if HAS_HW_NRF_TWIS20
-	select NRFX_TWIS21 if HAS_HW_NRF_TWIS21
-	select NRFX_TWIS22 if HAS_HW_NRF_TWIS22
-	select NRFX_TWIS23 if HAS_HW_NRF_TWIS23
-	select NRFX_TWIS24 if HAS_HW_NRF_TWIS24
-	select NRFX_TWIS30 if HAS_HW_NRF_TWIS30
-	select NRFX_TWIS130 if HAS_HW_NRF_TWIS130
-	select NRFX_TWIS131 if HAS_HW_NRF_TWIS131
-	select NRFX_TWIS133 if HAS_HW_NRF_TWIS133
-	select NRFX_TWIS134 if HAS_HW_NRF_TWIS134
-	select NRFX_TWIS135 if HAS_HW_NRF_TWIS135
-	select NRFX_TWIS136 if HAS_HW_NRF_TWIS136
-	select NRFX_TWIS137 if HAS_HW_NRF_TWIS137
+	select NRFX_TWIS
 
 if I2C_NRFX_TWIS
 

modules/hal_nordic/nrfx/Kconfig

@@ -663,97 +663,7 @@ config NRFX_TWIM
 	bool "NRFX driver for TWIM peripheral"
 
 config NRFX_TWIS
-	bool
-
-config NRFX_TWIS0
-	bool "TWIS0 driver instance"
-	depends on $(dt_nodelabel_exists,i2c0) && !SOC_SERIES_NRF51X
-	select NRFX_TWIS
-
-config NRFX_TWIS1
-	bool "TWIS1 driver instance"
-	depends on $(dt_nodelabel_exists,i2c1) && !SOC_SERIES_NRF51X
-	select NRFX_TWIS
-
-config NRFX_TWIS2
-	bool "TWIS2 driver instance"
-	depends on $(dt_nodelabel_exists,i2c2)
-	select NRFX_TWIS
-
-config NRFX_TWIS3
-	bool "TWIS3 driver instance"
-	depends on $(dt_nodelabel_exists,i2c3)
-	select NRFX_TWIS
-
-config NRFX_TWIS20
-	bool "TWIS20 driver instance"
-	depends on $(dt_nodelabel_exists,i2c20)
-	select NRFX_TWIS
-
-config NRFX_TWIS21
-	bool "TWIS21 driver instance"
-	depends on $(dt_nodelabel_exists,i2c21)
-	select NRFX_TWIS
-
-config NRFX_TWIS22
-	bool "TWIS22 driver instance"
-	depends on $(dt_nodelabel_exists,i2c22)
-	select NRFX_TWIS
-
-config NRFX_TWIS23
-	bool "TWIS23 driver instance"
-	depends on $(dt_nodelabel_exists,i2c23)
-	select NRFX_TWIS
-
-config NRFX_TWIS24
-	bool "TWIS24 driver instance"
-	depends on $(dt_nodelabel_exists,i2c24)
-	select NRFX_TWIS
-
-config NRFX_TWIS30
-	bool "TWIS30 driver instance"
-	depends on $(dt_nodelabel_exists,i2c30)
-	select NRFX_TWIS
-
-config NRFX_TWIS130
-	bool "TWIS130 driver instance"
-	depends on $(dt_nodelabel_exists,i2c130)
-	select NRFX_TWIS
-
-config NRFX_TWIS131
-	bool "TWIS131 driver instance"
-	depends on $(dt_nodelabel_exists,i2c131)
-	select NRFX_TWIS
-
-config NRFX_TWIS132
-	bool "TWIS132 driver instance"
-	depends on $(dt_nodelabel_exists,i2c132)
-	select NRFX_TWIS
-
-config NRFX_TWIS133
-	bool "TWIS133 driver instance"
-	depends on $(dt_nodelabel_exists,i2c133)
-	select NRFX_TWIS
-
-config NRFX_TWIS134
-	bool "TWIS134 driver instance"
-	depends on $(dt_nodelabel_exists,i2c134)
-	select NRFX_TWIS
-
-config NRFX_TWIS135
-	bool "TWIS135 driver instance"
-	depends on $(dt_nodelabel_exists,i2c135)
-	select NRFX_TWIS
-
-config NRFX_TWIS136
-	bool "TWIS136 driver instance"
-	depends on $(dt_nodelabel_exists,i2c136)
-	select NRFX_TWIS
-
-config NRFX_TWIS137
-	bool "TWIS137 driver instance"
-	depends on $(dt_nodelabel_exists,i2c137)
-	select NRFX_TWIS
+	bool "NRFX driver for TWIS peripheral"
 
 config NRFX_UART
 	bool

modules/hal_nordic/nrfx/nrfx_kconfig.h

@@ -625,60 +625,6 @@
 #ifdef CONFIG_NRFX_TWIS_LOG
 #define NRFX_TWIS_CONFIG_LOG_ENABLED 1
 #endif
-#ifdef CONFIG_NRFX_TWIS0
-#define NRFX_TWIS0_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIS1
-#define NRFX_TWIS1_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIS2
-#define NRFX_TWIS2_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIS3
-#define NRFX_TWIS3_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIS20
-#define NRFX_TWIS20_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIS21
-#define NRFX_TWIS21_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIS22
-#define NRFX_TWIS22_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIS23
-#define NRFX_TWIS23_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIS24
-#define NRFX_TWIS24_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIS30
-#define NRFX_TWIS30_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIS130
-#define NRFX_TWIS130_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIS131
-#define NRFX_TWIS131_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIS132
-#define NRFX_TWIS132_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIS133
-#define NRFX_TWIS133_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIS134
-#define NRFX_TWIS134_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIS135
-#define NRFX_TWIS135_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIS136
-#define NRFX_TWIS136_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_TWIS137
-#define NRFX_TWIS137_ENABLED 1
-#endif
 
 #ifdef CONFIG_NRFX_UART
 #define NRFX_UART_ENABLED 1

soc/nordic/common/Kconfig.peripherals

@@ -354,60 +354,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_TWIS0
-	def_bool $(dt_nodelabel_enabled_with_compat,i2c0,$(DT_COMPAT_NORDIC_NRF_TWIS))
-
-config HAS_HW_NRF_TWIS1
-	def_bool $(dt_nodelabel_enabled_with_compat,i2c1,$(DT_COMPAT_NORDIC_NRF_TWIS))
-
-config HAS_HW_NRF_TWIS2
-	def_bool $(dt_nodelabel_enabled_with_compat,i2c2,$(DT_COMPAT_NORDIC_NRF_TWIS))
-
-config HAS_HW_NRF_TWIS3
-	def_bool $(dt_nodelabel_enabled_with_compat,i2c3,$(DT_COMPAT_NORDIC_NRF_TWIS))
-
-config HAS_HW_NRF_TWIS20
-	def_bool $(dt_nodelabel_enabled_with_compat,i2c20,$(DT_COMPAT_NORDIC_NRF_TWIS))
-
-config HAS_HW_NRF_TWIS21
-	def_bool $(dt_nodelabel_enabled_with_compat,i2c21,$(DT_COMPAT_NORDIC_NRF_TWIS))
-
-config HAS_HW_NRF_TWIS22
-	def_bool $(dt_nodelabel_enabled_with_compat,i2c22,$(DT_COMPAT_NORDIC_NRF_TWIS))
-
-config HAS_HW_NRF_TWIS23
-	def_bool $(dt_nodelabel_enabled_with_compat,i2c23,$(DT_COMPAT_NORDIC_NRF_TWIS))
-
-config HAS_HW_NRF_TWIS24
-	def_bool $(dt_nodelabel_enabled_with_compat,i2c24,$(DT_COMPAT_NORDIC_NRF_TWIS))
-
-config HAS_HW_NRF_TWIS30
-	def_bool $(dt_nodelabel_enabled_with_compat,i2c30,$(DT_COMPAT_NORDIC_NRF_TWIS))
-
-config HAS_HW_NRF_TWIS130
-	def_bool $(dt_nodelabel_enabled_with_compat,i2c130,$(DT_COMPAT_NORDIC_NRF_TWIS))
-
-config HAS_HW_NRF_TWIS131
-	def_bool $(dt_nodelabel_enabled_with_compat,i2c131,$(DT_COMPAT_NORDIC_NRF_TWIS))
-
-config HAS_HW_NRF_TWIS132
-	def_bool $(dt_nodelabel_enabled_with_compat,i2c132,$(DT_COMPAT_NORDIC_NRF_TWIS))
-
-config HAS_HW_NRF_TWIS133
-	def_bool $(dt_nodelabel_enabled_with_compat,i2c133,$(DT_COMPAT_NORDIC_NRF_TWIS))
-
-config HAS_HW_NRF_TWIS134
-	def_bool $(dt_nodelabel_enabled_with_compat,i2c134,$(DT_COMPAT_NORDIC_NRF_TWIS))
-
-config HAS_HW_NRF_TWIS135
-	def_bool $(dt_nodelabel_enabled_with_compat,i2c135,$(DT_COMPAT_NORDIC_NRF_TWIS))
-
-config HAS_HW_NRF_TWIS136
-	def_bool $(dt_nodelabel_enabled_with_compat,i2c136,$(DT_COMPAT_NORDIC_NRF_TWIS))
-
-config HAS_HW_NRF_TWIS137
-	def_bool $(dt_nodelabel_enabled_with_compat,i2c137,$(DT_COMPAT_NORDIC_NRF_TWIS))
-
 config HAS_HW_NRF_UART0
 	def_bool $(dt_nodelabel_enabled_with_compat,uart0,$(DT_COMPAT_NORDIC_NRF_UART))