diff --git a/drivers/firmware/CMakeLists.txt b/drivers/firmware/CMakeLists.txt index caed354c397..cb6cec89963 100644 --- a/drivers/firmware/CMakeLists.txt +++ b/drivers/firmware/CMakeLists.txt @@ -2,6 +2,5 @@ # zephyr-keep-sorted-start add_subdirectory_ifdef(CONFIG_ARM_SCMI scmi) -add_subdirectory_ifdef(CONFIG_NRF_IRONSIDE nrf_ironside) add_subdirectory_ifdef(CONFIG_TISCI tisci) # zephyr-keep-sorted-stop diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig index 3c92ec3bb6e..8cca2f588ed 100644 --- a/drivers/firmware/Kconfig +++ b/drivers/firmware/Kconfig @@ -11,7 +11,6 @@ config ARM_SCMI Interface (SCMI). # zephyr-keep-sorted-start -source "drivers/firmware/nrf_ironside/Kconfig" source "drivers/firmware/scmi/Kconfig" source "drivers/firmware/tisci/Kconfig" # zephyr-keep-sorted-stop diff --git a/dts/bindings/firmware/nordic,ironside-call.yaml b/dts/bindings/misc/nordic,ironside-call.yaml similarity index 100% rename from dts/bindings/firmware/nordic,ironside-call.yaml rename to dts/bindings/misc/nordic,ironside-call.yaml diff --git a/samples/boards/nordic/nrf_ironside/update/src/main.c b/samples/boards/nordic/nrf_ironside/update/src/main.c index 17098d93d3b..11fb8824519 100644 --- a/samples/boards/nordic/nrf_ironside/update/src/main.c +++ b/samples/boards/nordic/nrf_ironside/update/src/main.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include -#include +#include +#include #include LOG_MODULE_REGISTER(app, LOG_LEVEL_INF); diff --git a/soc/nordic/CMakeLists.txt b/soc/nordic/CMakeLists.txt index 5aec1af8820..cba58ae5187 100644 --- a/soc/nordic/CMakeLists.txt +++ b/soc/nordic/CMakeLists.txt @@ -47,3 +47,4 @@ endif() add_subdirectory(${SOC_SERIES}) add_subdirectory(common) +add_subdirectory(ironside) diff --git a/drivers/firmware/nrf_ironside/CMakeLists.txt b/soc/nordic/ironside/CMakeLists.txt similarity index 92% rename from drivers/firmware/nrf_ironside/CMakeLists.txt rename to soc/nordic/ironside/CMakeLists.txt index ddc46bd69b1..a0a18fc94a8 100644 --- a/drivers/firmware/nrf_ironside/CMakeLists.txt +++ b/soc/nordic/ironside/CMakeLists.txt @@ -1,6 +1,8 @@ # Copyright (c) 2025 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 +zephyr_include_directories(include) + zephyr_library() zephyr_library_sources_ifdef(CONFIG_NRF_IRONSIDE_CALL call.c) diff --git a/drivers/firmware/nrf_ironside/Kconfig b/soc/nordic/ironside/Kconfig similarity index 100% rename from drivers/firmware/nrf_ironside/Kconfig rename to soc/nordic/ironside/Kconfig diff --git a/drivers/firmware/nrf_ironside/boot_report.c b/soc/nordic/ironside/boot_report.c similarity index 89% rename from drivers/firmware/nrf_ironside/boot_report.c rename to soc/nordic/ironside/boot_report.c index ee3e5ff3042..ead0afca947 100644 --- a/drivers/firmware/nrf_ironside/boot_report.c +++ b/soc/nordic/ironside/boot_report.c @@ -5,7 +5,7 @@ #include #include -#include +#include #define IRONSIDE_SE_BOOT_REPORT_ADDR DT_REG_ADDR(DT_NODELABEL(ironside_se_boot_report)) diff --git a/drivers/firmware/nrf_ironside/call.c b/soc/nordic/ironside/call.c similarity index 98% rename from drivers/firmware/nrf_ironside/call.c rename to soc/nordic/ironside/call.c index f120c017549..de4f59943f6 100644 --- a/drivers/firmware/nrf_ironside/call.c +++ b/soc/nordic/ironside/call.c @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ +#include #include #include -#include #include #include #include diff --git a/drivers/firmware/nrf_ironside/cpuconf.c b/soc/nordic/ironside/cpuconf.c similarity index 92% rename from drivers/firmware/nrf_ironside/cpuconf.c rename to soc/nordic/ironside/cpuconf.c index a8377ae0f93..264772a09e2 100644 --- a/drivers/firmware/nrf_ironside/cpuconf.c +++ b/soc/nordic/ironside/cpuconf.c @@ -9,8 +9,8 @@ #include #include -#include -#include +#include +#include #define CPU_PARAMS_CPU_OFFSET (0) #define CPU_PARAMS_CPU_MASK (0xF) diff --git a/drivers/firmware/nrf_ironside/dvfs.c b/soc/nordic/ironside/dvfs.c similarity index 97% rename from drivers/firmware/nrf_ironside/dvfs.c rename to soc/nordic/ironside/dvfs.c index dd1e64f6d34..7793ff015b1 100644 --- a/drivers/firmware/nrf_ironside/dvfs.c +++ b/soc/nordic/ironside/dvfs.c @@ -5,8 +5,8 @@ #include #include -#include -#include +#include +#include static enum ironside_dvfs_oppoint current_dvfs_oppoint = IRONSIDE_DVFS_OPP_HIGH; diff --git a/include/zephyr/drivers/firmware/nrf_ironside/boot_report.h b/soc/nordic/ironside/include/nrf_ironside/boot_report.h similarity index 91% rename from include/zephyr/drivers/firmware/nrf_ironside/boot_report.h rename to soc/nordic/ironside/include/nrf_ironside/boot_report.h index 509c05babcb..7cd51267533 100644 --- a/include/zephyr/drivers/firmware/nrf_ironside/boot_report.h +++ b/soc/nordic/ironside/include/nrf_ironside/boot_report.h @@ -3,8 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#ifndef ZEPHYR_INCLUDE_ZEPHYR_DRIVERS_FIRMWARE_NRF_IRONSIDE_BOOT_REPORT_H_ -#define ZEPHYR_INCLUDE_ZEPHYR_DRIVERS_FIRMWARE_NRF_IRONSIDE_BOOT_REPORT_H_ +#ifndef ZEPHYR_SOC_NORDIC_IRONSIDE_INCLUDE_NRF_IRONSIDE_BOOT_REPORT_H_ +#define ZEPHYR_SOC_NORDIC_IRONSIDE_INCLUDE_NRF_IRONSIDE_BOOT_REPORT_H_ #include #include @@ -74,4 +74,4 @@ struct ironside_boot_report { */ int ironside_boot_report_get(const struct ironside_boot_report **report); -#endif /* ZEPHYR_INCLUDE_ZEPHYR_DRIVERS_FIRMWARE_NRF_IRONSIDE_BOOT_REPORT_H_ */ +#endif /* ZEPHYR_SOC_NORDIC_IRONSIDE_INCLUDE_NRF_IRONSIDE_BOOT_REPORT_H_ */ diff --git a/include/zephyr/drivers/firmware/nrf_ironside/call.h b/soc/nordic/ironside/include/nrf_ironside/call.h similarity index 91% rename from include/zephyr/drivers/firmware/nrf_ironside/call.h rename to soc/nordic/ironside/include/nrf_ironside/call.h index d67e9762202..9a2431c7d58 100644 --- a/include/zephyr/drivers/firmware/nrf_ironside/call.h +++ b/soc/nordic/ironside/include/nrf_ironside/call.h @@ -3,8 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#ifndef ZEPHYR_INCLUDE_ZEPHYR_DRIVERS_FIRMWARE_NRF_IRONSIDE_CALL_H_ -#define ZEPHYR_INCLUDE_ZEPHYR_DRIVERS_FIRMWARE_NRF_IRONSIDE_CALL_H_ +#ifndef ZEPHYR_SOC_NORDIC_IRONSIDE_INCLUDE_NRF_IRONSIDE_CALL_H_ +#define ZEPHYR_SOC_NORDIC_IRONSIDE_INCLUDE_NRF_IRONSIDE_CALL_H_ #include @@ -79,4 +79,4 @@ void ironside_call_dispatch(struct ironside_call_buf *buf); */ void ironside_call_release(struct ironside_call_buf *buf); -#endif /* ZEPHYR_INCLUDE_ZEPHYR_DRIVERS_FIRMWARE_NRF_IRONSIDE_CALL_H_ */ +#endif /* ZEPHYR_SOC_NORDIC_IRONSIDE_INCLUDE_NRF_IRONSIDE_CALL_H_ */ diff --git a/include/zephyr/drivers/firmware/nrf_ironside/cpuconf.h b/soc/nordic/ironside/include/nrf_ironside/cpuconf.h similarity index 89% rename from include/zephyr/drivers/firmware/nrf_ironside/cpuconf.h rename to soc/nordic/ironside/include/nrf_ironside/cpuconf.h index bed8932868f..49e562b1369 100644 --- a/include/zephyr/drivers/firmware/nrf_ironside/cpuconf.h +++ b/soc/nordic/ironside/include/nrf_ironside/cpuconf.h @@ -3,14 +3,14 @@ * SPDX-License-Identifier: Apache-2.0 */ -#ifndef ZEPHYR_INCLUDE_ZEPHYR_DRIVERS_FIRMWARE_NRF_IRONSIDE_CPUCONF_H_ -#define ZEPHYR_INCLUDE_ZEPHYR_DRIVERS_FIRMWARE_NRF_IRONSIDE_CPUCONF_H_ +#ifndef ZEPHYR_SOC_NORDIC_IRONSIDE_INCLUDE_NRF_IRONSIDE_CPUCONF_H_ +#define ZEPHYR_SOC_NORDIC_IRONSIDE_INCLUDE_NRF_IRONSIDE_CPUCONF_H_ #include #include -#include #include #include +#include /** * @name CPUCONF service error codes. @@ -71,4 +71,4 @@ BUILD_ASSERT(IRONSIDE_CPUCONF_NUM_ARGS <= NRF_IRONSIDE_CALL_NUM_ARGS); int ironside_cpuconf(NRF_PROCESSORID_Type cpu, const void *vector_table, bool cpu_wait, const uint8_t *msg, size_t msg_size); -#endif /* ZEPHYR_INCLUDE_ZEPHYR_DRIVERS_FIRMWARE_NRF_IRONSIDE_CPUCONF_H_ */ +#endif /* ZEPHYR_SOC_NORDIC_IRONSIDE_INCLUDE_NRF_IRONSIDE_CPUCONF_H_ */ diff --git a/include/zephyr/drivers/firmware/nrf_ironside/dvfs.h b/soc/nordic/ironside/include/nrf_ironside/dvfs.h similarity index 92% rename from include/zephyr/drivers/firmware/nrf_ironside/dvfs.h rename to soc/nordic/ironside/include/nrf_ironside/dvfs.h index 5a80f062bd7..e2cb03c249e 100644 --- a/include/zephyr/drivers/firmware/nrf_ironside/dvfs.h +++ b/soc/nordic/ironside/include/nrf_ironside/dvfs.h @@ -3,8 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#ifndef ZEPHYR_INCLUDE_ZEPHYR_DRIVERS_FIRMWARE_NRF_IRONSIDE_DVFS_H_ -#define ZEPHYR_INCLUDE_ZEPHYR_DRIVERS_FIRMWARE_NRF_IRONSIDE_DVFS_H_ +#ifndef ZEPHYR_SOC_NORDIC_IRONSIDE_INCLUDE_NRF_IRONSIDE_DVFS_H_ +#define ZEPHYR_SOC_NORDIC_IRONSIDE_INCLUDE_NRF_IRONSIDE_DVFS_H_ #include #include @@ -89,4 +89,4 @@ static inline bool ironside_dvfs_is_oppoint_valid(enum ironside_dvfs_oppoint dvf return true; } -#endif /* ZEPHYR_INCLUDE_ZEPHYR_DRIVERS_FIRMWARE_NRF_IRONSIDE_DVFS_H_ */ +#endif /* ZEPHYR_SOC_NORDIC_IRONSIDE_INCLUDE_NRF_IRONSIDE_DVFS_H_ */ diff --git a/include/zephyr/drivers/firmware/nrf_ironside/update.h b/soc/nordic/ironside/include/nrf_ironside/update.h similarity index 90% rename from include/zephyr/drivers/firmware/nrf_ironside/update.h rename to soc/nordic/ironside/include/nrf_ironside/update.h index 5da02c97e6d..8152a77f5f7 100644 --- a/include/zephyr/drivers/firmware/nrf_ironside/update.h +++ b/soc/nordic/ironside/include/nrf_ironside/update.h @@ -3,8 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#ifndef ZEPHYR_INCLUDE_ZEPHYR_DRIVERS_FIRMWARE_NRF_IRONSIDE_UPDATE_H_ -#define ZEPHYR_INCLUDE_ZEPHYR_DRIVERS_FIRMWARE_NRF_IRONSIDE_UPDATE_H_ +#ifndef ZEPHYR_SOC_NORDIC_IRONSIDE_INCLUDE_NRF_IRONSIDE_UPDATE_H_ +#define ZEPHYR_SOC_NORDIC_IRONSIDE_INCLUDE_NRF_IRONSIDE_UPDATE_H_ #include #include @@ -69,4 +69,4 @@ struct ironside_update_blob { */ int ironside_update(const struct ironside_update_blob *update); -#endif /* ZEPHYR_INCLUDE_ZEPHYR_DRIVERS_FIRMWARE_NRF_IRONSIDE_UPDATE_H_ */ +#endif /* ZEPHYR_SOC_NORDIC_IRONSIDE_INCLUDE_NRF_IRONSIDE_UPDATE_H_ */ diff --git a/drivers/firmware/nrf_ironside/update.c b/soc/nordic/ironside/update.c similarity index 83% rename from drivers/firmware/nrf_ironside/update.c rename to soc/nordic/ironside/update.c index 8de21303b05..a56407a3fa1 100644 --- a/drivers/firmware/nrf_ironside/update.c +++ b/soc/nordic/ironside/update.c @@ -3,8 +3,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#include -#include +#include +#include int ironside_update(const struct ironside_update_blob *update) { diff --git a/soc/nordic/nrf54h/soc.c b/soc/nordic/nrf54h/soc.c index e55f56242b9..0c43c617572 100644 --- a/soc/nordic/nrf54h/soc.c +++ b/soc/nordic/nrf54h/soc.c @@ -22,7 +22,7 @@ #include #include #include -#include +#include LOG_MODULE_REGISTER(soc, CONFIG_SOC_LOG_LEVEL);