diff --git a/ports/stm32/octospi.c b/ports/stm32/octospi.c
index 6c60aa604f..8e164329b1 100644
--- a/ports/stm32/octospi.c
+++ b/ports/stm32/octospi.c
@@ -46,9 +46,9 @@
 void octospi_init(void) {
     // Configure OCTOSPI pins (allows 1, 2, 4 or 8 line configuration).
     #if defined(STM32H7)
-    #define STATIC_AF_OCTOSPI(signal) STATIC_AF_OCTOSPIM_P1_ ## signal
+    #define STATIC_AF_OCTOSPI(signal) STATIC_AF_OCTOSPIM_P1_##signal
     #else
-    #define STATIC_AF_OCTOSPI(signal) STATIC_AF_OCTOSPI1_ ## signal
+    #define STATIC_AF_OCTOSPI(signal) STATIC_AF_OCTOSPI1_##signal
     #endif
     mp_hal_pin_config_alt_static_speed(MICROPY_HW_OSPIFLASH_CS, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, MP_HAL_PIN_SPEED_VERY_HIGH, STATIC_AF_OCTOSPI(NCS));
     mp_hal_pin_config_alt_static_speed(MICROPY_HW_OSPIFLASH_SCK, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, MP_HAL_PIN_SPEED_VERY_HIGH, STATIC_AF_OCTOSPI(CLK));
diff --git a/ports/stm32/system_stm32.c b/ports/stm32/system_stm32.c
index 2cff36c3a6..b76a41e97b 100644
--- a/ports/stm32/system_stm32.c
+++ b/ports/stm32/system_stm32.c
@@ -461,6 +461,11 @@ MP_WEAK void SystemClock_Config(void) {
     PeriphClkInitStruct.QspiClockSelection = MICROPY_HW_RCC_QSPI_CLKSOURCE;
     #endif
 
+    #if defined(MICROPY_HW_RCC_OSPI_CLKSOURCE)
+    PeriphClkInitStruct.PeriphClockSelection |= RCC_PERIPHCLK_OSPI;
+    PeriphClkInitStruct.OspiClockSelection = MICROPY_HW_RCC_OSPI_CLKSOURCE;
+    #endif
+
     #if defined(MICROPY_HW_RCC_SPI123_CLKSOURCE)
     PeriphClkInitStruct.PeriphClockSelection |= RCC_PERIPHCLK_SPI123;
     PeriphClkInitStruct.Spi123ClockSelection = MICROPY_HW_RCC_SPI123_CLKSOURCE;