[nrf noup] drivers: pinctrl_nrf: Extend handling of SDP MSPI pins

nrf-squash! [nrf noup] drivers: pinctrl: Add SDP MSPI pin configuration

Make it possible to use SDP_MSPI_* functions also in pinctrl nodes
assigned to VPR cores and also for nRF54H SoCs.

Signed-off-by: Andrzej Głąbek <[email protected]>

Author: anangl

drivers/pinctrl/pinctrl_nrf.c

@@ -112,12 +112,17 @@ static const nrf_gpio_pin_drive_t drive_modes[NRF_DRIVE_COUNT] = {
 #define NRF_PSEL_TDM(reg, line) ((NRF_TDM_Type *)reg)->PSEL.line
 #endif
 
-#if defined(CONFIG_SOC_NRF54L15_CPUAPP)
-#if DT_HAS_COMPAT_STATUS_OKAY(nordic_nrfe_mspi_controller) || defined(CONFIG_MSPI_NRFE)
-#define NRF_PSEL_SDP_MSPI(psel)                                                                    \
+#if DT_HAS_COMPAT_STATUS_OKAY(nordic_nrfe_mspi_controller) || \
+	defined(CONFIG_MSPI_NRFE) || \
+	DT_ANY_COMPAT_HAS_PROP_STATUS_OKAY(nordic_nrf_vpr_coprocessor, pinctrl_0)
+#if defined(CONFIG_SOC_SERIES_NRF54LX)
+#define NRF_PSEL_SDP_MSPI(psel) \
 	nrf_gpio_pin_control_select(psel, NRF_GPIO_PIN_SEL_VPR);
+#elif defined(CONFIG_SOC_SERIES_NRF54HX)
+/* On nRF54H, pin routing is controlled by secure domain, via UICR. */
+#define NRF_PSEL_SDP_MSPI(psel)
 #endif
-#endif
+#endif /* DT_HAS_COMPAT_STATUS_OKAY(nordic_nrfe_mspi_controller) || ... */
 
 int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt,
 			   uintptr_t reg)
@@ -472,8 +477,7 @@ int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt,
 			input = NRF_GPIO_PIN_INPUT_CONNECT;
 			break;
 #endif /* defined(NRF_PSEL_TWIS) */
-#if defined(CONFIG_SOC_NRF54L15_CPUAPP)
-#if DT_HAS_COMPAT_STATUS_OKAY(nordic_nrfe_mspi_controller)
+#if defined(NRF_PSEL_SDP_MSPI)
 		case NRF_FUN_SDP_MSPI_CS0:
 		case NRF_FUN_SDP_MSPI_CS1:
 		case NRF_FUN_SDP_MSPI_CS2:
@@ -492,8 +496,7 @@ int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt,
 			dir = NRF_GPIO_PIN_DIR_OUTPUT;
 			input = NRF_GPIO_PIN_INPUT_CONNECT;
 			break;
-#endif /* DT_HAS_COMPAT_STATUS_OKAY(nordic_nrfe_mspi_controller) */
-#endif /* CONFIG_SOC_NRF54L15_CPUAPP */
+#endif /* defined(NRF_PSEL_SDP_MSPI) */
 		default:
 			return -ENOTSUP;
 		}