[nrf fromlist] drivers: spi: Support spim23 and spis24 instances

Extend SPI driver with possibility to use
- spim23, spim24,
- spis23, spis24.

Upstream PR #: 91434

Signed-off-by: Sebastian Głąb <[email protected]>

Author: nordic-segl

drivers/spi/Kconfig.nrfx

@@ -31,6 +31,8 @@ config SPI_NRFX_SPIM
 	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
@@ -55,6 +57,8 @@ config SPI_NRFX_SPIS
 	select NRFX_SPIS20 if HAS_HW_NRF_SPIS20
 	select NRFX_SPIS21 if HAS_HW_NRF_SPIS21
 	select NRFX_SPIS22 if HAS_HW_NRF_SPIS22
+	select NRFX_SPIS23 if HAS_HW_NRF_SPIS23
+	select NRFX_SPIS24 if HAS_HW_NRF_SPIS24
 	select NRFX_SPIS30 if HAS_HW_NRF_SPIS30
 	select NRFX_SPIS120 if HAS_HW_NRF_SPIS120
 	select NRFX_SPIS130 if HAS_HW_NRF_SPIS130

modules/hal_nordic/nrfx/Kconfig

@@ -538,6 +538,16 @@ config NRFX_SPIM22
 	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)
@@ -636,6 +646,16 @@ config NRFX_SPIS22
 	depends on $(dt_nodelabel_exists,spi22)
 	select NRFX_SPIS
 
+config NRFX_SPIS23
+	bool "SPIS23 driver instance"
+	depends on $(dt_nodelabel_exists,spi23)
+	select NRFX_SPIS
+
+config NRFX_SPIS24
+	bool "SPIS24 driver instance"
+	depends on $(dt_nodelabel_exists,spi24)
+	select NRFX_SPIS
+
 config NRFX_SPIS30
 	bool "SPIS30 driver instance"
 	depends on $(dt_nodelabel_exists,spi30)

modules/hal_nordic/nrfx/nrfx_kconfig.h

@@ -512,6 +512,12 @@
 #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
@@ -576,6 +582,12 @@
 #ifdef CONFIG_NRFX_SPIS22
 #define NRFX_SPIS22_ENABLED 1
 #endif
+#ifdef CONFIG_NRFX_SPIS23
+#define NRFX_SPIS23_ENABLED 1
+#endif
+#ifdef CONFIG_NRFX_SPIS24
+#define NRFX_SPIS24_ENABLED 1
+#endif
 #ifdef CONFIG_NRFX_SPIS30
 #define NRFX_SPIS30_ENABLED 1
 #endif

soc/nordic/common/Kconfig.peripherals

@@ -281,6 +281,12 @@ config HAS_HW_NRF_SPIM21
 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))
 
@@ -338,6 +344,12 @@ config HAS_HW_NRF_SPIS21
 config HAS_HW_NRF_SPIS22
 	def_bool $(dt_nodelabel_enabled_with_compat,spi22,$(DT_COMPAT_NORDIC_NRF_SPIS))
 
+config HAS_HW_NRF_SPIS23
+	def_bool $(dt_nodelabel_enabled_with_compat,spi23,$(DT_COMPAT_NORDIC_NRF_SPIS))
+
+config HAS_HW_NRF_SPIS24
+	def_bool $(dt_nodelabel_enabled_with_compat,spi24,$(DT_COMPAT_NORDIC_NRF_SPIS))
+
 config HAS_HW_NRF_SPIS30
 	def_bool $(dt_nodelabel_enabled_with_compat,spi30,$(DT_COMPAT_NORDIC_NRF_SPIS))
 

soc/nordic/validate_base_addresses.c

@@ -266,6 +266,8 @@ CHECK_DT_REG(spi00, NRF_SPIM00);
 CHECK_DT_REG(spi20, NRF_SPIM20);
 CHECK_DT_REG(spi21, NRF_SPIM21);
 CHECK_DT_REG(spi22, NRF_SPIM22);
+CHECK_DT_REG(spi23, NRF_SPIM23);
+CHECK_DT_REG(spi24, NRF_SPIM24);
 CHECK_DT_REG(spi30, NRF_SPIM30);
 CHECK_DT_REG(spi120, NRF_SPIM120);
 CHECK_DT_REG(spi121, NRF_SPIM121);
@@ -319,6 +321,8 @@ CHECK_DT_REG(uart00, NRF_UARTE00);
 CHECK_DT_REG(uart20, NRF_UARTE20);
 CHECK_DT_REG(uart21, NRF_UARTE21);
 CHECK_DT_REG(uart22, NRF_UARTE22);
+CHECK_DT_REG(uart23, NRF_UARTE23);
+CHECK_DT_REG(uart24, NRF_UARTE24);
 CHECK_DT_REG(uart30, NRF_UARTE30);
 CHECK_DT_REG(uart120, NRF_UARTE120);
 CHECK_DT_REG(uart130, NRF_UARTE130);