Bluetooth: controller: Update to new HCI driver API

Update the native controller to the new HCI driver API. The devicetree node is placed under existing `radio` nodes, which seemed like the most intuitive option. Signed-off-by: Johan Hedberg <[email protected]>
zephyrproject-rtos · May 5, 2024 · 4f65c0e · 4f65c0e
1 parent 858cffd
commit 4f65c0e
Show file tree

Hide file tree

Showing 10 changed files with 124 additions and 35 deletions.
diff --git a/dts/arm/nordic/nrf51822.dtsi b/dts/arm/nordic/nrf51822.dtsi
@@ -5,6 +5,7 @@
 
 / {
 	chosen {
+		zephyr,bt-hci = &bt_hci;
 		zephyr,entropy = &rng;
 		zephyr,flash-controller = &flash_controller;
 	};
@@ -73,6 +74,11 @@
 			reg = <0x40001000 0x1000>;
 			interrupts = <1 NRF_DEFAULT_IRQ_PRIORITY>;
 			status = "okay";
+
+			bt_hci: bt_hci {
+				compatible = "zephyr,bt-hci-controller";
+				status = "okay";
+			};
 		};
 
 		uart0: uart@40002000 {

diff --git a/dts/arm/nordic/nrf52805.dtsi b/dts/arm/nordic/nrf52805.dtsi
@@ -9,6 +9,7 @@
 
 / {
 	chosen {
+		zephyr,bt-hci = &bt_hci;
 		zephyr,entropy = &rng;
 		zephyr,flash-controller = &flash_controller;
 	};
@@ -86,6 +87,11 @@
 			interrupts = <1 NRF_DEFAULT_IRQ_PRIORITY>;
 			status = "okay";
 			ble-2mbps-supported;
+
+			bt_hci: bt_hci {
+				compatible = "zephyr,bt-hci-controller";
+				status = "okay";
+			};
 		};
 
 		uart0: uart@40002000 {

diff --git a/dts/arm/nordic/nrf52810.dtsi b/dts/arm/nordic/nrf52810.dtsi
@@ -5,6 +5,7 @@
 
 / {
 	chosen {
+		zephyr,bt-hci = &bt_hci;
 		zephyr,entropy = &rng;
 		zephyr,flash-controller = &flash_controller;
 	};
@@ -90,6 +91,11 @@
 			interrupts = <1 NRF_DEFAULT_IRQ_PRIORITY>;
 			status = "okay";
 			ble-2mbps-supported;
+
+			bt_hci: bt_hci {
+				compatible = "zephyr,bt-hci-controller";
+				status = "okay";
+			};
 		};
 
 		uart0: uart@40002000 {

diff --git a/dts/arm/nordic/nrf52811.dtsi b/dts/arm/nordic/nrf52811.dtsi
@@ -9,6 +9,7 @@
 
 / {
 	chosen {
+		zephyr,bt-hci = &bt_hci;
 		zephyr,entropy = &rng;
 		zephyr,flash-controller = &flash_controller;
 	};
@@ -102,6 +103,11 @@
 				compatible = "nordic,nrf-ieee802154";
 				status = "disabled";
 			};
+
+			bt_hci: bt_hci {
+				compatible = "zephyr,bt-hci-controller";
+				status = "okay";
+			};
 		};
 
 		uart0: uart@40002000 {

diff --git a/dts/arm/nordic/nrf52820.dtsi b/dts/arm/nordic/nrf52820.dtsi
@@ -10,6 +10,7 @@
 / {
 
 	chosen {
+		zephyr,bt-hci = &bt_hci;
 		zephyr,entropy = &rng;
 		zephyr,flash-controller = &flash_controller;
 	};
@@ -98,6 +99,11 @@
 				compatible = "nordic,nrf-ieee802154";
 				status = "disabled";
 			};
+
+			bt_hci: bt_hci {
+				compatible = "zephyr,bt-hci-controller";
+				status = "okay";
+			};
 		};
 
 		uart0: uart@40002000 {

diff --git a/dts/arm/nordic/nrf52832.dtsi b/dts/arm/nordic/nrf52832.dtsi
@@ -5,6 +5,7 @@
 
 / {
 	chosen {
+		zephyr,bt-hci = &bt_hci;
 		zephyr,entropy = &rng;
 		zephyr,flash-controller = &flash_controller;
 	};
@@ -90,6 +91,11 @@
 			interrupts = <1 NRF_DEFAULT_IRQ_PRIORITY>;
 			status = "okay";
 			ble-2mbps-supported;
+
+			bt_hci: bt_hci {
+				compatible = "zephyr,bt-hci-controller";
+				status = "okay";
+			};
 		};
 
 		uart0: uart@40002000 {

diff --git a/dts/arm/nordic/nrf52833.dtsi b/dts/arm/nordic/nrf52833.dtsi
@@ -9,6 +9,7 @@
 
 / {
 	chosen {
+		zephyr,bt-hci = &bt_hci;
 		zephyr,entropy = &rng;
 		zephyr,flash-controller = &flash_controller;
 	};
@@ -97,6 +98,11 @@
 				compatible = "nordic,nrf-ieee802154";
 				status = "disabled";
 			};
+
+			bt_hci: bt_hci {
+				compatible = "zephyr,bt-hci-controller";
+				status = "okay";
+			};
 		};
 
 		uart0: uart@40002000 {

diff --git a/dts/arm/nordic/nrf52840.dtsi b/dts/arm/nordic/nrf52840.dtsi
@@ -5,6 +5,7 @@
 
 / {
 	chosen {
+		zephyr,bt-hci = &bt_hci;
 		zephyr,entropy = &rng;
 		zephyr,flash-controller = &flash_controller;
 	};
@@ -92,6 +93,11 @@
 				compatible = "nordic,nrf-ieee802154";
 				status = "disabled";
 			};
+
+			bt_hci: bt_hci {
+				compatible = "zephyr,bt-hci-controller";
+				status = "okay";
+			};
 		};
 
 		uart0: uart@40002000 {

diff --git a/dts/arm/nordic/nrf5340_cpunet.dtsi b/dts/arm/nordic/nrf5340_cpunet.dtsi
@@ -9,6 +9,7 @@
 
 / {
 	chosen {
+		zephyr,bt-hci = &bt_hci;
 		zephyr,entropy = &rng;
 		zephyr,flash-controller = &flash_controller;
 	};
@@ -100,6 +101,11 @@
 				compatible = "nordic,nrf-ieee802154";
 				status = "disabled";
 			};
+
+			bt_hci: bt_hci {
+				compatible = "zephyr,bt-hci-controller";
+				status = "okay";
+			};
 		};
 
 		rng: random@41009000 {