Skip to content

Commit bf15fb9

Browse files
gmarullgmarull
committed
Revert "[nrf noup] dts: Select SoftDevice Controller DTS binding as default"
This reverts commit 8bc628d. Signed-off-by: Gerard Marull-Paretas <[email protected]>
1 parent b6f6d14 commit bf15fb9

File tree

63 files changed

+120
-365
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

+120
-365
lines changed

‎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
};
@@ -97,13 +97,12 @@
9797
status = "okay";
9898
ble-2mbps-supported;
9999

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

‎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
};
@@ -101,13 +101,12 @@
101101
status = "okay";
102102
ble-2mbps-supported;
103103

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

‎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
};
@@ -113,13 +113,12 @@
113113
status = "disabled";
114114
};
115115

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

‎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
};
@@ -115,13 +115,12 @@
115115
status = "disabled";
116116
};
117117

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

‎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
};
@@ -101,13 +101,12 @@
101101
status = "okay";
102102
ble-2mbps-supported;
103103

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

‎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
};
@@ -115,13 +115,12 @@
115115
status = "disabled";
116116
};
117117

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

‎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
};
@@ -103,13 +103,12 @@
103103
status = "disabled";
104104
};
105105

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

‎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
};

‎dts/arm/nordic/nrf54l_05_10_15_cpuapp.dtsi‎

Lines changed: 2 additions & 2 deletions
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_sdc;
18+
zephyr,bt-hci = &bt_hci_controller;
1919
zephyr,entropy = &psa_rng;
2020
};
2121

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

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

0 commit comments

Comments
 (0)