From 4cde3ea70f0c8d8be3729a81ed475ed2434efec9 Mon Sep 17 00:00:00 2001 From: Maximilian Deubel Date: Tue, 22 Aug 2023 12:24:33 +0200 Subject: [PATCH] soc: arm: nordic_nrf: nrf91: rename nRF9161 SICA to LACA This patch corrects the name of the nRF9161, which is LACA, not SICA. Signed-off-by: Maximilian Deubel --- boards/arm/nrf9161dk_nrf9161/Kconfig.board | 4 ++-- boards/arm/nrf9161dk_nrf9161/nrf9161dk_nrf9161.dts | 2 +- boards/arm/nrf9161dk_nrf9161/nrf9161dk_nrf9161_defconfig | 2 +- boards/arm/nrf9161dk_nrf9161/nrf9161dk_nrf9161_ns.dts | 2 +- boards/arm/nrf9161dk_nrf9161/nrf9161dk_nrf9161_ns_defconfig | 2 +- dts/arm/nordic/{nrf9161_sica.dtsi => nrf9161_laca.dtsi} | 2 +- dts/arm/nordic/{nrf9161ns_sica.dtsi => nrf9161ns_laca.dtsi} | 2 +- ...efconfig.nrf9161_SICA => Kconfig.defconfig.nrf9161_LACA} | 6 +++--- soc/arm/nordic_nrf/nrf91/Kconfig.soc | 4 ++-- 9 files changed, 13 insertions(+), 13 deletions(-) rename dts/arm/nordic/{nrf9161_sica.dtsi => nrf9161_laca.dtsi} (84%) rename dts/arm/nordic/{nrf9161ns_sica.dtsi => nrf9161ns_laca.dtsi} (84%) rename soc/arm/nordic_nrf/nrf91/{Kconfig.defconfig.nrf9161_SICA => Kconfig.defconfig.nrf9161_LACA} (70%) diff --git a/boards/arm/nrf9161dk_nrf9161/Kconfig.board b/boards/arm/nrf9161dk_nrf9161/Kconfig.board index 1d791bb6886..15bcdb167b3 100644 --- a/boards/arm/nrf9161dk_nrf9161/Kconfig.board +++ b/boards/arm/nrf9161dk_nrf9161/Kconfig.board @@ -3,7 +3,7 @@ # Copyright (c) 2023 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 -if SOC_NRF9161_SICA +if SOC_NRF9161_LACA config BOARD_NRF9161DK_NRF9161 bool "nRF9161 DK NRF9161" @@ -11,4 +11,4 @@ config BOARD_NRF9161DK_NRF9161 config BOARD_NRF9161DK_NRF9161_NS bool "nRF9161 DK NRF9161 non-secure" -endif # SOC_NRF9161_SICA +endif # SOC_NRF9161_LACA diff --git a/boards/arm/nrf9161dk_nrf9161/nrf9161dk_nrf9161.dts b/boards/arm/nrf9161dk_nrf9161/nrf9161dk_nrf9161.dts index 6572e9e597f..9d2af9f13a2 100644 --- a/boards/arm/nrf9161dk_nrf9161/nrf9161dk_nrf9161.dts +++ b/boards/arm/nrf9161dk_nrf9161/nrf9161dk_nrf9161.dts @@ -5,7 +5,7 @@ */ /dts-v1/; -#include +#include #include "nrf9161dk_nrf9161_common.dtsi" / { diff --git a/boards/arm/nrf9161dk_nrf9161/nrf9161dk_nrf9161_defconfig b/boards/arm/nrf9161dk_nrf9161/nrf9161dk_nrf9161_defconfig index cf53dfa11a0..d4db57f62b4 100644 --- a/boards/arm/nrf9161dk_nrf9161/nrf9161dk_nrf9161_defconfig +++ b/boards/arm/nrf9161dk_nrf9161/nrf9161dk_nrf9161_defconfig @@ -1,7 +1,7 @@ # SPDX-License-Identifier: Apache-2.0 CONFIG_SOC_SERIES_NRF91X=y -CONFIG_SOC_NRF9161_SICA=y +CONFIG_SOC_NRF9161_LACA=y CONFIG_BOARD_NRF9161DK_NRF9161=y # Enable MPU diff --git a/boards/arm/nrf9161dk_nrf9161/nrf9161dk_nrf9161_ns.dts b/boards/arm/nrf9161dk_nrf9161/nrf9161dk_nrf9161_ns.dts index 15648e11f41..b7d0c62965f 100644 --- a/boards/arm/nrf9161dk_nrf9161/nrf9161dk_nrf9161_ns.dts +++ b/boards/arm/nrf9161dk_nrf9161/nrf9161dk_nrf9161_ns.dts @@ -5,7 +5,7 @@ */ /dts-v1/; -#include +#include #include "nrf9161dk_nrf9161_common.dtsi" / { diff --git a/boards/arm/nrf9161dk_nrf9161/nrf9161dk_nrf9161_ns_defconfig b/boards/arm/nrf9161dk_nrf9161/nrf9161dk_nrf9161_ns_defconfig index 475d345e564..f2d7f04470c 100644 --- a/boards/arm/nrf9161dk_nrf9161/nrf9161dk_nrf9161_ns_defconfig +++ b/boards/arm/nrf9161dk_nrf9161/nrf9161dk_nrf9161_ns_defconfig @@ -1,7 +1,7 @@ # SPDX-License-Identifier: Apache-2.0 CONFIG_SOC_SERIES_NRF91X=y -CONFIG_SOC_NRF9161_SICA=y +CONFIG_SOC_NRF9161_LACA=y CONFIG_BOARD_NRF9161DK_NRF9161_NS=y # Enable MPU diff --git a/dts/arm/nordic/nrf9161_sica.dtsi b/dts/arm/nordic/nrf9161_laca.dtsi similarity index 84% rename from dts/arm/nordic/nrf9161_sica.dtsi rename to dts/arm/nordic/nrf9161_laca.dtsi index 113ee14617c..e94ab99166a 100644 --- a/dts/arm/nordic/nrf9161_sica.dtsi +++ b/dts/arm/nordic/nrf9161_laca.dtsi @@ -17,7 +17,7 @@ / { soc { - compatible = "nordic,nrf9161-sica", "nordic,nrf9120", + compatible = "nordic,nrf9161-laca", "nordic,nrf9120", "nordic,nrf91", "simple-bus"; }; }; diff --git a/dts/arm/nordic/nrf9161ns_sica.dtsi b/dts/arm/nordic/nrf9161ns_laca.dtsi similarity index 84% rename from dts/arm/nordic/nrf9161ns_sica.dtsi rename to dts/arm/nordic/nrf9161ns_laca.dtsi index 479021d1107..4449c3565b3 100644 --- a/dts/arm/nordic/nrf9161ns_sica.dtsi +++ b/dts/arm/nordic/nrf9161ns_laca.dtsi @@ -17,7 +17,7 @@ / { soc { - compatible = "nordic,nrf9161-sica", "nordic,nrf9120", + compatible = "nordic,nrf9161-laca", "nordic,nrf9120", "nordic,nrf91", "simple-bus"; }; }; diff --git a/soc/arm/nordic_nrf/nrf91/Kconfig.defconfig.nrf9161_SICA b/soc/arm/nordic_nrf/nrf91/Kconfig.defconfig.nrf9161_LACA similarity index 70% rename from soc/arm/nordic_nrf/nrf91/Kconfig.defconfig.nrf9161_SICA rename to soc/arm/nordic_nrf/nrf91/Kconfig.defconfig.nrf9161_LACA index d083d868f83..3358e961203 100644 --- a/soc/arm/nordic_nrf/nrf91/Kconfig.defconfig.nrf9161_SICA +++ b/soc/arm/nordic_nrf/nrf91/Kconfig.defconfig.nrf9161_LACA @@ -3,12 +3,12 @@ # Copyright (c) 2023 Nordic Semiconductor ASA # SPDX-License-Identifier: Apache-2.0 -if SOC_NRF9161_SICA +if SOC_NRF9161_LACA config SOC - default "nRF9161_SICA" + default "nRF9161_LACA" config NUM_IRQS default 65 -endif # SOC_NRF9161_SICA +endif # SOC_NRF9161_LACA diff --git a/soc/arm/nordic_nrf/nrf91/Kconfig.soc b/soc/arm/nordic_nrf/nrf91/Kconfig.soc index 21373f599e7..c9b8c54438b 100644 --- a/soc/arm/nordic_nrf/nrf91/Kconfig.soc +++ b/soc/arm/nordic_nrf/nrf91/Kconfig.soc @@ -26,8 +26,8 @@ config SOC_NRF9160_SICA # That's why in the top level of SoC definitions (for user-configurable # options in Kconfig, for example) the nRF9161 term is used and nRF9120 # underneath. -config SOC_NRF9161_SICA - bool "NRF9161_SICA" +config SOC_NRF9161_LACA + bool "NRF9161_LACA" select SOC_NRF9120 config SOC_NRF9131_LACA