diff --git a/boards/arm/nucleo_f103rb/nucleo_f103rb.dts b/boards/arm/nucleo_f103rb/nucleo_f103rb.dts
index b8789466d5cc3..60395d1cb8ed6 100644
--- a/boards/arm/nucleo_f103rb/nucleo_f103rb.dts
+++ b/boards/arm/nucleo_f103rb/nucleo_f103rb.dts
@@ -60,7 +60,7 @@
 };
 
 arduino_spi: &spi1 {
-      status = "okay";
+	status = "okay";
 };
 
 &spi2 {
diff --git a/boards/arm/nucleo_f411re/nucleo_f411re_defconfig b/boards/arm/nucleo_f411re/nucleo_f411re_defconfig
index 9f3f9c15050a4..6cad99533cde7 100644
--- a/boards/arm/nucleo_f411re/nucleo_f411re_defconfig
+++ b/boards/arm/nucleo_f411re/nucleo_f411re_defconfig
@@ -17,9 +17,6 @@ CONFIG_SERIAL=y
 CONFIG_CONSOLE=y
 CONFIG_UART_CONSOLE=y
 
-# enable I2C
-CONFIG_I2C=y
-
 # enable pinmux
 CONFIG_PINMUX=y
 
@@ -38,7 +35,7 @@ CONFIG_CLOCK_STM32_PLL_SRC_HSE=y
 # the 8MHz clock signal coming from integrated STLink
 CONFIG_CLOCK_STM32_HSE_BYPASS=y
 
-# produce 84MHz clock at PLL output
+# produce 96MHz clock at PLL output
 CONFIG_CLOCK_STM32_PLL_M_DIVISOR=8
 CONFIG_CLOCK_STM32_PLL_N_MULTIPLIER=384
 CONFIG_CLOCK_STM32_PLL_P_DIVISOR=4
@@ -47,4 +44,4 @@ CONFIG_CLOCK_STM32_AHB_PRESCALER=1
 
 # APB1 clock must not exceed 50MHz limit
 CONFIG_CLOCK_STM32_APB1_PRESCALER=2
-CONFIG_CLOCK_STM32_APB2_PRESCALER=1
\ No newline at end of file
+CONFIG_CLOCK_STM32_APB2_PRESCALER=1
diff --git a/boards/arm/nucleo_wb55rg/pinmux.c b/boards/arm/nucleo_wb55rg/pinmux.c
index cb79952f972f8..c5b0a2e51ff5b 100644
--- a/boards/arm/nucleo_wb55rg/pinmux.c
+++ b/boards/arm/nucleo_wb55rg/pinmux.c
@@ -31,7 +31,9 @@ static const struct pin_config pinconf[] = {
 	{STM32_PIN_PC1, STM32WBX_PINMUX_FUNC_PC1_I2C3_SDA},
 #endif /* CONFIG_I2C_3 */
 #ifdef CONFIG_SPI_1
+#ifdef CONFIG_SPI_STM32_USE_HW_SS
 	{STM32_PIN_PA4, STM32WBX_PINMUX_FUNC_PA4_SPI1_NSS},
+#endif /* CONFIG_SPI_STM32_USE_HW_SS */
 	{STM32_PIN_PA5, STM32WBX_PINMUX_FUNC_PA5_SPI1_SCK},
 	{STM32_PIN_PA6, STM32WBX_PINMUX_FUNC_PA6_SPI1_MISO},
 	{STM32_PIN_PA7, STM32WBX_PINMUX_FUNC_PA7_SPI1_MOSI},
diff --git a/boards/arm/stm32h747i_disco/pinmux.c b/boards/arm/stm32h747i_disco/pinmux.c
index 1b4408446c322..fab734645a16e 100644
--- a/boards/arm/stm32h747i_disco/pinmux.c
+++ b/boards/arm/stm32h747i_disco/pinmux.c
@@ -7,7 +7,7 @@
 #include <kernel.h>
 #include <device.h>
 #include <init.h>
-#include <pinmux.h>
+#include <drivers/pinmux.h>
 #include <sys_io.h>
 
 #include <pinmux/stm32/pinmux_stm32.h>
diff --git a/boards/arm/stm32h747i_disco/stm32h747i_disco.dtsi b/boards/arm/stm32h747i_disco/stm32h747i_disco.dtsi
index 89e87c45611ef..d2ce60439b84b 100644
--- a/boards/arm/stm32h747i_disco/stm32h747i_disco.dtsi
+++ b/boards/arm/stm32h747i_disco/stm32h747i_disco.dtsi
@@ -54,6 +54,7 @@
 		joy_left: joystick_left {
 			label = "joystick left";
 			gpios = <&gpiok 4 GPIO_INT_ACTIVE_LOW>;
+			status = "disabled";
 		};
 		joy_right: joystick_right {
 			label = "joystick right";
diff --git a/boards/arm/stm32h747i_disco/stm32h747i_disco_m4.yaml b/boards/arm/stm32h747i_disco/stm32h747i_disco_m4.yaml
index b457f646329d4..3a0248ca21b5e 100644
--- a/boards/arm/stm32h747i_disco/stm32h747i_disco_m4.yaml
+++ b/boards/arm/stm32h747i_disco/stm32h747i_disco_m4.yaml
@@ -14,3 +14,4 @@ testing:
   ignore_tags:
     - mpu
     - nfc
+    - net