Skip to content

Commit fef20ce

Browse files
rugeGerritsenrlubos
authored andcommitted
Revert "dts: Bluetooth: Add new DTS binding for the SoftDevice Controller"
This reverts commit d3b0802. Some tests broke, so reverting until things have been fixed properly. In addition the sdk-zephyr update is also reverted. Signed-off-by: Rubin Gerritsen <[email protected]>
1 parent dc44794 commit fef20ce

File tree

13 files changed

+3
-169
lines changed

13 files changed

+3
-169
lines changed

applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/app.overlay

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,3 @@
22
compatible = "nordic,nrf-spim";
33
status = "okay";
44
};
5-
6-
&bt_hci_controller {
7-
status = "okay";
8-
};
9-
10-
&bt_hci_sdc {
11-
status = "disabled";
12-
};
13-
14-
/ {
15-
chosen {
16-
zephyr,bt-hci = &bt_hci_controller;
17-
};
18-
};

applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/app.overlay

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
11
/ {
2-
chosen {
3-
zephyr,bt-hci = &bt_hci_controller;
4-
};
5-
62
/* Configure DTS nodes used for USB next HID support. */
73
hid_dev_0: hid_dev_0 {
84
compatible = "zephyr,hid-device";
@@ -63,11 +59,3 @@
6359
num-isoin-endpoints = <0>;
6460
num-isoout-endpoints = <0>;
6561
};
66-
67-
&bt_hci_controller {
68-
status = "okay";
69-
};
70-
71-
&bt_hci_sdc {
72-
status = "disabled";
73-
};

applications/nrf_desktop/configuration/nrf52833dk_nrf52820/app.overlay

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
11
/ {
2-
chosen {
3-
zephyr,bt-hci = &bt_hci_controller;
4-
};
5-
62
/* Configure DTS nodes used for USB next HID support. */
73
hid_dev_0: hid_dev_0 {
84
compatible = "zephyr,hid-device";
@@ -55,12 +51,3 @@
5551
num-isoin-endpoints = <0>;
5652
num-isoout-endpoints = <0>;
5753
};
58-
59-
&bt_hci_controller {
60-
status = "okay";
61-
};
62-
63-
64-
&bt_hci_sdc {
65-
status = "disabled";
66-
};

dts/bindings/bluetooth/nordic,bt-hci-sdc.yaml

Lines changed: 0 additions & 11 deletions
This file was deleted.

samples/bluetooth/direction_finding_central/sysbuild.cmake

Lines changed: 0 additions & 24 deletions
This file was deleted.

samples/bluetooth/direction_finding_connectionless_rx/sysbuild.cmake

Lines changed: 0 additions & 24 deletions
This file was deleted.

samples/bluetooth/direction_finding_connectionless_tx/sysbuild.cmake

Lines changed: 0 additions & 24 deletions
This file was deleted.

samples/bluetooth/direction_finding_peripheral/sysbuild.cmake

Lines changed: 0 additions & 24 deletions
This file was deleted.

samples/debug/ppi_trace/sysbuild.cmake

Lines changed: 0 additions & 19 deletions
This file was deleted.

subsys/bluetooth/controller/ecdh.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
#include "ecdh.h"
2020

21-
#define DT_DRV_COMPAT nordic_bt_hci_sdc
21+
#define DT_DRV_COMPAT zephyr_bt_hci_ll_sw_split
2222

2323
#define LOG_LEVEL CONFIG_BT_HCI_DRIVER_LOG_LEVEL
2424
#include "zephyr/logging/log.h"

0 commit comments

Comments
 (0)