diff --git a/CODEOWNERS b/CODEOWNERS index 3b27b99208a3..ea10c2301916 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -789,7 +789,6 @@ /subsys/event_manager_proxy/ @nrfconnect/ncs-si-muffin /subsys/fw_info/ @nrfconnect/ncs-pluto /subsys/gazell/ @leewkb4567 -/subsys/ieee802154/ @nrfconnect/ncs-co-networking @nrfconnect/ncs-radio-sw /subsys/logging/ @nrfconnect/ncs-protocols-serialization /subsys/mgmt/ @nrfconnect/ncs-pluto /subsys/mgmt/suitfu/ @nrfconnect/ncs-charon diff --git a/modules/openthread/Kconfig b/modules/openthread/Kconfig index 3297a346a8f0..5820fa426c85 100644 --- a/modules/openthread/Kconfig +++ b/modules/openthread/Kconfig @@ -13,7 +13,6 @@ config OPENTHREAD select ENTROPY_GENERATOR select NRF_802154_RADIO_DRIVER if HAS_HW_NRF_RADIO_IEEE802154 && !NET_L2_OPENTHREAD select NRF_802154_SER_HOST if !HAS_HW_NRF_RADIO_IEEE802154 && !NET_L2_OPENTHREAD - select NRF_802154_RADIO_CONFIG if !NET_L2_OPENTHREAD help This option enables the OpenThread library diff --git a/subsys/CMakeLists.txt b/subsys/CMakeLists.txt index 519f210483d6..c60d818bf245 100644 --- a/subsys/CMakeLists.txt +++ b/subsys/CMakeLists.txt @@ -55,7 +55,6 @@ add_subdirectory(debug) add_subdirectory_ifdef(CONFIG_PARTITION_MANAGER_ENABLED partition_manager) add_subdirectory_ifdef(CONFIG_NRF_RPC nrf_rpc) -add_subdirectory_ifdef(CONFIG_NRF_802154_RADIO_DRIVER ieee802154) add_subdirectory_ifdef(CONFIG_NRF_DM dm) add_subdirectory_ifdef(CONFIG_EMDS emds) add_subdirectory_ifdef(CONFIG_NET_CORE_MONITOR net_core_monitor) diff --git a/subsys/Kconfig b/subsys/Kconfig index 50bc6300cf9b..feef88b6e354 100644 --- a/subsys/Kconfig +++ b/subsys/Kconfig @@ -29,7 +29,6 @@ rsource "mgmt/fmfu/Kconfig" rsource "mgmt/suitfu/Kconfig" rsource "mgmt/mcumgr/Kconfig" rsource "caf/Kconfig" -rsource "ieee802154/Kconfig" rsource "dm/Kconfig" rsource "nrf_security/Kconfig" rsource "net_core_monitor/Kconfig" diff --git a/subsys/ieee802154/CMakeLists.txt b/subsys/ieee802154/CMakeLists.txt deleted file mode 100644 index bba90041ce8a..000000000000 --- a/subsys/ieee802154/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -# -# Copyright (c) 2021 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -if(CONFIG_NRF_802154_RADIO_CONFIG) - zephyr_library() - - zephyr_library_sources( - nrf_802154_configurator.c - ) -endif() diff --git a/subsys/ieee802154/Kconfig b/subsys/ieee802154/Kconfig deleted file mode 100644 index c4db714b4999..000000000000 --- a/subsys/ieee802154/Kconfig +++ /dev/null @@ -1,36 +0,0 @@ -# -# Copyright (c) 2021 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -menu "Nordic IEEE 802.15.4" - -config NRF_802154_RADIO_CONFIG - bool "nRF52 IEEE 802.15.4 configurator" - default NRF_802154_SER_RADIO || IEEE802154_NRF5 - depends on NRF_802154_RADIO_DRIVER - help - Enable the nRF IEEE 802.15.4 configurator module. - -config NRF_802154_RADIO_CONFIG_PRIO - int "nRF52 IEEE 802.15.4 configuration priority" - default 91 - depends on NRF_802154_RADIO_CONFIG - help - Set the nRF IEEE 802.15.4 configuration priority number. Must be - greater than nRF IEEE 802.15.4 Radio initialization priority. - -config NRF_802154_ACK_TIMEOUT_CUSTOM_US - int "nRF IEEE 802.15.4 ACK timeout" - default 0 - range 0 2000 - depends on NRF_802154_RADIO_CONFIG - help - Set the custom value of ACK timeout in the nRF IEEE 802.15.4 radio driver module. - It is not recommended to change this setting for anything but testing purposes. - Setting this value too low will cause the radio driver to never receive ACK frames - and setting it too high will increase current consumption. Set this value to 0 to - use the default and recommended value of the ACK timeout. - -endmenu diff --git a/subsys/ieee802154/nrf_802154_configurator.c b/subsys/ieee802154/nrf_802154_configurator.c deleted file mode 100644 index d974c840fea7..000000000000 --- a/subsys/ieee802154/nrf_802154_configurator.c +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright (c) 2021 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -#include -#include -#include -#include -#include -#include - -LOG_MODULE_REGISTER(nrf_802154_configure); - -/* NRF21540 FEM */ -#if IS_ENABLED(CONFIG_MPSL_FEM_NRF21540_GPIO) || IS_ENABLED(CONFIG_MPSL_FEM_NRF21540_GPIO_SPI) -#define LNA_GAIN CONFIG_MPSL_FEM_NRF21540_RX_GAIN_DB -/* Simple GPIO FEM */ -#elif IS_ENABLED(CONFIG_MPSL_FEM_SIMPLE_GPIO) -#if !DT_NODE_EXISTS(DT_NODELABEL(nrf_radio_fem)) -#error Node with label 'nrf_radio_fem' not found in the devicetree. -#endif -#define LNA_GAIN DT_PROP(DT_NODELABEL(nrf_radio_fem), rx_gain_db) -/* No FEM */ -#else -#define LNA_GAIN 0U -#endif - -static void ccaed_threshold_configure(void) -{ - nrf_802154_cca_cfg_t cca_cfg; - - nrf_802154_cca_cfg_get(&cca_cfg); - - /* Overwrite thresholds accounting for RX track gain. */ - cca_cfg.ed_threshold = NRF_802154_CCA_ED_THRESHOLD_DEFAULT + LNA_GAIN; - cca_cfg.corr_threshold = NRF_802154_CCA_CORR_THRESHOLD_DEFAULT + LNA_GAIN; - - nrf_802154_cca_cfg_set(&cca_cfg); -} - -static int nrf_802154_configure(void) -{ - - ccaed_threshold_configure(); - - return 0; -} - -#if IS_ENABLED(CONFIG_NRF_802154_SER_RADIO) -#define INIT_LEVEL APPLICATION -#define INIT_PRIO CONFIG_APPLICATION_INIT_PRIORITY -#elif IS_ENABLED(CONFIG_IEEE802154_NRF5) -#define INIT_LEVEL POST_KERNEL -#define INIT_PRIO CONFIG_IEEE802154_NRF5_INIT_PRIO -#else -#define INIT_LEVEL POST_KERNEL -/* There is no defined priority of nRF 802.15.4 Radio Driver's initialization. - * No priority validation can be performed. - */ -#endif - -#if defined(INIT_PRIO) -BUILD_ASSERT(INIT_PRIO < CONFIG_NRF_802154_RADIO_CONFIG_PRIO, - "nRF 802.15.4 driver configuration would not be performed after its initialization"); -#endif - -SYS_INIT(nrf_802154_configure, INIT_LEVEL, CONFIG_NRF_802154_RADIO_CONFIG_PRIO); diff --git a/west.yml b/west.yml index 89d722e6880c..4fd0db65f9e9 100644 --- a/west.yml +++ b/west.yml @@ -65,7 +65,7 @@ manifest: # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html - name: zephyr repo-path: sdk-zephyr - revision: c3a2b100f1b98a5164e0d5462c9b2c741ba6d5e2 + revision: ba8fd23f0a7e96d53015259dd499f0afea2afa6d import: # In addition to the zephyr repository itself, NCS also # imports the contents of zephyr/west.yml at the above @@ -144,7 +144,7 @@ manifest: - name: nrfxlib repo-path: sdk-nrfxlib path: nrfxlib - revision: e69783ddef880ba56d95f734a692cf15e1c08243 + revision: e5611542ef2805c97ce7f2d851b70a5663b2f50b - name: trusted-firmware-m repo-path: sdk-trusted-firmware-m path: modules/tee/tf-m/trusted-firmware-m @@ -175,7 +175,7 @@ manifest: - name: nrf-802154 repo-path: sdk-nrf-802154 path: nrf-802154 - revision: 9ccd04d289e8c6e9140a7f72c6c57dce3cd478a9 + revision: 537640fbdd2fc023cc7910d3e59b7bd063c2e65b groups: - nrf-802154 - name: dragoon