[nrf fromlist] modules: hal_nordic: remove SPIM symbols

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

Upstream PR #: 96792

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

Author: mstasiaknordic

drivers/spi/Kconfig.nrfx

@@ -22,29 +22,7 @@ config SPI_NRFX_SPI
 config SPI_NRFX_SPIM
 	def_bool y
 	depends on DT_HAS_NORDIC_NRF_SPIM_ENABLED
-	select NRFX_SPIM0 if HAS_HW_NRF_SPIM0
-	select NRFX_SPIM1 if HAS_HW_NRF_SPIM1
-	select NRFX_SPIM2 if HAS_HW_NRF_SPIM2
-	select NRFX_SPIM3 if HAS_HW_NRF_SPIM3
-	select NRFX_SPIM4 if HAS_HW_NRF_SPIM4
-	select NRFX_SPIM00 if HAS_HW_NRF_SPIM00
-	select NRFX_SPIM01 if HAS_HW_NRF_SPIM01
-	select NRFX_SPIM20 if HAS_HW_NRF_SPIM20
-	select NRFX_SPIM21 if HAS_HW_NRF_SPIM21
-	select NRFX_SPIM22 if HAS_HW_NRF_SPIM22
-	select NRFX_SPIM23 if HAS_HW_NRF_SPIM23
-	select NRFX_SPIM24 if HAS_HW_NRF_SPIM24
-	select NRFX_SPIM30 if HAS_HW_NRF_SPIM30
-	select NRFX_SPIM120 if HAS_HW_NRF_SPIM120
-	select NRFX_SPIM121 if HAS_HW_NRF_SPIM121
-	select NRFX_SPIM130 if HAS_HW_NRF_SPIM130
-	select NRFX_SPIM131 if HAS_HW_NRF_SPIM131
-	select NRFX_SPIM132 if HAS_HW_NRF_SPIM132
-	select NRFX_SPIM133 if HAS_HW_NRF_SPIM133
-	select NRFX_SPIM134 if HAS_HW_NRF_SPIM134
-	select NRFX_SPIM135 if HAS_HW_NRF_SPIM135
-	select NRFX_SPIM136 if HAS_HW_NRF_SPIM136
-	select NRFX_SPIM137 if HAS_HW_NRF_SPIM137
+	select NRFX_SPIM
 
 config SPI_NRFX_SPIS
 	def_bool y

modules/hal_nordic/nrfx/Kconfig

@@ -528,121 +528,6 @@ config NRFX_SPI2
 config NRFX_SPIM
 	bool
 
-config NRFX_SPIM0
-	bool "SPIM0 driver instance"
-	depends on $(dt_nodelabel_exists,spi0) && !SOC_SERIES_NRF51X
-	select NRFX_SPIM
-
-config NRFX_SPIM1
-	bool "SPIM1 driver instance"
-	depends on $(dt_nodelabel_exists,spi1) && !SOC_SERIES_NRF51X
-	select NRFX_SPIM
-
-config NRFX_SPIM2
-	bool "SPIM2 driver instance"
-	depends on $(dt_nodelabel_exists,spi2)
-	select NRFX_SPIM
-
-config NRFX_SPIM3
-	bool "SPIM3 driver instance"
-	depends on $(dt_nodelabel_exists,spi3)
-	select NRFX_SPIM
-
-config NRFX_SPIM4
-	bool "SPIM4 driver instance"
-	depends on $(dt_nodelabel_exists,spi4)
-	select NRFX_SPIM
-
-config NRFX_SPIM00
-	bool "SPIM00 driver instance"
-	depends on $(dt_nodelabel_exists,spi00)
-	select NRFX_SPIM
-
-config NRFX_SPIM01
-	bool "SPIM01 driver instance"
-	depends on $(dt_nodelabel_exists,spi01)
-	select NRFX_SPIM
-
-config NRFX_SPIM20
-	bool "SPIM20 driver instance"
-	depends on $(dt_nodelabel_exists,spi20)
-	select NRFX_SPIM
-
-config NRFX_SPIM21
-	bool "SPIM21 driver instance"
-	depends on $(dt_nodelabel_exists,spi21)
-	select NRFX_SPIM
-
-config NRFX_SPIM22
-	bool "SPIM22 driver instance"
-	depends on $(dt_nodelabel_exists,spi22)
-	select NRFX_SPIM
-
-config NRFX_SPIM23
-	bool "SPIM23 driver instance"
-	depends on $(dt_nodelabel_exists,spi23)
-	select NRFX_SPIM
-
-config NRFX_SPIM24
-	bool "SPIM24 driver instance"
-	depends on $(dt_nodelabel_exists,spi24)
-	select NRFX_SPIM
-
-config NRFX_SPIM30
-	bool "SPIM30 driver instance"
-	depends on $(dt_nodelabel_exists,spi30)
-	select NRFX_SPIM
-
-config NRFX_SPIM120
-	bool "SPIM120 driver instance"
-	depends on $(dt_nodelabel_exists,spi120)
-	select NRFX_SPIM
-
-config NRFX_SPIM121
-	bool "SPIM121 driver instance"
-	depends on $(dt_nodelabel_exists,spi121)
-	select NRFX_SPIM
-
-config NRFX_SPIM130
-	bool "SPIM130 driver instance"
-	depends on $(dt_nodelabel_exists,spi130)
-	select NRFX_SPIM
-
-config NRFX_SPIM131
-	bool "SPIM131 driver instance"
-	depends on $(dt_nodelabel_exists,spi131)
-	select NRFX_SPIM
-
-config NRFX_SPIM132
-	bool "SPIM132 driver instance"
-	depends on $(dt_nodelabel_exists,spi132)
-	select NRFX_SPIM
-
-config NRFX_SPIM133
-	bool "SPIM133 driver instance"
-	depends on $(dt_nodelabel_exists,spi133)
-	select NRFX_SPIM
-
-config NRFX_SPIM134
-	bool "SPIM134 driver instance"
-	depends on $(dt_nodelabel_exists,spi134)
-	select NRFX_SPIM
-
-config NRFX_SPIM135
-	bool "SPIM135 driver instance"
-	depends on $(dt_nodelabel_exists,spi135)
-	select NRFX_SPIM
-
-config NRFX_SPIM136
-	bool "SPIM136 driver instance"
-	depends on $(dt_nodelabel_exists,spi136)
-	select NRFX_SPIM
-
-config NRFX_SPIM137
-	bool "SPIM137 driver instance"
-	depends on $(dt_nodelabel_exists,spi137)
-	select NRFX_SPIM
-
 config NRFX_SPIS
 	bool
 

modules/hal_nordic/nrfx/nrfx_kconfig.h

@@ -486,24 +486,9 @@
 #ifdef CONFIG_NRFX_SPIM_LOG
 #define NRFX_SPIM_CONFIG_LOG_ENABLED 1
 #endif
-#ifdef CONFIG_NRFX_SPIM0
-#define NRFX_SPIM0_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_SPIM1
-#define NRFX_SPIM1_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_SPIM2
-#define NRFX_SPIM2_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_SPIM3
-#define NRFX_SPIM3_ENABLED 1
 #ifdef CONFIG_NRF52_ANOMALY_198_WORKAROUND
 #define NRF52_ERRATA_198_ENABLE_WORKAROUND 1
 #endif
-#endif
-#ifdef CONFIG_NRFX_SPIM4
-#define NRFX_SPIM4_ENABLED 1
-#endif
 #ifdef CONFIG_NRF52_ANOMALY_58_WORKAROUND
 #define NRF52_ERRATA_58_ENABLE_WORKAROUND 1
 #endif
@@ -516,61 +501,6 @@
 #endif
 #endif
 
-#ifdef CONFIG_NRFX_SPIM00
-#define NRFX_SPIM00_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_SPIM01
-#define NRFX_SPIM01_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_SPIM20
-#define NRFX_SPIM20_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_SPIM21
-#define NRFX_SPIM21_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_SPIM22
-#define NRFX_SPIM22_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_SPIM23
-#define NRFX_SPIM23_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_SPIM24
-#define NRFX_SPIM24_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_SPIM30
-#define NRFX_SPIM30_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_SPIM120
-#define NRFX_SPIM120_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_SPIM121
-#define NRFX_SPIM121_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_SPIM130
-#define NRFX_SPIM130_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_SPIM131
-#define NRFX_SPIM131_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_SPIM132
-#define NRFX_SPIM132_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_SPIM133
-#define NRFX_SPIM133_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_SPIM134
-#define NRFX_SPIM134_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_SPIM135
-#define NRFX_SPIM135_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_SPIM136
-#define NRFX_SPIM136_ENABLED 1
-#endif
-#ifdef CONFIG_NRFX_SPIM137
-#define NRFX_SPIM137_ENABLED 1
-#endif
-
 #ifdef CONFIG_NRFX_SPIS
 #define NRFX_SPIS_ENABLED 1
 #endif

soc/nordic/common/Kconfig.peripherals

@@ -255,75 +255,6 @@ config HAS_HW_NRF_SPI1
 config HAS_HW_NRF_SPI2
 	def_bool $(dt_nodelabel_enabled_with_compat,spi2,$(DT_COMPAT_NORDIC_NRF_SPI))
 
-config HAS_HW_NRF_SPIM0
-	def_bool $(dt_nodelabel_enabled_with_compat,spi0,$(DT_COMPAT_NORDIC_NRF_SPIM))
-
-config HAS_HW_NRF_SPIM1
-	def_bool $(dt_nodelabel_enabled_with_compat,spi1,$(DT_COMPAT_NORDIC_NRF_SPIM))
-
-config HAS_HW_NRF_SPIM2
-	def_bool $(dt_nodelabel_enabled_with_compat,spi2,$(DT_COMPAT_NORDIC_NRF_SPIM))
-
-config HAS_HW_NRF_SPIM3
-	def_bool $(dt_nodelabel_enabled_with_compat,spi3,$(DT_COMPAT_NORDIC_NRF_SPIM))
-
-config HAS_HW_NRF_SPIM4
-	def_bool $(dt_nodelabel_enabled_with_compat,spi4,$(DT_COMPAT_NORDIC_NRF_SPIM))
-
-config HAS_HW_NRF_SPIM00
-	def_bool $(dt_nodelabel_enabled_with_compat,spi00,$(DT_COMPAT_NORDIC_NRF_SPIM))
-
-config HAS_HW_NRF_SPIM01
-	def_bool $(dt_nodelabel_enabled_with_compat,spi01,$(DT_COMPAT_NORDIC_NRF_SPIM))
-
-config HAS_HW_NRF_SPIM20
-	def_bool $(dt_nodelabel_enabled_with_compat,spi20,$(DT_COMPAT_NORDIC_NRF_SPIM))
-
-config HAS_HW_NRF_SPIM21
-	def_bool $(dt_nodelabel_enabled_with_compat,spi21,$(DT_COMPAT_NORDIC_NRF_SPIM))
-
-config HAS_HW_NRF_SPIM22
-	def_bool $(dt_nodelabel_enabled_with_compat,spi22,$(DT_COMPAT_NORDIC_NRF_SPIM))
-
-config HAS_HW_NRF_SPIM23
-	def_bool $(dt_nodelabel_enabled_with_compat,spi23,$(DT_COMPAT_NORDIC_NRF_SPIM))
-
-config HAS_HW_NRF_SPIM24
-	def_bool $(dt_nodelabel_enabled_with_compat,spi24,$(DT_COMPAT_NORDIC_NRF_SPIM))
-
-config HAS_HW_NRF_SPIM30
-	def_bool $(dt_nodelabel_enabled_with_compat,spi30,$(DT_COMPAT_NORDIC_NRF_SPIM))
-
-config HAS_HW_NRF_SPIM120
-	def_bool $(dt_nodelabel_enabled_with_compat,spi120,$(DT_COMPAT_NORDIC_NRF_SPIM))
-
-config HAS_HW_NRF_SPIM121
-	def_bool $(dt_nodelabel_enabled_with_compat,spi121,$(DT_COMPAT_NORDIC_NRF_SPIM))
-
-config HAS_HW_NRF_SPIM130
-	def_bool $(dt_nodelabel_enabled_with_compat,spi130,$(DT_COMPAT_NORDIC_NRF_SPIM))
-
-config HAS_HW_NRF_SPIM131
-	def_bool $(dt_nodelabel_enabled_with_compat,spi131,$(DT_COMPAT_NORDIC_NRF_SPIM))
-
-config HAS_HW_NRF_SPIM132
-	def_bool $(dt_nodelabel_enabled_with_compat,spi132,$(DT_COMPAT_NORDIC_NRF_SPIM))
-
-config HAS_HW_NRF_SPIM133
-	def_bool $(dt_nodelabel_enabled_with_compat,spi133,$(DT_COMPAT_NORDIC_NRF_SPIM))
-
-config HAS_HW_NRF_SPIM134
-	def_bool $(dt_nodelabel_enabled_with_compat,spi134,$(DT_COMPAT_NORDIC_NRF_SPIM))
-
-config HAS_HW_NRF_SPIM135
-	def_bool $(dt_nodelabel_enabled_with_compat,spi135,$(DT_COMPAT_NORDIC_NRF_SPIM))
-
-config HAS_HW_NRF_SPIM136
-	def_bool $(dt_nodelabel_enabled_with_compat,spi136,$(DT_COMPAT_NORDIC_NRF_SPIM))
-
-config HAS_HW_NRF_SPIM137
-	def_bool $(dt_nodelabel_enabled_with_compat,spi137,$(DT_COMPAT_NORDIC_NRF_SPIM))
-
 config HAS_HW_NRF_SPIS0
 	def_bool $(dt_nodelabel_enabled_with_compat,spi0,$(DT_COMPAT_NORDIC_NRF_SPIS))
 

soc/nordic/nrf52/Kconfig

@@ -104,7 +104,7 @@ config NRF52_ANOMALY_198_WORKAROUND
 	bool "Anomaly 198 workaround"
 	default y
 	depends on SOC_NRF52840
-	depends on NRFX_SPIM3
+	depends on $(dt_nodelabel_enabled_with_compat,spi3,$(DT_COMPAT_NORDIC_NRF_SPIM))
 	help
 	  This anomaly applies to IC revisions "Engineering B" up to "3", the most
 	  recent one.