Skip to content

Commit 02f5447

Browse files
rugeGerritsenrlubos
rugeGerritsen
authored and
rlubos
committed
[nrf noup] dts: Select SoftDevice Controller DTS binding as default
In the nRF Connect SDK the SoftDevice Controller is the default Bluetooth controller. This commit uses the SoftDevice Controller specific device tree binding for this purpose. The existing device tree binding for the open source link layer is kept but disabled. This makes it possible to enable it using a device tree overlay. Signed-off-by: Rubin Gerritsen <[email protected]>
1 parent dc16886 commit 02f5447

File tree

12 files changed

+60
-50
lines changed

12 files changed

+60
-50
lines changed

‎dts/arm/nordic/nrf52805.dtsi‎

Lines changed: 6 additions & 5 deletions
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
};
@@ -88,12 +88,13 @@
8888
status = "okay";
8989
ble-2mbps-supported;
9090

91-
/* Note: In the nRF Connect SDK the SoftDevice Controller
92-
* is added and set as the default Bluetooth Controller.
93-
*/
91+
bt_hci_sdc: bt_hci_sdc {
92+
compatible = "nordic,bt-hci-sdc";
93+
status = "okay";
94+
};
9495
bt_hci_controller: bt_hci_controller {
9596
compatible = "zephyr,bt-hci-ll-sw-split";
96-
status = "okay";
97+
status = "disabled";
9798
};
9899
};
99100

‎dts/arm/nordic/nrf52810.dtsi‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
/ {
77
chosen {
8-
zephyr,bt-hci = &bt_hci_controller;
8+
zephyr,bt-hci = &bt_hci_sdc;
99
zephyr,entropy = &rng;
1010
zephyr,flash-controller = &flash_controller;
1111
};
@@ -92,12 +92,13 @@
9292
status = "okay";
9393
ble-2mbps-supported;
9494

95-
/* Note: In the nRF Connect SDK the SoftDevice Controller
96-
* is added and set as the default Bluetooth Controller.
97-
*/
95+
bt_hci_sdc: bt_hci_sdc {
96+
compatible = "nordic,bt-hci-sdc";
97+
status = "okay";
98+
};
9899
bt_hci_controller: bt_hci_controller {
99100
compatible = "zephyr,bt-hci-ll-sw-split";
100-
status = "okay";
101+
status = "disabled";
101102
};
102103
};
103104

‎dts/arm/nordic/nrf52811.dtsi‎

Lines changed: 6 additions & 5 deletions
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
};
@@ -104,12 +104,13 @@
104104
status = "disabled";
105105
};
106106

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

‎dts/arm/nordic/nrf52820.dtsi‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
/ {
1111

1212
chosen {
13-
zephyr,bt-hci = &bt_hci_controller;
13+
zephyr,bt-hci = &bt_hci_sdc;
1414
zephyr,entropy = &rng;
1515
zephyr,flash-controller = &flash_controller;
1616
};
@@ -100,12 +100,13 @@
100100
status = "disabled";
101101
};
102102

103-
/* Note: In the nRF Connect SDK another Bluetooth controller
104-
* is added and set as the default.
105-
*/
103+
bt_hci_sdc: bt_hci_sdc {
104+
compatible = "nordic,bt-hci-sdc";
105+
status = "okay";
106+
};
106107
bt_hci_controller: bt_hci_controller {
107108
compatible = "zephyr,bt-hci-ll-sw-split";
108-
status = "okay";
109+
status = "disabled";
109110
};
110111
};
111112

‎dts/arm/nordic/nrf52832.dtsi‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
/ {
77
chosen {
8-
zephyr,bt-hci = &bt_hci_controller;
8+
zephyr,bt-hci = &bt_hci_sdc;
99
zephyr,entropy = &rng;
1010
zephyr,flash-controller = &flash_controller;
1111
};
@@ -92,12 +92,13 @@
9292
status = "okay";
9393
ble-2mbps-supported;
9494

95-
/* Note: In the nRF Connect SDK the SoftDevice Controller
96-
* is added and set as the default Bluetooth Controller.
97-
*/
95+
bt_hci_sdc: bt_hci_sdc {
96+
compatible = "nordic,bt-hci-sdc";
97+
status = "okay";
98+
};
9899
bt_hci_controller: bt_hci_controller {
99100
compatible = "zephyr,bt-hci-ll-sw-split";
100-
status = "okay";
101+
status = "disabled";
101102
};
102103
};
103104

‎dts/arm/nordic/nrf52833.dtsi‎

Lines changed: 6 additions & 5 deletions
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
};
@@ -99,12 +99,13 @@
9999
status = "disabled";
100100
};
101101

102-
/* Note: In the nRF Connect SDK the SoftDevice Controller
103-
* is added and set as the default Bluetooth Controller.
104-
*/
102+
bt_hci_sdc: bt_hci_sdc {
103+
compatible = "nordic,bt-hci-sdc";
104+
status = "okay";
105+
};
105106
bt_hci_controller: bt_hci_controller {
106107
compatible = "zephyr,bt-hci-ll-sw-split";
107-
status = "okay";
108+
status = "disabled";
108109
};
109110
};
110111

‎dts/arm/nordic/nrf52840.dtsi‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
/ {
77
chosen {
8-
zephyr,bt-hci = &bt_hci_controller;
8+
zephyr,bt-hci = &bt_hci_sdc;
99
zephyr,entropy = &cryptocell;
1010
zephyr,flash-controller = &flash_controller;
1111
};
@@ -94,12 +94,13 @@
9494
status = "disabled";
9595
};
9696

97-
/* Note: In the nRF Connect SDK the SoftDevice Controller
98-
* is added and set as the default Bluetooth Controller.
99-
*/
97+
bt_hci_sdc: bt_hci_sdc {
98+
compatible = "nordic,bt-hci-sdc";
99+
status = "okay";
100+
};
100101
bt_hci_controller: bt_hci_controller {
101102
compatible = "zephyr,bt-hci-ll-sw-split";
102-
status = "okay";
103+
status = "disabled";
103104
};
104105
};
105106

‎dts/arm/nordic/nrf5340_cpunet.dtsi‎

Lines changed: 6 additions & 5 deletions
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‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ wdt011: &cpurad_wdt011 {};
2222

2323
/ {
2424
chosen {
25-
zephyr,bt-hci = &bt_hci_controller;
25+
zephyr,bt-hci = &bt_hci_sdc;
2626
};
2727

2828
soc {
@@ -97,6 +97,6 @@ wdt011: &cpurad_wdt011 {};
9797
status = "okay";
9898
};
9999

100-
&bt_hci_controller {
100+
&bt_hci_sdc {
101101
status = "okay";
102102
};

‎dts/arm/nordic/nrf54l15_cpuapp.dtsi‎

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

1818
/ {
1919
chosen {
20-
zephyr,bt-hci = &bt_hci_controller;
20+
zephyr,bt-hci = &bt_hci_sdc;
2121
zephyr,entropy = &psa_rng;
2222
};
2323

@@ -33,7 +33,7 @@ nvic: &cpuapp_nvic {};
3333
};
3434
};
3535

36-
&bt_hci_controller {
36+
&bt_hci_sdc {
3737
status = "okay";
3838
};
3939

0 commit comments

Comments
 (0)