upmerge: updates related to Zephyr upmerge

- nrf_security: update mbedtls heap to const struct device

  Zephyr upmerge introduces device bindings const struct as part of:
  zephyrproject-rtos/zephyr#24873

  This const'ify mbedtls_heap.c init function.

- mpls: Added `select MULTITHREADING_LOCK` to Kconfig

  With the changes related to:
  nrfconnect/sdk-nrf#2861
  zephyrproject-rtos/zephyr#27398

  The mpsl clock control is no longer needed, but mpsl still requires
  MULTITHREADING_LOCK, and is therefore moved to its right location.

- softdevice_controller: Mark 2M and Coded PHY as supported

  These helper configs were introduced in upstream zephyr.

Signed-off-by: Torsten Rasmussen <[email protected]>
Signed-off-by: Rubin Gerritsen <[email protected]>

Author: tejlmand

mpsl/Kconfig

@@ -10,6 +10,7 @@ config MPSL
 	select ZERO_LATENCY_IRQS
 	select IEEE802154_NRF5_EXT_IRQ_MGMT if IEEE802154_NRF5
 	select NRF_802154_MULTIPROTOCOL_SUPPORT if NRF_802154_RADIO_DRIVER
+	select MULTITHREADING_LOCK
 	depends on (SOC_SERIES_NRF52X || SOC_SERIES_NRF53X)
 	help
 	  Use Nordic Multi Protocol Service Layer (MPSL) implementation,

nrf_security/src/mbedtls/mbedtls_heap.c

@@ -37,7 +37,7 @@ void _heap_free(void)
 	mbedtls_memory_buffer_alloc_free();
 }
 
-static int mbedtls_heap_init(struct device *dev)
+static int mbedtls_heap_init(const struct device *dev)
 {
 	ARG_UNUSED(dev);
 

softdevice_controller/Kconfig

@@ -39,6 +39,7 @@ config BT_LL_SOFTDEVICE
 	select BT_CTLR_PHY_UPDATE_SUPPORT
 	select BT_CTLR_CHAN_SEL_2_SUPPORT
 	select BT_CTLR_CONN_RSSI_SUPPORT
+	select BT_CTLR_PHY_2M_SUPPORT
 	select BT_HAS_HCI_VS
 	# The SoftDevice Controller only supports nRF52 and nRF53, it does not support nRF51
 	# or nRF91 (nRF91 doesn't even have the physical HW needed for BLE).
@@ -75,6 +76,7 @@ config SOFTDEVICE_CONTROLLER_S140
 	depends on (SOC_NRF52811 || SOC_NRF52820 || SOC_NRF52840 || SOC_NRF52833 || SOC_SERIES_NRF53X)
 	select BT_CTLR_DATA_LEN_UPDATE_SUPPORT
 	select BT_CTLR_ADV_EXT_SUPPORT
+	select BT_CTLR_PHY_CODED_SUPPORT
 	bool "s140"
 
 endchoice