Skip to content

Commit 43e8753

Browse files
cvinayaknashif
authored andcommitted
board: nrf: Fix nRF54LM20DK upstream Bluetooth Controller supported
Fix nRF54LM20DK upstream Bluetooth Controller supported. Relates to commit 3d1fa8b ("board: nrf: Add nRF54LM20DK board"). Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
1 parent 3d93657 commit 43e8753

File tree

6 files changed

+62
-11
lines changed

6 files changed

+62
-11
lines changed

boards/nordic/nrf54lm20dk/nrf54lm20a_cpuapp_common.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
zephyr,bt-c2h-uart = &uart20;
1919
zephyr,flash-controller = &rram_controller;
2020
zephyr,flash = &cpuapp_rram;
21-
zephyr,bt-hci = &bt_hci_sdc;
21+
zephyr,bt-hci = &bt_hci_controller;
2222
zephyr,ieee802154 = &ieee802154;
2323
};
2424
};

boards/nordic/nrf54lm20dk/nrf54lm20dk_nrf54lm20a_cpuapp.dts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,8 @@
1818
};
1919
};
2020

21-
&bt_hci_sdc {
22-
status = "okay";
23-
};
24-
2521
&bt_hci_controller {
26-
status = "disabled";
22+
status = "okay";
2723
};
2824

2925
/* Get a node label for wi-fi spi to use in shield files */

dts/vendor/nordic/nrf54lm20a.dtsi

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -277,11 +277,6 @@
277277
/* Note: In the nRF Connect SDK the SoftDevice Controller
278278
* is added and set as the default Bluetooth Controller.
279279
*/
280-
bt_hci_sdc: bt_hci_sdc {
281-
compatible = "nordic,bt-hci-sdc";
282-
status = "disabled";
283-
};
284-
285280
bt_hci_controller: bt_hci_controller {
286281
compatible = "zephyr,bt-hci-ll-sw-split";
287282
status = "disabled";
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
/*
2+
* Copyright (c) 2024 Nordic Semiconductor ASA
3+
*
4+
* SPDX-License-Identifier: Apache-2.0
5+
*/
6+
7+
&uart20 {
8+
compatible = "nordic,nrf-uarte";
9+
current-speed = <1000000>;
10+
status = "okay";
11+
hw-flow-control;
12+
};
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
/*
2+
* Copyright (c) 2024 Nordic Semiconductor ASA
3+
*
4+
* SPDX-License-Identifier: Apache-2.0
5+
*/
6+
7+
&uart20 {
8+
compatible = "nordic,nrf-uarte";
9+
current-speed = <1000000>;
10+
status = "okay";
11+
hw-flow-control;
12+
};
13+
14+
&radio {
15+
status = "okay";
16+
/* This is an example number of antennas that may be available
17+
* on antenna matrix board.
18+
*/
19+
dfe-antenna-num = <10>;
20+
/* This is an example switch pattern that will be used to set an
21+
* antenna for Tx PDU (period before start of Tx CTE).
22+
*/
23+
dfe-pdu-antenna = <0x0>;
24+
25+
/* These are example GPIO pin numbers that are provided to
26+
* Radio peripheral. The pins will be acquired by Radio to
27+
* drive antenna switching when AoD is enabled.
28+
*/
29+
dfegpio0-gpios = <&gpio1 4 0>;
30+
dfegpio1-gpios = <&gpio1 5 0>;
31+
dfegpio2-gpios = <&gpio1 6 0>;
32+
dfegpio3-gpios = <&gpio1 7 0>;
33+
};

samples/bluetooth/hci_uart/sample.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,14 @@ tests:
88
- nrf52dk/nrf52832
99
- nrf52840dk/nrf52840
1010
- nrf21540dk/nrf52840
11+
- nrf54l15dk/nrf54l15/cpuapp
12+
- nrf54lm20dk/nrf54lm20a/cpuapp
1113
integration_platforms:
1214
- nrf52dk/nrf52832
1315
- nrf52840dk/nrf52840
1416
- nrf21540dk/nrf52840
17+
- nrf54l15dk/nrf54l15/cpuapp
18+
- nrf54lm20dk/nrf54lm20a/cpuapp
1519
tags:
1620
- uart
1721
- bluetooth
@@ -98,3 +102,14 @@ tests:
98102
tags:
99103
- uart
100104
- bluetooth
105+
sample.bluetooth.hci_uart.nrf54lm20a.all:
106+
harness: bluetooth
107+
platform_allow: nrf54lm20dk/nrf54lm20a/cpuapp
108+
integration_platforms:
109+
- nrf54lm20dk/nrf54lm20a/cpuapp
110+
extra_args:
111+
- EXTRA_CONF_FILE=overlay-all-bt_ll_sw_split.conf
112+
- DTC_OVERLAY_FILE=./boards/nrf54lm20dk_nrf54lm20a_cpuapp_df.overlay
113+
tags:
114+
- uart
115+
- bluetooth

0 commit comments

Comments
 (0)