Skip to content

Commit e66b6cc

Browse files
ppryga-nordicrlubos
authored andcommitted
[nrf noup] dts: Select SoftDevice Controller DTS binding as default
The SoftDevice Controller is a different controller than the open source link layer with a different set of quirks. The SoftDevice Controller is a default BT controller in nRF Connect SDK context, therefore it should be enabled by default instead of open source link layer. The commit changes the default BT controller for nRF54lm20a SoC. Signed-off-by: Piotr Pryga <[email protected]>
1 parent 3279657 commit e66b6cc

File tree

4 files changed

+10
-9
lines changed

4 files changed

+10
-9
lines changed

boards/nordic/nrf54lm20dk/nrf54lm20a_cpuapp_common.dtsi

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
zephyr,bt-c2h-uart = &uart20;
1919
zephyr,flash-controller = &rram_controller;
2020
zephyr,flash = &cpuapp_rram;
21-
zephyr,bt-hci = &bt_hci_controller;
2221
zephyr,ieee802154 = &ieee802154;
2322
};
2423
};
@@ -131,10 +130,6 @@
131130
status = "okay";
132131
};
133132

134-
&bt_hci_controller {
135-
status = "okay";
136-
};
137-
138133
&ieee802154 {
139134
status = "okay";
140135
};

boards/nordic/nrf54lm20dk/nrf54lm20dk_nrf54lm20a_cpuapp.dts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,5 @@
1818
};
1919
};
2020

21-
&bt_hci_controller {
22-
status = "okay";
23-
};
24-
2521
/* Get a node label for wi-fi spi to use in shield files */
2622
wifi_spi: &spi22 {};

dts/arm/nordic/nrf54lm20a_enga_cpuapp.dtsi

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ nvic: &cpuapp_nvic {};
1717

1818
/ {
1919
chosen {
20+
zephyr,bt-hci = &bt_hci_sdc;
2021
zephyr,entropy = &psa_rng;
2122
};
2223

@@ -37,6 +38,10 @@ nvic: &cpuapp_nvic {};
3738
};
3839
};
3940

41+
&bt_hci_sdc {
42+
status = "okay";
43+
};
44+
4045
&cpuflpr_vpr {
4146
cpuapp_vevif_rx: mailbox@1 {
4247
compatible = "nordic,nrf-vevif-event-rx";

dts/vendor/nordic/nrf54lm20a.dtsi

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,11 @@
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+
280285
bt_hci_controller: bt_hci_controller {
281286
compatible = "zephyr,bt-hci-ll-sw-split";
282287
status = "disabled";

0 commit comments

Comments
 (0)