Skip to content

board: nrf: Fix nRF54LM20DK upstream Bluetooth Controller supported #93194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 19, 2025
Merged

board: nrf: Fix nRF54LM20DK upstream Bluetooth Controller supported #93194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion boards/nordic/nrf54lm20dk/nrf54lm20a_cpuapp_common.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
zephyr,bt-c2h-uart = &uart20;
zephyr,flash-controller = &rram_controller;
zephyr,flash = &cpuapp_rram;
zephyr,bt-hci = &bt_hci_sdc;
zephyr,bt-hci = &bt_hci_controller;
zephyr,ieee802154 = &ieee802154;
};
};
Expand Down
6 changes: 1 addition & 5 deletions boards/nordic/nrf54lm20dk/nrf54lm20dk_nrf54lm20a_cpuapp.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,8 @@
};
};

&bt_hci_sdc {
status = "okay";
};

&bt_hci_controller {
status = "disabled";
status = "okay";
};

/* Get a node label for wi-fi spi to use in shield files */
Expand Down
5 changes: 0 additions & 5 deletions dts/vendor/nordic/nrf54lm20a.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,11 +277,6 @@
/* Note: In the nRF Connect SDK the SoftDevice Controller
* is added and set as the default Bluetooth Controller.
*/
bt_hci_sdc: bt_hci_sdc {
compatible = "nordic,bt-hci-sdc";
status = "disabled";
};

bt_hci_controller: bt_hci_controller {
compatible = "zephyr,bt-hci-ll-sw-split";
status = "disabled";
Expand Down
12 changes: 12 additions & 0 deletions samples/bluetooth/hci_uart/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
/*
* Copyright (c) 2024 Nordic Semiconductor ASA
*
* SPDX-License-Identifier: Apache-2.0
*/

&uart20 {
compatible = "nordic,nrf-uarte";
current-speed = <1000000>;
status = "okay";
hw-flow-control;
};
33 changes: 33 additions & 0 deletions samples/bluetooth/hci_uart/boards/nrf54lm20dk_nrf54lm20a_cpuapp_df.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
/*
* Copyright (c) 2024 Nordic Semiconductor ASA
*
* SPDX-License-Identifier: Apache-2.0
*/

&uart20 {
compatible = "nordic,nrf-uarte";
current-speed = <1000000>;
status = "okay";
hw-flow-control;
};

&radio {
status = "okay";
/* This is an example number of antennas that may be available
* on antenna matrix board.
*/
dfe-antenna-num = <10>;
/* This is an example switch pattern that will be used to set an
* antenna for Tx PDU (period before start of Tx CTE).
*/
dfe-pdu-antenna = <0x0>;

/* These are example GPIO pin numbers that are provided to
* Radio peripheral. The pins will be acquired by Radio to
* drive antenna switching when AoD is enabled.
*/
dfegpio0-gpios = <&gpio1 4 0>;
dfegpio1-gpios = <&gpio1 5 0>;
dfegpio2-gpios = <&gpio1 6 0>;
dfegpio3-gpios = <&gpio1 7 0>;
};
15 changes: 15 additions & 0 deletions samples/bluetooth/hci_uart/sample.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,14 @@ tests:
- nrf52dk/nrf52832
- nrf52840dk/nrf52840
- nrf21540dk/nrf52840
- nrf54l15dk/nrf54l15/cpuapp
- nrf54lm20dk/nrf54lm20a/cpuapp
integration_platforms:
- nrf52dk/nrf52832
- nrf52840dk/nrf52840
- nrf21540dk/nrf52840
- nrf54l15dk/nrf54l15/cpuapp
- nrf54lm20dk/nrf54lm20a/cpuapp
tags:
- uart
- bluetooth
Expand Down Expand Up @@ -98,3 +102,14 @@ tests:
tags:
- uart
- bluetooth
sample.bluetooth.hci_uart.nrf54lm20a.all:
harness: bluetooth
platform_allow: nrf54lm20dk/nrf54lm20a/cpuapp
integration_platforms:
- nrf54lm20dk/nrf54lm20a/cpuapp
extra_args:
- EXTRA_CONF_FILE=overlay-all-bt_ll_sw_split.conf
- DTC_OVERLAY_FILE=./boards/nrf54lm20dk_nrf54lm20a_cpuapp_df.overlay
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouldn't the /boards/nrf54lm20dk_nrf54lm20a_cpuapp_df.overlay be automatically applied when building?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For a board revision / qualifier nrf54lm20dk/nrf54lm20a/cpuapp then boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay is picked.

I tried west build samples/bluetooth/hci_uart -b nrf54lm20dk/nrf54lm20a/cpuapp@df -- -DEXTRA_CONF_FILE=overlay-all-bt_ll_sw_split.conf does not build

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, missed the _df part :)

tags:
- uart
- bluetooth