Skip to content

Commit eb2e96c

Browse files
committed
dts: bindings: Rename generic-fem-two-ctrl-pins to radio-fem-two-ctrl-pins
Rename generic FEM binding to use 'radio-' prefix for consistency with other radio bindings (radio.yaml, ble-radio.yaml). Updated 3 board files, Nordic BLE controller HAL, documentation, and test overlays. Added missing settle-time properties to pan1783a board. Signed-off-by: Ivan Pankratov <[email protected]>
1 parent 6ff50cd commit eb2e96c

File tree

8 files changed

+11
-9
lines changed

8 files changed

+11
-9
lines changed

boards/ezurio/bl654_dvk/bl654_dvk_nrf52840_pa.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
/* Information from Nordic SDK-Based Application Development and SKY66112 datasheet */
1212
nrf_radio_fem: fem {
1313
status = "okay";
14-
compatible = "generic-fem-two-ctrl-pins";
14+
compatible = "radio-fem-two-ctrl-pins";
1515
ctx-gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>;
1616
crx-gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>;
1717
ctx-settle-time-us = <23>;

boards/panasonic/pan1783/pan1783a_pa_evb_nrf5340_cpunet.dts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,11 @@
1919
};
2020

2121
nrf_radio_fem: fem_node {
22-
compatible = "skyworks,sky66407-11", "generic-fem-two-ctrl-pins";
22+
compatible = "skyworks,sky66407-11", "radio-fem-two-ctrl-pins";
2323
ctx-gpios = <&gpio0 19 GPIO_ACTIVE_HIGH>;
2424
crx-gpios = <&gpio0 21 GPIO_ACTIVE_HIGH>;
25+
ctx-settle-time-us = <5>;
26+
crx-settle-time-us = <5>;
2527
};
2628
};
2729

boards/u-blox/ubx_bmd345eval/ubx_bmd345eval_nrf52840.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@
127127
};
128128

129129
nrf_radio_fem: fem {
130-
compatible = "generic-fem-two-ctrl-pins";
130+
compatible = "radio-fem-two-ctrl-pins";
131131
ctx-gpios = <&gpio1 5 0>;
132132
ctx-settle-time-us = <1>;
133133
crx-gpios = <&gpio1 6 0>;

dts/bindings/net/wireless/nordic,nrf-radio.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ description: |
3131
3232
Currently supported "compatible" properties for the FEM node are:
3333
34-
- generic-fem-two-ctrl-pins
34+
- radio-fem-two-ctrl-pins
3535
- nordic,nrf21540-fem
3636
3737
Refer to the bindings for these compatibles for more information

dts/bindings/net/wireless/generic-fem-two-ctrl-pins.yaml renamed to dts/bindings/net/wireless/radio-fem-two-ctrl-pins.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ description: |
1717
(Though if you do specify a pin, you must also specify its
1818
corresponding settle-time-us property.)
1919
20-
compatible: "generic-fem-two-ctrl-pins"
20+
compatible: "radio-fem-two-ctrl-pins"
2121

2222
include: base.yaml
2323

subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_fem.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@
3434
*/
3535

3636
#ifdef HAL_RADIO_HAVE_FEM
37-
#if FEM_HAS_COMPAT(generic_fem_two_ctrl_pins)
37+
#if FEM_HAS_COMPAT(radio_fem_two_ctrl_pins)
3838
#include "radio_nrf5_fem_generic.h"
3939
#elif FEM_HAS_COMPAT(nordic_nrf21540_fem)
4040
#include "radio_nrf5_fem_nrf21540.h"
4141
#else
4242
#error "radio node fem property has an unsupported compatible"
43-
#endif /* FEM_HAS_COMPAT(generic_fem_two_ctrl_pins) */
43+
#endif /* FEM_HAS_COMPAT(radio_fem_two_ctrl_pins) */
4444
#endif /* HAL_RADIO_HAVE_FEM */
4545

4646
/*

subsys/bluetooth/controller/ll_sw/nordic/hal/nrf5/radio/radio_nrf5_fem_generic.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
/*
88
* This file contains helper macros for dealing with the devicetree
99
* radio node's fem property, in the case that it has compatible
10-
* "generic-fem-two-ctrl-pins".
10+
* "radio-fem-two-ctrl-pins".
1111
*
1212
* Do not include it directly.
1313
*

tests/bluetooth/init/pa_lna.overlay

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/ {
22
nrf_radio_fem: fem {
3-
compatible = "generic-fem-two-ctrl-pins";
3+
compatible = "radio-fem-two-ctrl-pins";
44
ctx-gpios = <&gpio0 26 0>;
55
ctx-settle-time-us = <5>;
66
crx-gpios = <&gpio0 27 0>;

0 commit comments

Comments
 (0)