Skip to content

Commit 858b1f6

Browse files
ankunsnordicjm
authored andcommitted
shields: nrf2220ek: no more explicit pin-forwarder shield
The nrf2220ek_fwd is no more necessary and deprecated. Build system picks appropriate overlay (being either a pin-forwarder or the main fem overlay) based on content of `boards` directory. User does not need to pass different values for `-DSHIELD` for every core on the SoC. It is handled on the shield level and passing just `-DSHIELD=nrf2220ek` for all cores is enough. Signed-off-by: Andrzej Kuros <[email protected]>
1 parent 6147ddf commit 858b1f6

File tree

9 files changed

+74
-43
lines changed

9 files changed

+74
-43
lines changed

CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
/boards/nordic/nrf52* @nrfconnect/ncs-co-boards @nrfconnect/ncs-si-bluebagel
5656
/boards/nordic/thingy91* @nrfconnect/ncs-co-boards @nrfconnect/ncs-cia
5757
/boards/shields/coverage_support/ @nrfconnect/ncs-low-level-test
58-
58+
/boards/shields/nrf2220ek/ @nrfconnect/ncs-radio-sw
5959
/boards/shields/pca63566/doc/*.rst @nrfconnect/ncs-doc-leads
6060

6161
# SUIT configuration files
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
/* Copyright (c) 2024 Nordic Semiconductor ASA
2+
*
3+
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
4+
*/
5+
6+
#include "../common/arduino_compatible.overlay"
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
/* Copyright (c) 2024 Nordic Semiconductor ASA
2+
*
3+
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
4+
*/
5+
6+
#include "../common/arduino_compatible.overlay"
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
/* Copyright (c) 2024 Nordic Semiconductor ASA
2+
*
3+
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
4+
*/
5+
6+
#include "../common/arduino_compatible_fwd.overlay"

boards/shields/nrf2220ek/boards/nrf5340dk_nrf5340_cpunet.overlay

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
44
*/
55

6+
#include "../common/arduino_compatible.overlay"
7+
68
/* On nrf5340_cpunet the uart0 conflicts with nrf_radio_fem_twi and must be disabled. */
79
&uart0 {
810
status = "disabled";
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
/* Copyright (c) 2024 Nordic Semiconductor ASA
2+
*
3+
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
4+
*/
5+
6+
/* Pin mapping suitable for use nRF2220-EK PCA63558 with
7+
* Nordic Interposer Board A PCA64172 v0.2.0.
8+
* The nRF2220-EK in SLOT 2 of PCA64172.
9+
*/
10+
11+
/ {
12+
nrf_radio_fem: nrf2220_fem {
13+
compatible = "nordic,nrf2220-fem";
14+
cs-gpios = <&arduino_header 14 GPIO_ACTIVE_HIGH>; /* D8 */
15+
md-gpios = <&arduino_header 13 GPIO_ACTIVE_HIGH>; /* D7 */
16+
twi-if = <&nrf_radio_fem_twi>;
17+
};
18+
};
19+
20+
fem_twi: &arduino_i2c {
21+
status = "okay";
22+
compatible = "nordic,nrf-twim";
23+
24+
nrf_radio_fem_twi: nrf2220_fem_twi@36 {
25+
compatible = "nordic,nrf2220-fem-twi";
26+
status = "okay";
27+
reg = <0x36>;
28+
};
29+
};
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
/*
2+
* Copyright (c) 2024 Nordic Semiconductor ASA
3+
*
4+
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
5+
*/
6+
7+
&gpio_fwd {
8+
nrf2220-gpio-if {
9+
gpios = <&arduino_header 14 0>, /* cs-gpios */
10+
<&arduino_header 13 0>; /* md-gpios */
11+
};
12+
nrf2220-twi-if {
13+
gpios = <&gpio1 2 0>, /* TWIM_SDA */
14+
<&gpio1 3 0>; /* TWIM_SCL */
15+
};
16+
};

boards/shields/nrf2220ek/nrf2220ek.overlay

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,8 @@
33
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
44
*/
55

6-
/* Pin mapping suitable for use nRF2220-EK PCA63558 with
7-
* Nordic Interposer Board A PCA64172 v0.2.0.
8-
* The nRF2220-EK in SLOT 2 of PCA64172.
6+
/* Integration of this shield differs depending on board. The proper overlay file
7+
* is provided through one of suitable overlays in the 'boards' directory.
8+
* However the file here must exist here to satisfy the way the Zephyr finds
9+
* a shield support.
910
*/
10-
11-
/ {
12-
nrf_radio_fem: nrf2220_fem {
13-
compatible = "nordic,nrf2220-fem";
14-
cs-gpios = <&arduino_header 14 GPIO_ACTIVE_HIGH>; /* D8 */
15-
md-gpios = <&arduino_header 13 GPIO_ACTIVE_HIGH>; /* D7 */
16-
twi-if = <&nrf_radio_fem_twi>;
17-
};
18-
};
19-
20-
fem_twi: &arduino_i2c {
21-
status = "okay";
22-
compatible = "nordic,nrf-twim";
23-
24-
nrf_radio_fem_twi: nrf2220_fem_twi@36 {
25-
compatible = "nordic,nrf2220-fem-twi";
26-
status = "okay";
27-
reg = <0x36>;
28-
};
29-
};

boards/shields/nrf2220ek/nrf2220ek_fwd.overlay

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,8 @@
44
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
55
*/
66

7-
/* This file matches the contents of nrf2220ek.overlay and is intended to be applied to nRF5340
8-
* application core when nrf2220ek shield is provided to the network core's image build.
9-
*
10-
* For instance, consider an application targeted for nRF5340 application core that specifies
11-
* a child image targeted for nRF5340 network core, which drives the nRF2220 Front-End Module.
12-
* The shield overlays could be provided to the build using the following command:
13-
*
14-
* west build -p -b nrf5340dk/nrf5340/cpuapp -- -DSHIELD=nrf2220ek_fwd -D<child_image>_SHIELD=nrf2220ek
7+
/* The direct use of SHIELD=nrf2220_fwd is no more necessary and deprecated.
8+
* Please use just -DSHIELD=nrf2220ek or -D<app_image>_SHIELD=nrf2220ek.
9+
* For multi-core devices appropriate overlay for the shield will be picked
10+
* by the build system automatically.
1511
*/
16-
17-
&gpio_fwd {
18-
nrf2220-gpio-if {
19-
gpios = <&arduino_header 14 0>, /* cs-gpios */
20-
<&arduino_header 13 0>; /* md-gpios */
21-
};
22-
nrf2220-twi-if {
23-
gpios = <&gpio1 2 0>, /* TWIM_SDA */
24-
<&gpio1 3 0>; /* TWIM_SCL */
25-
};
26-
};

0 commit comments

Comments
 (0)