diff --git a/platforms/nuttx/src/px4/nxp/imxrt/include/px4_arch/spi_hw_description.h b/platforms/nuttx/src/px4/nxp/imxrt/include/px4_arch/spi_hw_description.h
index edfd53de13..149649e8c1 100644
--- a/platforms/nuttx/src/px4/nxp/imxrt/include/px4_arch/spi_hw_description.h
+++ b/platforms/nuttx/src/px4/nxp/imxrt/include/px4_arch/spi_hw_description.h
@@ -68,7 +68,7 @@ static inline constexpr px4_spi_bus_t initSPIBus(SPI::Bus bus, const px4_spi_bus
 		GPIO::GPIOPin power_enable = {})
 {
 	px4_spi_bus_t ret{};
-	ret.requires_locking = true; // TODO: set this to false once all drivers are converted to use the I2CSPIDriver class
+	ret.requires_locking = false;
 
 	for (int i = 0; i < SPI_BUS_MAX_DEVICES; ++i) {
 		ret.devices[i] = devices.devices[i];
@@ -118,8 +118,7 @@ static inline constexpr px4_spi_bus_t initSPIBusExternal(SPI::Bus bus, const bus
 
 	ret.bus = (int)bus;
 	ret.is_external = true;
-	// TODO: set requires_locking to false once all drivers are converted to use the I2CSPIDriver class
-	ret.requires_locking = true; // external buses are never accessed by NuttX drivers
+	ret.requires_locking = false; // external buses are never accessed by NuttX drivers
 	return ret;
 }
 
diff --git a/platforms/nuttx/src/px4/nxp/kinetis/include/px4_arch/spi_hw_description.h b/platforms/nuttx/src/px4/nxp/kinetis/include/px4_arch/spi_hw_description.h
index a6ca0717b2..681b9d898f 100644
--- a/platforms/nuttx/src/px4/nxp/kinetis/include/px4_arch/spi_hw_description.h
+++ b/platforms/nuttx/src/px4/nxp/kinetis/include/px4_arch/spi_hw_description.h
@@ -62,7 +62,7 @@ static inline constexpr px4_spi_bus_t initSPIBus(SPI::Bus bus, const px4_spi_bus
 		GPIO::GPIOPin power_enable = {})
 {
 	px4_spi_bus_t ret{};
-	ret.requires_locking = true; // TODO: set this to false once all drivers are converted to use the I2CSPIDriver class
+	ret.requires_locking = false;
 
 	for (int i = 0; i < SPI_BUS_MAX_DEVICES; ++i) {
 		ret.devices[i] = devices.devices[i];
@@ -112,8 +112,7 @@ static inline constexpr px4_spi_bus_t initSPIBusExternal(SPI::Bus bus, const bus
 
 	ret.bus = (int)bus;
 	ret.is_external = true;
-	// TODO: set requires_locking to false once all drivers are converted to use the I2CSPIDriver class
-	ret.requires_locking = true; // external buses are never accessed by NuttX drivers
+	ret.requires_locking = false; // external buses are never accessed by NuttX drivers
 	return ret;
 }
 
diff --git a/platforms/nuttx/src/px4/stm/stm32_common/include/px4_arch/spi_hw_description.h b/platforms/nuttx/src/px4/stm/stm32_common/include/px4_arch/spi_hw_description.h
index 0d48062894..1a3eb8a446 100644
--- a/platforms/nuttx/src/px4/stm/stm32_common/include/px4_arch/spi_hw_description.h
+++ b/platforms/nuttx/src/px4/stm/stm32_common/include/px4_arch/spi_hw_description.h
@@ -64,7 +64,7 @@ static inline constexpr px4_spi_bus_t initSPIBus(SPI::Bus bus, const px4_spi_bus
 		GPIO::GPIOPin power_enable = {})
 {
 	px4_spi_bus_t ret{};
-	ret.requires_locking = true; // TODO: set this to false once all drivers are converted to use the I2CSPIDriver class
+	ret.requires_locking = false;
 
 	for (int i = 0; i < SPI_BUS_MAX_DEVICES; ++i) {
 		ret.devices[i] = devices.devices[i];
@@ -114,8 +114,7 @@ static inline constexpr px4_spi_bus_t initSPIBusExternal(SPI::Bus bus, const bus
 
 	ret.bus = (int)bus;
 	ret.is_external = true;
-	// TODO: set requires_locking to false once all drivers are converted to use the I2CSPIDriver class
-	ret.requires_locking = true; // external buses are never accessed by NuttX drivers
+	ret.requires_locking = false; // external buses are never accessed by NuttX drivers
 	return ret;
 }