@@ -112,17 +112,17 @@ static const nrf_gpio_pin_drive_t drive_modes[NRF_DRIVE_COUNT] = {
112112#define NRF_PSEL_TDM (reg , line ) ((NRF_TDM_Type *)reg)->PSEL.line
113113#endif
114114
115- #if DT_HAS_COMPAT_STATUS_OKAY (nordic_nrfe_mspi_controller ) || \
116- defined(CONFIG_MSPI_NRFE ) || \
115+ #if DT_HAS_COMPAT_STATUS_OKAY (nordic_hpf_mspi_controller ) || \
116+ defined(CONFIG_MSPI_HPF ) || \
117117 DT_ANY_COMPAT_HAS_PROP_STATUS_OKAY (nordic_nrf_vpr_coprocessor , pinctrl_0 )
118118#if defined(CONFIG_SOC_SERIES_NRF54LX )
119- #define NRF_PSEL_SDP_MSPI (psel ) \
119+ #define NRF_PSEL_HPF_MSPI (psel ) \
120120 nrf_gpio_pin_control_select(psel, NRF_GPIO_PIN_SEL_VPR);
121121#elif defined(CONFIG_SOC_SERIES_NRF54HX )
122122/* On nRF54H, pin routing is controlled by secure domain, via UICR. */
123- #define NRF_PSEL_SDP_MSPI (psel )
123+ #define NRF_PSEL_HPF_MSPI (psel )
124124#endif
125- #endif /* DT_HAS_COMPAT_STATUS_OKAY(nordic_nrfe_mspi_controller ) || ... */
125+ #endif /* DT_HAS_COMPAT_STATUS_OKAY(nordic_hpf_mspi_controller ) || ... */
126126
127127int pinctrl_configure_pins (const pinctrl_soc_pin_t * pins , uint8_t pin_cnt ,
128128 uintptr_t reg )
@@ -477,26 +477,26 @@ int pinctrl_configure_pins(const pinctrl_soc_pin_t *pins, uint8_t pin_cnt,
477477 input = NRF_GPIO_PIN_INPUT_CONNECT ;
478478 break ;
479479#endif /* defined(NRF_PSEL_TWIS) */
480- #if defined(NRF_PSEL_SDP_MSPI )
481- case NRF_FUN_SDP_MSPI_CS0 :
482- case NRF_FUN_SDP_MSPI_CS1 :
483- case NRF_FUN_SDP_MSPI_CS2 :
484- case NRF_FUN_SDP_MSPI_CS3 :
485- case NRF_FUN_SDP_MSPI_CS4 :
486- case NRF_FUN_SDP_MSPI_SCK :
487- case NRF_FUN_SDP_MSPI_DQ0 :
488- case NRF_FUN_SDP_MSPI_DQ1 :
489- case NRF_FUN_SDP_MSPI_DQ2 :
490- case NRF_FUN_SDP_MSPI_DQ3 :
491- case NRF_FUN_SDP_MSPI_DQ4 :
492- case NRF_FUN_SDP_MSPI_DQ5 :
493- case NRF_FUN_SDP_MSPI_DQ6 :
494- case NRF_FUN_SDP_MSPI_DQ7 :
495- NRF_PSEL_SDP_MSPI (psel );
480+ #if defined(NRF_PSEL_HPF_MSPI )
481+ case NRF_FUN_HPF_MSPI_CS0 :
482+ case NRF_FUN_HPF_MSPI_CS1 :
483+ case NRF_FUN_HPF_MSPI_CS2 :
484+ case NRF_FUN_HPF_MSPI_CS3 :
485+ case NRF_FUN_HPF_MSPI_CS4 :
486+ case NRF_FUN_HPF_MSPI_SCK :
487+ case NRF_FUN_HPF_MSPI_DQ0 :
488+ case NRF_FUN_HPF_MSPI_DQ1 :
489+ case NRF_FUN_HPF_MSPI_DQ2 :
490+ case NRF_FUN_HPF_MSPI_DQ3 :
491+ case NRF_FUN_HPF_MSPI_DQ4 :
492+ case NRF_FUN_HPF_MSPI_DQ5 :
493+ case NRF_FUN_HPF_MSPI_DQ6 :
494+ case NRF_FUN_HPF_MSPI_DQ7 :
495+ NRF_PSEL_HPF_MSPI (psel );
496496 dir = NRF_GPIO_PIN_DIR_OUTPUT ;
497497 input = NRF_GPIO_PIN_INPUT_CONNECT ;
498498 break ;
499- #endif /* defined(NRF_PSEL_SDP_MSPI ) */
499+ #endif /* defined(NRF_PSEL_HPF_MSPI ) */
500500 default :
501501 return - ENOTSUP ;
502502 }
0 commit comments