Skip to content

Commit 8bc628d

Browse files
rugeGerritsennordicjm
rugeGerritsen
authored and
nordicjm
committed
[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. It should therefore have its own device tree binding. This commit converts the SoftDevice Controller driver to use this new DTS binding instead of reusing the existing one. This commit updates or adds additional overlays for existing samples, applications and tests that were using the open source link layer. Signed-off-by: Rubin Gerritsen <[email protected]> (cherry picked from commit 8d6a853)
1 parent de051d6 commit 8bc628d

File tree

63 files changed

+365
-120
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+365
-120
lines changed

‎dts/arm/nordic/nrf52805.dtsi

+6-5
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
/ {
1313
chosen {
14-
zephyr,bt-hci = &bt_hci_controller;
14+
zephyr,bt-hci = &bt_hci_sdc;
1515
zephyr,entropy = &rng;
1616
zephyr,flash-controller = &flash_controller;
1717
};
@@ -97,12 +97,13 @@
9797
status = "okay";
9898
ble-2mbps-supported;
9999

100-
/* Note: In the nRF Connect SDK the SoftDevice Controller
101-
* is added and set as the default Bluetooth Controller.
102-
*/
100+
bt_hci_sdc: bt_hci_sdc {
101+
compatible = "nordic,bt-hci-sdc";
102+
status = "okay";
103+
};
103104
bt_hci_controller: bt_hci_controller {
104105
compatible = "zephyr,bt-hci-ll-sw-split";
105-
status = "okay";
106+
status = "disabled";
106107
};
107108
};
108109

‎dts/arm/nordic/nrf52810.dtsi

+6-5
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
/ {
99
chosen {
10-
zephyr,bt-hci = &bt_hci_controller;
10+
zephyr,bt-hci = &bt_hci_sdc;
1111
zephyr,entropy = &rng;
1212
zephyr,flash-controller = &flash_controller;
1313
};
@@ -101,12 +101,13 @@
101101
status = "okay";
102102
ble-2mbps-supported;
103103

104-
/* Note: In the nRF Connect SDK the SoftDevice Controller
105-
* is added and set as the default Bluetooth Controller.
106-
*/
104+
bt_hci_sdc: bt_hci_sdc {
105+
compatible = "nordic,bt-hci-sdc";
106+
status = "okay";
107+
};
107108
bt_hci_controller: bt_hci_controller {
108109
compatible = "zephyr,bt-hci-ll-sw-split";
109-
status = "okay";
110+
status = "disabled";
110111
};
111112
};
112113

‎dts/arm/nordic/nrf52811.dtsi

+6-5
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
/ {
1313
chosen {
14-
zephyr,bt-hci = &bt_hci_controller;
14+
zephyr,bt-hci = &bt_hci_sdc;
1515
zephyr,entropy = &rng;
1616
zephyr,flash-controller = &flash_controller;
1717
};
@@ -113,12 +113,13 @@
113113
status = "disabled";
114114
};
115115

116-
/* Note: In the nRF Connect SDK the SoftDevice Controller
117-
* is added and set as the default Bluetooth Controller.
118-
*/
116+
bt_hci_sdc: bt_hci_sdc {
117+
compatible = "nordic,bt-hci-sdc";
118+
status = "okay";
119+
};
119120
bt_hci_controller: bt_hci_controller {
120121
compatible = "zephyr,bt-hci-ll-sw-split";
121-
status = "okay";
122+
status = "disabled";
122123
};
123124
};
124125

‎dts/arm/nordic/nrf52820.dtsi

+6-5
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
/ {
1212

1313
chosen {
14-
zephyr,bt-hci = &bt_hci_controller;
14+
zephyr,bt-hci = &bt_hci_sdc;
1515
zephyr,entropy = &rng;
1616
zephyr,flash-controller = &flash_controller;
1717
};
@@ -115,12 +115,13 @@
115115
status = "disabled";
116116
};
117117

118-
/* Note: In the nRF Connect SDK another Bluetooth controller
119-
* is added and set as the default.
120-
*/
118+
bt_hci_sdc: bt_hci_sdc {
119+
compatible = "nordic,bt-hci-sdc";
120+
status = "okay";
121+
};
121122
bt_hci_controller: bt_hci_controller {
122123
compatible = "zephyr,bt-hci-ll-sw-split";
123-
status = "okay";
124+
status = "disabled";
124125
};
125126
};
126127

‎dts/arm/nordic/nrf52832.dtsi

+6-5
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
/ {
99
chosen {
10-
zephyr,bt-hci = &bt_hci_controller;
10+
zephyr,bt-hci = &bt_hci_sdc;
1111
zephyr,entropy = &rng;
1212
zephyr,flash-controller = &flash_controller;
1313
};
@@ -101,12 +101,13 @@
101101
status = "okay";
102102
ble-2mbps-supported;
103103

104-
/* Note: In the nRF Connect SDK the SoftDevice Controller
105-
* is added and set as the default Bluetooth Controller.
106-
*/
104+
bt_hci_sdc: bt_hci_sdc {
105+
compatible = "nordic,bt-hci-sdc";
106+
status = "okay";
107+
};
107108
bt_hci_controller: bt_hci_controller {
108109
compatible = "zephyr,bt-hci-ll-sw-split";
109-
status = "okay";
110+
status = "disabled";
110111
};
111112
};
112113

‎dts/arm/nordic/nrf52833.dtsi

+6-5
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
/ {
1313
chosen {
14-
zephyr,bt-hci = &bt_hci_controller;
14+
zephyr,bt-hci = &bt_hci_sdc;
1515
zephyr,entropy = &rng;
1616
zephyr,flash-controller = &flash_controller;
1717
};
@@ -115,12 +115,13 @@
115115
status = "disabled";
116116
};
117117

118-
/* Note: In the nRF Connect SDK the SoftDevice Controller
119-
* is added and set as the default Bluetooth Controller.
120-
*/
118+
bt_hci_sdc: bt_hci_sdc {
119+
compatible = "nordic,bt-hci-sdc";
120+
status = "okay";
121+
};
121122
bt_hci_controller: bt_hci_controller {
122123
compatible = "zephyr,bt-hci-ll-sw-split";
123-
status = "okay";
124+
status = "disabled";
124125
};
125126
};
126127

‎dts/arm/nordic/nrf52840.dtsi

+6-5
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
/ {
99
chosen {
10-
zephyr,bt-hci = &bt_hci_controller;
10+
zephyr,bt-hci = &bt_hci_sdc;
1111
zephyr,entropy = &cryptocell;
1212
zephyr,flash-controller = &flash_controller;
1313
};
@@ -103,12 +103,13 @@
103103
status = "disabled";
104104
};
105105

106-
/* Note: In the nRF Connect SDK the SoftDevice Controller
107-
* is added and set as the default Bluetooth Controller.
108-
*/
106+
bt_hci_sdc: bt_hci_sdc {
107+
compatible = "nordic,bt-hci-sdc";
108+
status = "okay";
109+
};
109110
bt_hci_controller: bt_hci_controller {
110111
compatible = "zephyr,bt-hci-ll-sw-split";
111-
status = "okay";
112+
status = "disabled";
112113
};
113114
};
114115

‎dts/arm/nordic/nrf5340_cpunet.dtsi

+6-5
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
/ {
1111
chosen {
12-
zephyr,bt-hci = &bt_hci_controller;
12+
zephyr,bt-hci = &bt_hci_sdc;
1313
zephyr,entropy = &rng;
1414
zephyr,flash-controller = &flash_controller;
1515
};
@@ -102,12 +102,13 @@
102102
status = "disabled";
103103
};
104104

105-
/* Note: In the nRF Connect SDK the SoftDevice Controller
106-
* is added and set as the default Bluetooth Controller.
107-
*/
105+
bt_hci_sdc: bt_hci_sdc {
106+
compatible = "nordic,bt-hci-sdc";
107+
status = "okay";
108+
};
108109
bt_hci_controller: bt_hci_controller {
109110
compatible = "zephyr,bt-hci-ll-sw-split";
110-
status = "okay";
111+
status = "disabled";
111112
};
112113
};
113114

‎dts/arm/nordic/nrf54h20_cpurad.dtsi

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ wdt011: &cpurad_wdt011 {};
2424

2525
/ {
2626
chosen {
27-
zephyr,bt-hci = &bt_hci_controller;
27+
zephyr,bt-hci = &bt_hci_sdc;
2828
};
2929

3030
soc {
@@ -104,6 +104,6 @@ wdt011: &cpurad_wdt011 {};
104104
status = "okay";
105105
};
106106

107-
&bt_hci_controller {
107+
&bt_hci_sdc {
108108
status = "okay";
109109
};

‎dts/arm/nordic/nrf54l_05_10_15_cpuapp.dtsi

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ nvic: &cpuapp_nvic {};
1515

1616
/ {
1717
chosen {
18-
zephyr,bt-hci = &bt_hci_controller;
18+
zephyr,bt-hci = &bt_hci_sdc;
1919
zephyr,entropy = &psa_rng;
2020
};
2121

@@ -31,7 +31,7 @@ nvic: &cpuapp_nvic {};
3131
};
3232
};
3333

34-
&bt_hci_controller {
34+
&bt_hci_sdc {
3535
status = "okay";
3636
};
3737

‎dts/common/nordic/nrf54h20.dtsi

+4-3
Original file line numberDiff line numberDiff line change
@@ -428,9 +428,10 @@
428428
status = "disabled";
429429
};
430430

431-
/* Note: In the nRF Connect SDK the SoftDevice Controller
432-
* is added and set as the default Bluetooth Controller.
433-
*/
431+
bt_hci_sdc: bt_hci_sdc {
432+
compatible = "nordic,bt-hci-sdc";
433+
status = "disabled";
434+
};
434435
bt_hci_controller: bt_hci_controller {
435436
compatible = "zephyr,bt-hci-ll-sw-split";
436437
status = "disabled";

‎dts/common/nordic/nrf54l_05_10_15.dtsi

+5-3
Original file line numberDiff line numberDiff line change
@@ -234,9 +234,11 @@
234234
status = "disabled";
235235
};
236236

237-
/* Note: In the nRF Connect SDK the SoftDevice Controller
238-
* is added and set as the default Bluetooth Controller.
239-
*/
237+
bt_hci_sdc: bt_hci_sdc {
238+
compatible = "nordic,bt-hci-sdc";
239+
status = "disabled";
240+
};
241+
240242
bt_hci_controller: bt_hci_controller {
241243
compatible = "zephyr,bt-hci-ll-sw-split";
242244
status = "disabled";

‎samples/bluetooth/bap_broadcast_sink/sample.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,7 @@ tests:
2424
- nrf52_bsim
2525
- nrf52833dk/nrf52833
2626
- nrf52840dongle/nrf52840
27-
extra_args: OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
27+
extra_args:
28+
- OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
29+
- SNIPPET="bt-ll-sw-split"
2830
tags: bluetooth

‎samples/bluetooth/bap_broadcast_source/sample.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,7 @@ tests:
2525
- nrf52_bsim
2626
- nrf52833dk/nrf52833
2727
- nrf52840dongle/nrf52840
28-
extra_args: OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
28+
extra_args:
29+
- OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
30+
- SNIPPET="bt-ll-sw-split"
2931
tags: bluetooth

‎samples/bluetooth/bap_broadcast_source/sysbuild.cmake

+4
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ if(SB_CONFIG_NET_CORE_IMAGE_HCI_IPC)
1818
CACHE INTERNAL ""
1919
)
2020

21+
list(APPEND ${NET_APP}_SNIPPET ${SNIPPET})
22+
list(APPEND ${NET_APP}_SNIPPET bt-ll-sw-split)
23+
set(${NET_APP}_SNIPPET ${${NET_APP}_SNIPPET} CACHE STRING "" FORCE)
24+
2125
native_simulator_set_child_images(${DEFAULT_IMAGE} ${NET_APP})
2226
endif()
2327

‎samples/bluetooth/bap_unicast_client/sample.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,7 @@ tests:
2222
- nrf52840dk/nrf52840
2323
integration_platforms:
2424
- nrf52dk/nrf52832
25-
extra_args: OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
25+
extra_args:
26+
- OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
27+
- SNIPPET="bt-ll-sw-split"
2628
tags: bluetooth

‎samples/bluetooth/bap_unicast_client/sysbuild.cmake

+4
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ if(SB_CONFIG_NET_CORE_IMAGE_HCI_IPC)
1818
CACHE INTERNAL ""
1919
)
2020

21+
list(APPEND ${NET_APP}_SNIPPET ${SNIPPET})
22+
list(APPEND ${NET_APP}_SNIPPET bt-ll-sw-split)
23+
set(${NET_APP}_SNIPPET ${${NET_APP}_SNIPPET} CACHE STRING "" FORCE)
24+
2125
native_simulator_set_child_images(${DEFAULT_IMAGE} ${NET_APP})
2226
endif()
2327

‎samples/bluetooth/bap_unicast_server/sample.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,7 @@ tests:
2222
- nrf52840dk/nrf52840
2323
integration_platforms:
2424
- nrf52dk/nrf52832
25-
extra_args: OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
25+
extra_args:
26+
- OVERLAY_CONFIG=overlay-bt_ll_sw_split.conf
27+
- SNIPPET="bt-ll-sw-split"
2628
tags: bluetooth

‎samples/bluetooth/bap_unicast_server/sysbuild.cmake

+4
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ if(SB_CONFIG_NET_CORE_IMAGE_HCI_IPC)
1818
CACHE INTERNAL ""
1919
)
2020

21+
list(APPEND ${NET_APP}_SNIPPET ${SNIPPET})
22+
list(APPEND ${NET_APP}_SNIPPET bt-ll-sw-split)
23+
set(${NET_APP}_SNIPPET ${${NET_APP}_SNIPPET} CACHE STRING "" FORCE)
24+
2125
native_simulator_set_child_images(${DEFAULT_IMAGE} ${NET_APP})
2226
endif()
2327

‎samples/bluetooth/beacon/sample.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ tests:
1616
- nrf52dk/nrf52832
1717
- nrf54l15dk/nrf54l15/cpuapp
1818
sample.bluetooth.beacon-coex:
19-
extra_args: CONF_FILE="prj-coex.conf"
19+
extra_args:
20+
- CONF_FILE="prj-coex.conf"
21+
- SNIPPET="bt-ll-sw-split"
2022
harness: bluetooth
2123
platform_allow:
2224
- nrf52840dk/nrf52840

‎samples/bluetooth/cap_initiator/sysbuild.cmake

+4
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ if(SB_CONFIG_NET_CORE_IMAGE_HCI_IPC)
1818
CACHE INTERNAL ""
1919
)
2020

21+
list(APPEND ${NET_APP}_SNIPPET ${SNIPPET})
22+
list(APPEND ${NET_APP}_SNIPPET bt-ll-sw-split)
23+
set(${NET_APP}_SNIPPET ${${NET_APP}_SNIPPET} CACHE STRING "" FORCE)
24+
2125
native_simulator_set_child_images(${DEFAULT_IMAGE} ${NET_APP})
2226
endif()
2327

‎samples/bluetooth/direction_finding_central/sample.yaml

+12-3
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,24 @@ tests:
1414
- nrf52833dk/nrf52833
1515
- nrf52833dk/nrf52820
1616
- nrf5340dk/nrf5340/cpuapp
17-
sample.bluetooth.direction_finding.central.aod:
17+
sample.bluetooth.direction_finding.central.aod_with_controller:
1818
harness: bluetooth
19-
extra_args: OVERLAY_CONFIG="overlay-aod.conf"
19+
extra_args:
20+
- OVERLAY_CONFIG="overlay-aod.conf"
21+
- SNIPPET="bt-ll-sw-split"
2022
platform_allow:
2123
- nrf52833dk/nrf52833
2224
- nrf52833dk/nrf52820
23-
- nrf5340dk/nrf5340/cpuapp
2425
tags: bluetooth
2526
integration_platforms:
2627
- nrf52833dk/nrf52833
2728
- nrf52833dk/nrf52820
29+
sample.bluetooth.direction_finding.central.aod_host_only:
30+
harness: bluetooth
31+
extra_args:
32+
- OVERLAY_CONFIG="overlay-aod.conf"
33+
platform_allow:
34+
- nrf5340dk/nrf5340/cpuapp
35+
tags: bluetooth
36+
integration_platforms:
2837
- nrf5340dk/nrf5340/cpuapp

0 commit comments

Comments
 (0)