Skip to content

Commit f4392ed

Browse files
rugeGerritsenbjarki-andreasen
rugeGerritsen
authored and
bjarki-andreasen
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]> Signed-off-by: Kristoffer Rist Skøien <[email protected]> Signed-off-by: Rafał Kuźnia <[email protected]> (cherry picked from commit 946fcec) (cherry picked from commit 6d216e1)
1 parent 320eeb5 commit f4392ed

File tree

70 files changed

+1366
-122
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

+1366
-122
lines changed

‎boards/nordic/nrf54l20pdk/nrf54l20_cpuapp_common.dtsi‎

Lines changed: 131 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,131 @@
1+
/*
2+
* Copyright (c) 2024 Nordic Semiconductor ASA
3+
*
4+
* SPDX-License-Identifier: Apache-2.0
5+
*/
6+
7+
/* This file is common to the secure and non-secure domain */
8+
9+
#include <nordic/nrf54l20_enga_cpuapp.dtsi>
10+
#include "nrf54l20pdk_nrf54l20-common.dtsi"
11+
12+
/ {
13+
chosen {
14+
zephyr,console = &uart20;
15+
zephyr,shell-uart = &uart20;
16+
zephyr,uart-mcumgr = &uart20;
17+
zephyr,bt-mon-uart = &uart20;
18+
zephyr,bt-c2h-uart = &uart20;
19+
zephyr,flash-controller = &rram_controller;
20+
zephyr,flash = &cpuapp_rram;
21+
zephyr,bt-hci = &bt_hci_sdc;
22+
zephyr,ieee802154 = &ieee802154;
23+
};
24+
};
25+
26+
&cpuapp_sram {
27+
status = "okay";
28+
};
29+
30+
&lfxo {
31+
load-capacitors = "internal";
32+
load-capacitance-femtofarad = <15500>;
33+
};
34+
35+
&hfxo {
36+
load-capacitors = "internal";
37+
load-capacitance-femtofarad = <15000>;
38+
};
39+
40+
&grtc {
41+
owned-channels = <0 1 2 3 4 5 6 7 8 9 10 11>;
42+
/* Channels 7-11 reserved for Zero Latency IRQs, 3-4 for FLPR */
43+
child-owned-channels = <3 4 7 8 9 10 11>;
44+
status = "okay";
45+
};
46+
47+
&cpuapp_rram {
48+
partitions {
49+
compatible = "fixed-partitions";
50+
#address-cells = <1>;
51+
#size-cells = <1>;
52+
53+
boot_partition: partition@0 {
54+
label = "mcuboot";
55+
reg = <0x0 DT_SIZE_K(64)>;
56+
};
57+
58+
slot0_partition: partition@10000 {
59+
label = "image-0";
60+
reg = <0x10000 DT_SIZE_K(449)>;
61+
};
62+
63+
slot0_ns_partition: partition@80400 {
64+
label = "image-0-nonsecure";
65+
reg = <0x80400 DT_SIZE_K(449)>;
66+
};
67+
68+
slot1_partition: partition@f0800 {
69+
label = "image-1";
70+
reg = <0xf0800 DT_SIZE_K(449)>;
71+
};
72+
73+
slot1_ns_partition: partition@160c00 {
74+
label = "image-1-nonsecure";
75+
reg = <0x160c00 DT_SIZE_K(449)>;
76+
};
77+
78+
storage_partition: partition@1d1000 {
79+
label = "storage";
80+
reg = <0x1d1000 DT_SIZE_K(36)>;
81+
};
82+
};
83+
};
84+
85+
&uart20 {
86+
status = "okay";
87+
};
88+
89+
&nfct {
90+
status = "okay";
91+
};
92+
93+
&gpio0 {
94+
status = "okay";
95+
};
96+
97+
&gpio1 {
98+
status = "okay";
99+
};
100+
101+
&gpio2 {
102+
status = "okay";
103+
};
104+
105+
&gpiote20 {
106+
status = "okay";
107+
};
108+
109+
&gpiote30 {
110+
status = "okay";
111+
};
112+
113+
&radio {
114+
status = "okay";
115+
};
116+
117+
&temp {
118+
status = "okay";
119+
};
120+
121+
&clock {
122+
status = "okay";
123+
};
124+
125+
&bt_hci_sdc {
126+
status = "okay";
127+
};
128+
129+
&ieee802154 {
130+
status = "okay";
131+
};

‎dts/arm/nordic/nrf52805.dtsi‎

Lines changed: 6 additions & 5 deletions
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
};
@@ -106,12 +106,13 @@
106106
status = "okay";
107107
ble-2mbps-supported;
108108

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

‎dts/arm/nordic/nrf52810.dtsi‎

Lines changed: 6 additions & 5 deletions
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
};
@@ -110,12 +110,13 @@
110110
status = "okay";
111111
ble-2mbps-supported;
112112

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

‎dts/arm/nordic/nrf52811.dtsi‎

Lines changed: 6 additions & 5 deletions
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
};
@@ -122,12 +122,13 @@
122122
status = "disabled";
123123
};
124124

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

‎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
};
@@ -123,12 +123,13 @@
123123
status = "disabled";
124124
};
125125

126-
/* Note: In the nRF Connect SDK another Bluetooth controller
127-
* is added and set as the default.
128-
*/
126+
bt_hci_sdc: bt_hci_sdc {
127+
compatible = "nordic,bt-hci-sdc";
128+
status = "okay";
129+
};
129130
bt_hci_controller: bt_hci_controller {
130131
compatible = "zephyr,bt-hci-ll-sw-split";
131-
status = "okay";
132+
status = "disabled";
132133
};
133134
};
134135

‎dts/arm/nordic/nrf52832.dtsi‎

Lines changed: 6 additions & 5 deletions
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
};
@@ -110,12 +110,13 @@
110110
status = "okay";
111111
ble-2mbps-supported;
112112

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

‎dts/arm/nordic/nrf52833.dtsi‎

Lines changed: 6 additions & 5 deletions
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
};
@@ -124,12 +124,13 @@
124124
status = "disabled";
125125
};
126126

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

‎dts/arm/nordic/nrf52840.dtsi‎

Lines changed: 6 additions & 5 deletions
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
};
@@ -112,12 +112,13 @@
112112
status = "disabled";
113113
};
114114

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

‎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
@@ -32,7 +32,7 @@ wdt011: &cpurad_wdt011 {};
3232

3333
/ {
3434
chosen {
35-
zephyr,bt-hci = &bt_hci_controller;
35+
zephyr,bt-hci = &bt_hci_sdc;
3636
};
3737

3838
soc {
@@ -136,6 +136,6 @@ wdt011: &cpurad_wdt011 {};
136136
status = "okay";
137137
};
138138

139-
&bt_hci_controller {
139+
&bt_hci_sdc {
140140
status = "okay";
141141
};

0 commit comments

Comments
 (0)