From d7b12de31541055af1609209d10108918d0f7943 Mon Sep 17 00:00:00 2001 From: Chaitanya Tata Date: Thu, 27 Nov 2025 01:30:11 +0530 Subject: [PATCH 1/2] manifest: sdk-zephyr: Pull new shield nRF7002EB-II This is now moved to upstream. Signed-off-by: Chaitanya Tata --- west.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/west.yml b/west.yml index fba19ae0aa6..ae26547f38b 100644 --- a/west.yml +++ b/west.yml @@ -64,7 +64,7 @@ manifest: # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html - name: zephyr repo-path: sdk-zephyr - revision: f316ea6f7080c448f423f68b44a0f6fe78d7f455 + revision: pull/3546/head import: # In addition to the zephyr repository itself, NCS also # imports the contents of zephyr/west.yml at the above From 9c861700718c736657435b41c94e30456f1e2c5d Mon Sep 17 00:00:00 2001 From: Chaitanya Tata Date: Thu, 27 Nov 2025 01:30:43 +0530 Subject: [PATCH 2/2] boards: shields: nrf7002eb2: Remove from downstream Use the upstream shield directly. Signed-off-by: Chaitanya Tata --- boards/shields/nrf7002eb2/Kconfig.shield | 14 --- .../boards/nrf54l15dk_nrf54l15_cpuapp.overlay | 54 ----------- .../nrf54lm20dk_nrf54lm20a_cpuapp.overlay | 89 ------------------- boards/shields/nrf7002eb2/nrf7002eb2.overlay | 24 ----- .../nrf7002eb2/nrf7002eb2_coex.overlay | 15 ---- .../shields/nrf7002eb2/nrf7002eb2_common.dtsi | 20 ----- .../nrf7002eb2/nrf7002eb2_common_5g.dtsi | 12 --- .../nrf7002eb2/nrf7002eb2_gpio_pins_1.dtsi | 25 ------ .../nrf7002eb2/nrf7002eb2_gpio_pins_2.dtsi | 15 ---- .../nrf7002eb2/nrf7002eb2_nrf7000.overlay | 24 ----- .../nrf7002eb2/nrf7002eb2_nrf7001.overlay | 23 ----- 11 files changed, 315 deletions(-) delete mode 100644 boards/shields/nrf7002eb2/Kconfig.shield delete mode 100644 boards/shields/nrf7002eb2/boards/nrf54l15dk_nrf54l15_cpuapp.overlay delete mode 100644 boards/shields/nrf7002eb2/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay delete mode 100644 boards/shields/nrf7002eb2/nrf7002eb2.overlay delete mode 100644 boards/shields/nrf7002eb2/nrf7002eb2_coex.overlay delete mode 100644 boards/shields/nrf7002eb2/nrf7002eb2_common.dtsi delete mode 100644 boards/shields/nrf7002eb2/nrf7002eb2_common_5g.dtsi delete mode 100644 boards/shields/nrf7002eb2/nrf7002eb2_gpio_pins_1.dtsi delete mode 100644 boards/shields/nrf7002eb2/nrf7002eb2_gpio_pins_2.dtsi delete mode 100644 boards/shields/nrf7002eb2/nrf7002eb2_nrf7000.overlay delete mode 100644 boards/shields/nrf7002eb2/nrf7002eb2_nrf7001.overlay diff --git a/boards/shields/nrf7002eb2/Kconfig.shield b/boards/shields/nrf7002eb2/Kconfig.shield deleted file mode 100644 index 428fcb5ace2..00000000000 --- a/boards/shields/nrf7002eb2/Kconfig.shield +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright (c) 2025 Nordic Semiconductor ASA -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - -config SHIELD_NRF7002EB2 - def_bool $(shields_list_contains,nrf7002eb2) - -config SHIELD_NRF7002EB2_NRF7001 - def_bool $(shields_list_contains,nrf7002eb2_nrf7001) - -config SHIELD_NRF7002EB2_NRF7000 - def_bool $(shields_list_contains,nrf7002eb2_nrf7000) - -config SHIELD_NRF7002EB2_COEX - def_bool $(shields_list_contains,nrf7002eb2_coex) diff --git a/boards/shields/nrf7002eb2/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/boards/shields/nrf7002eb2/boards/nrf54l15dk_nrf54l15_cpuapp.overlay deleted file mode 100644 index aeba7b96789..00000000000 --- a/boards/shields/nrf7002eb2/boards/nrf54l15dk_nrf54l15_cpuapp.overlay +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (c) 2025 Nordic Semiconductor - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -#include "../nrf7002eb2_gpio_pins_1.dtsi" - -/ { - chosen { - zephyr,wifi = &wlan0; - zephyr,console = &uart30; - zephyr,shell-uart = &uart30; - zephyr,uart-mcumgr = &uart30; - zephyr,bt-mon-uart = &uart30; - zephyr,bt-c2h-uart = &uart30; - }; -}; - -&pinctrl { - spi22_default: spi22_default { - group1 { - psels = , - , - ; - bias-pull-down; - }; - }; - - spi22_sleep: spi22_sleep { - group1 { - psels = , - , - ; - bias-pull-down; - low-power-enable; - }; - }; -}; - -&spi22 { - cs-gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; - pinctrl-0 = <&spi22_default>; - pinctrl-1 = <&spi22_sleep>; - pinctrl-names = "default", "sleep"; -}; - -&uart20 { - status = "disabled"; -}; - -&uart30 { - status = "okay"; -}; diff --git a/boards/shields/nrf7002eb2/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay b/boards/shields/nrf7002eb2/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay deleted file mode 100644 index 780c7911140..00000000000 --- a/boards/shields/nrf7002eb2/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay +++ /dev/null @@ -1,89 +0,0 @@ -/* - * Copyright (c) 2025 Nordic Semiconductor - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -#include "../nrf7002eb2_gpio_pins_2.dtsi" - -/ { - chosen { - zephyr,wifi = &wlan0; - zephyr,console = &uart30; - zephyr,shell-uart = &uart30; - zephyr,uart-mcumgr = &uart30; - zephyr,bt-mon-uart = &uart30; - zephyr,bt-c2h-uart = &uart30; - }; - - buttons { - /delete-node/ button_3; - }; - - aliases { - /delete-property/ sw3; - }; -}; - -&gpio3 { - status = "okay"; -}; - -&pinctrl { - spi22_default: spi22_default { - group1 { - psels = , - , - ; - bias-pull-down; - }; - }; - - spi22_sleep: spi22_sleep { - group1 { - psels = , - , - ; - bias-pull-down; - low-power-enable; - }; - }; - - uart30_default: uart30_default { - group1 { - psels = ; - }; - - group2 { - psels = ; - bias-pull-up; - }; - }; - - uart30_sleep: uart30_sleep { - group1 { - psels = , - ; - low-power-enable; - }; - }; -}; - -&spi22 { - status = "okay"; - cs-gpios = <&gpio3 2 GPIO_ACTIVE_LOW>; - pinctrl-0 = <&spi22_default>; - pinctrl-1 = <&spi22_sleep>; - pinctrl-names = "default", "sleep"; -}; - -/* uart20 has pin conflicts with EB-II shield hence disabling that - * and enabling uart30 as console port. - */ -&uart20 { - status = "disabled"; -}; - -&uart30 { - status = "okay"; -}; diff --git a/boards/shields/nrf7002eb2/nrf7002eb2.overlay b/boards/shields/nrf7002eb2/nrf7002eb2.overlay deleted file mode 100644 index f81ae47a267..00000000000 --- a/boards/shields/nrf7002eb2/nrf7002eb2.overlay +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (c) 2025 Nordic Semiconductor - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/ { - chosen { - zephyr,wifi = &wlan0; - }; -}; - -&wifi_spi { - status = "okay"; - - nrf70: nrf7002-spi@0 { - compatible = "nordic,nrf7002-spi"; - status = "okay"; - - /* Include common nRF70 overlays */ - #include "nrf7002eb2_common.dtsi" - #include "nrf7002eb2_common_5g.dtsi" - }; -}; diff --git a/boards/shields/nrf7002eb2/nrf7002eb2_coex.overlay b/boards/shields/nrf7002eb2/nrf7002eb2_coex.overlay deleted file mode 100644 index 0e13d49eb68..00000000000 --- a/boards/shields/nrf7002eb2/nrf7002eb2_coex.overlay +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Copyright (c) 2025 Nordic Semiconductor - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/ { - nrf_radio_coex: coex { - compatible = "nordic,nrf7002-coex"; - status = "okay"; - status0-gpios = <&gpio0 3 GPIO_ACTIVE_HIGH>; - req-gpios = <&gpio0 4 GPIO_ACTIVE_HIGH>; - grant-gpios = <&gpio1 7 (GPIO_PULL_DOWN | GPIO_ACTIVE_LOW)>; - }; -}; diff --git a/boards/shields/nrf7002eb2/nrf7002eb2_common.dtsi b/boards/shields/nrf7002eb2/nrf7002eb2_common.dtsi deleted file mode 100644 index 4bd3c541079..00000000000 --- a/boards/shields/nrf7002eb2/nrf7002eb2_common.dtsi +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright (c) 2025 Nordic Semiconductor - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ -#include - -/* Common assignments for nRF70 EB-II shield */ -reg = <0>; -spi-max-frequency = ; - -/* Maximum TX power limits for 2.4 GHz */ -wifi-max-tx-pwr-2g-dsss = <21>; -wifi-max-tx-pwr-2g-mcs0 = <16>; -wifi-max-tx-pwr-2g-mcs7 = <16>; - -/* List of interfaces */ -wlan0: wlan0 { - compatible = "nordic,wlan"; -}; diff --git a/boards/shields/nrf7002eb2/nrf7002eb2_common_5g.dtsi b/boards/shields/nrf7002eb2/nrf7002eb2_common_5g.dtsi deleted file mode 100644 index fb9dcdde0dd..00000000000 --- a/boards/shields/nrf7002eb2/nrf7002eb2_common_5g.dtsi +++ /dev/null @@ -1,12 +0,0 @@ -/* - * Copyright (c) 2025 Nordic Semiconductor - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -wifi-max-tx-pwr-5g-low-mcs0 = <13>; -wifi-max-tx-pwr-5g-low-mcs7 = <13>; -wifi-max-tx-pwr-5g-mid-mcs0 = <13>; -wifi-max-tx-pwr-5g-mid-mcs7 = <13>; -wifi-max-tx-pwr-5g-high-mcs0 = <12>; -wifi-max-tx-pwr-5g-high-mcs7 = <12>; diff --git a/boards/shields/nrf7002eb2/nrf7002eb2_gpio_pins_1.dtsi b/boards/shields/nrf7002eb2/nrf7002eb2_gpio_pins_1.dtsi deleted file mode 100644 index 509a5ec9652..00000000000 --- a/boards/shields/nrf7002eb2/nrf7002eb2_gpio_pins_1.dtsi +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (c) 2025 Nordic Semiconductor - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/ { - nrf_radio_coex: coex { - compatible = "nordic,nrf7002-coex"; - status = "disabled"; - status0-gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>; - req-gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>; - grant-gpios = <&gpio1 12 (GPIO_PULL_DOWN | GPIO_ACTIVE_LOW)>; - }; -}; - -&nrf70 { - iovdd-ctrl-gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>; - bucken-gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>; - host-irq-gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>; -}; - -&gpio1 { - status = "okay"; -}; diff --git a/boards/shields/nrf7002eb2/nrf7002eb2_gpio_pins_2.dtsi b/boards/shields/nrf7002eb2/nrf7002eb2_gpio_pins_2.dtsi deleted file mode 100644 index c5235b13af9..00000000000 --- a/boards/shields/nrf7002eb2/nrf7002eb2_gpio_pins_2.dtsi +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Copyright (c) 2025 Nordic Semiconductor - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -&nrf70 { - iovdd-ctrl-gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>; - bucken-gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>; - host-irq-gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>; -}; - -&gpio1 { - status = "okay"; -}; diff --git a/boards/shields/nrf7002eb2/nrf7002eb2_nrf7000.overlay b/boards/shields/nrf7002eb2/nrf7002eb2_nrf7000.overlay deleted file mode 100644 index 306f2c46627..00000000000 --- a/boards/shields/nrf7002eb2/nrf7002eb2_nrf7000.overlay +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (c) 2025 Nordic Semiconductor - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/ { - chosen { - zephyr,wifi = &wlan0; - }; -}; - -&wifi_spi { - status = "okay"; - - nrf70: nrf7000-spi@0 { - compatible = "nordic,nrf7000-spi"; - status = "okay"; - - /* Include common nRF70 overlays */ - #include "nrf7002eb2_common.dtsi" - #include "nrf7002eb2_common_5g.dtsi" - }; -}; diff --git a/boards/shields/nrf7002eb2/nrf7002eb2_nrf7001.overlay b/boards/shields/nrf7002eb2/nrf7002eb2_nrf7001.overlay deleted file mode 100644 index bc2bb8b0d04..00000000000 --- a/boards/shields/nrf7002eb2/nrf7002eb2_nrf7001.overlay +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (c) 2025 Nordic Semiconductor - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/ { - chosen { - zephyr,wifi = &wlan0; - }; -}; - -&wifi_spi { - status = "okay"; - - nrf70: nrf7001-spi@0 { - compatible = "nordic,nrf7001-spi"; - status = "okay"; - - /* Include common nRF70 overlays */ - #include "nrf7002eb2_common.dtsi" - }; -};