Skip to content

Commit bc82e29

Browse files
ankunsnordicjm
ankuns
authored and
nordicjm
committed
shields: nrf2240ek: no more explicit pin-forwarder shield
The nrf2240ek_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 858b1f6 commit bc82e29

12 files changed

+116
-67
lines changed

‎CODEOWNERS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
/boards/nordic/thingy91* @nrfconnect/ncs-co-boards @nrfconnect/ncs-cia
5757
/boards/shields/coverage_support/ @nrfconnect/ncs-low-level-test
5858
/boards/shields/nrf2220ek/ @nrfconnect/ncs-radio-sw
59+
/boards/shields/nrf2240ek/ @nrfconnect/ncs-radio-sw
5960
/boards/shields/pca63566/doc/*.rst @nrfconnect/ncs-doc-leads
6061

6162
# SUIT configuration files

‎boards/shields/nrf2240ek/nrf2240ek.conf‎ renamed to ‎boards/shields/nrf2240ek/boards/nrf52833dk_nrf52833.conf‎

File renamed without changes.

‎boards/shields/nrf2240ek/boards/nrf52833dk_nrf52833.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"

‎boards/shields/nrf2240ek/boards/nrf52840dk_nrf52840.conf‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Options related to the nPM1300 regulator and the workaround
2+
# against voltage drops on the nRF2240 power supply pin VDDPALDO.
3+
CONFIG_SENSOR=y
4+
CONFIG_NPM1300_CHARGER=y
5+
# Ensure that FEM is initialized after the nPM1300 current limit on the nRF2240EK is set.
6+
CONFIG_SENSOR_INIT_PRIORITY=90
7+
CONFIG_MPSL_FEM_INIT_PRIORITY=91

‎boards/shields/nrf2240ek/boards/nrf52840dk_nrf52840.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"

‎boards/shields/nrf2240ek/boards/nrf5340dk_nrf5340_cpuapp.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/nrf2240ek/boards/nrf5340dk_nrf5340_cpunet.conf‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Options related to the nPM1300 regulator and the workaround
2+
# against voltage drops on the nRF2240 power supply pin VDDPALDO.
3+
CONFIG_SENSOR=y
4+
CONFIG_NPM1300_CHARGER=y
5+
# Ensure that FEM is initialized after the nPM1300 current limit on the nRF2240EK is set.
6+
CONFIG_SENSOR_INIT_PRIORITY=90
7+
CONFIG_MPSL_FEM_INIT_PRIORITY=91

‎boards/shields/nrf2240ek/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";

‎boards/shields/nrf2240ek/common/arduino_compatible.overlay‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
/* Copyright (c) 2024 Nordic Semiconductor ASA
2+
*
3+
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
4+
*/
5+
6+
/* Pin mapping suitable for use nRF2240-EK PCA63564 with
7+
* Nordic Interposer Board A PCA64172 v0.2.0.
8+
* The nRF2240-EK in SLOT 2 of PCA64172.
9+
*/
10+
11+
/ {
12+
nrf_radio_fem: nrf2240_fem {
13+
compatible = "nordic,nrf2240-fem";
14+
cs-gpios = <&arduino_header 14 GPIO_ACTIVE_HIGH>; /* D8 */
15+
md-gpios = <&arduino_header 13 GPIO_ACTIVE_HIGH>; /* D7 */
16+
pwrmd-gpios = <&arduino_header 4 GPIO_ACTIVE_HIGH>; /* A4 */
17+
twi-if = <&nrf_radio_fem_twi>;
18+
};
19+
};
20+
21+
&arduino_i2c {
22+
status = "okay";
23+
compatible = "nordic,nrf-twim";
24+
25+
nrf_radio_fem_twi: nrf2240_fem_twi@30 {
26+
compatible = "nordic,nrf2240-fem-twi";
27+
status = "okay";
28+
reg = <0x30>;
29+
};
30+
31+
/* The nPM1300 on the nRF2240EK is used to supply power to the nRF2240 device. */
32+
nrf2240ek_pmic: pmic@6b {
33+
compatible = "nordic,npm1300";
34+
status = "okay";
35+
reg = <0x6b>;
36+
37+
nrf2240ek_pmic_charger: charger {
38+
compatible = "nordic,npm1300-charger";
39+
status = "okay";
40+
/* When objects are placed close to the PCB antenna of the nRF2240EK
41+
* shield the supply voltage drops on the nRF2240 power supply pin
42+
* VDDPALDO were observed. As a workaround the current limit on VBUS
43+
* of the PMIC is increased.
44+
*/
45+
vbus-limit-microamp = <500000>;
46+
/* This PMIC does not have a battery, but the settings below are required
47+
* by the driver.
48+
*/
49+
term-microvolt = <4150000>;
50+
current-microamp = <150000>;
51+
dischg-limit-microamp = <1000000>;
52+
thermistor-ohms = <10000>;
53+
thermistor-beta = <3380>;
54+
};
55+
};
56+
};

‎boards/shields/nrf2240ek/common/arduino_compatible_fwd.overlay‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
/*
2+
* Copyright (c) 2024 Nordic Semiconductor ASA
3+
*
4+
* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
5+
*/
6+
7+
&gpio_fwd {
8+
nrf2240-gpio-if {
9+
gpios = <&arduino_header 14 0>, /* cs-gpios */
10+
<&arduino_header 13 0>, /* md-gpios */
11+
<&arduino_header 4 0>; /* pwrmd-gpios */
12+
};
13+
nrf2240-twi-if {
14+
gpios = <&gpio1 2 0>, /* TWIM_SDA */
15+
<&gpio1 3 0>; /* TWIM_SCL */
16+
};
17+
};

0 commit comments

Comments
 (0)