Skip to content

Commit c352098

Browse files
bjarki-andreasenbjarki-andreasen
committed
Revert "[nrf noup] dts: Select SoftDevice Controller DTS binding as default"
This reverts commit 946fcec. Signed-off-by: Bjarki Arge Andreasen <[email protected]>
1 parent 7970c3b commit c352098

File tree

70 files changed

+127
-389
lines changed

Some content is hidden

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

70 files changed

+127
-389
lines changed

‎boards/nordic/nrf54l20pdk/nrf54l20_cpuapp_common.dtsi‎

Lines changed: 2 additions & 2 deletions
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
};
@@ -122,7 +122,7 @@
122122
status = "okay";
123123
};
124124

125-
&bt_hci_sdc {
125+
&bt_hci_controller {
126126
status = "okay";
127127
};
128128

‎dts/arm/nordic/nrf52805.dtsi‎

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

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

109-
bt_hci_sdc: bt_hci_sdc {
110-
compatible = "nordic,bt-hci-sdc";
111-
status = "okay";
112-
};
109+
/* Note: In the nRF Connect SDK the SoftDevice Controller
110+
* is added and set as the default Bluetooth Controller.
111+
*/
113112
bt_hci_controller: bt_hci_controller {
114113
compatible = "zephyr,bt-hci-ll-sw-split";
115-
status = "disabled";
114+
status = "okay";
116115
};
117116
};
118117

‎dts/arm/nordic/nrf52810.dtsi‎

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

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

113-
bt_hci_sdc: bt_hci_sdc {
114-
compatible = "nordic,bt-hci-sdc";
115-
status = "okay";
116-
};
113+
/* Note: In the nRF Connect SDK the SoftDevice Controller
114+
* is added and set as the default Bluetooth Controller.
115+
*/
117116
bt_hci_controller: bt_hci_controller {
118117
compatible = "zephyr,bt-hci-ll-sw-split";
119-
status = "disabled";
118+
status = "okay";
120119
};
121120
};
122121

‎dts/arm/nordic/nrf52811.dtsi‎

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

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

125-
bt_hci_sdc: bt_hci_sdc {
126-
compatible = "nordic,bt-hci-sdc";
127-
status = "okay";
128-
};
125+
/* Note: In the nRF Connect SDK the SoftDevice Controller
126+
* is added and set as the default Bluetooth Controller.
127+
*/
129128
bt_hci_controller: bt_hci_controller {
130129
compatible = "zephyr,bt-hci-ll-sw-split";
131-
status = "disabled";
130+
status = "okay";
132131
};
133132
};
134133

‎dts/arm/nordic/nrf52820.dtsi‎

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

1313
chosen {
14-
zephyr,bt-hci = &bt_hci_sdc;
14+
zephyr,bt-hci = &bt_hci_controller;
1515
zephyr,entropy = &rng;
1616
zephyr,flash-controller = &flash_controller;
1717
};
@@ -124,13 +124,12 @@
124124
status = "disabled";
125125
};
126126

127-
bt_hci_sdc: bt_hci_sdc {
128-
compatible = "nordic,bt-hci-sdc";
129-
status = "okay";
130-
};
127+
/* Note: In the nRF Connect SDK another Bluetooth controller
128+
* is added and set as the default.
129+
*/
131130
bt_hci_controller: bt_hci_controller {
132131
compatible = "zephyr,bt-hci-ll-sw-split";
133-
status = "disabled";
132+
status = "okay";
134133
};
135134
};
136135

‎dts/arm/nordic/nrf52832.dtsi‎

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

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

113-
bt_hci_sdc: bt_hci_sdc {
114-
compatible = "nordic,bt-hci-sdc";
115-
status = "okay";
116-
};
113+
/* Note: In the nRF Connect SDK the SoftDevice Controller
114+
* is added and set as the default Bluetooth Controller.
115+
*/
117116
bt_hci_controller: bt_hci_controller {
118117
compatible = "zephyr,bt-hci-ll-sw-split";
119-
status = "disabled";
118+
status = "okay";
120119
};
121120
};
122121

‎dts/arm/nordic/nrf52833.dtsi‎

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

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

127-
bt_hci_sdc: bt_hci_sdc {
128-
compatible = "nordic,bt-hci-sdc";
129-
status = "okay";
130-
};
127+
/* Note: In the nRF Connect SDK the SoftDevice Controller
128+
* is added and set as the default Bluetooth Controller.
129+
*/
131130
bt_hci_controller: bt_hci_controller {
132131
compatible = "zephyr,bt-hci-ll-sw-split";
133-
status = "disabled";
132+
status = "okay";
134133
};
135134
};
136135

‎dts/arm/nordic/nrf52840.dtsi‎

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

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

115-
bt_hci_sdc: bt_hci_sdc {
116-
compatible = "nordic,bt-hci-sdc";
117-
status = "okay";
118-
};
115+
/* Note: In the nRF Connect SDK the SoftDevice Controller
116+
* is added and set as the default Bluetooth Controller.
117+
*/
119118
bt_hci_controller: bt_hci_controller {
120119
compatible = "zephyr,bt-hci-ll-sw-split";
121-
status = "disabled";
120+
status = "okay";
122121
};
123122
};
124123

‎dts/arm/nordic/nrf5340_cpunet.dtsi‎

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

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

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

‎dts/arm/nordic/nrf54h20_cpurad.dtsi‎

Lines changed: 2 additions & 2 deletions
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_sdc;
27+
zephyr,bt-hci = &bt_hci_controller;
2828
};
2929

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

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

0 commit comments

Comments
 (0)