From ae27d318f40ab94fea2ffaa82f43f1124695445c Mon Sep 17 00:00:00 2001
From: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
Date: Tue, 16 Jul 2024 14:43:30 +0200
Subject: [PATCH] [nrf noup] dts: Add Bluetooth Controller to nRF54H20

The nRF54H20 supports a Bluetooth controller.
The HCI driver interface has changed upstream in
https://github.com/zephyrproject-rtos/zephyr/pull/72323
so now we need to add it to device tree.

Signed-off-by: Rubin Gerritsen <rubin.gerritsen@nordicsemi.no>
---
 dts/arm/nordic/nrf54h20_cpurad.dtsi | 8 ++++++++
 dts/common/nordic/nrf54h20.dtsi     | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/dts/arm/nordic/nrf54h20_cpurad.dtsi b/dts/arm/nordic/nrf54h20_cpurad.dtsi
index 2d2fdee8d27..2cfda47afc5 100644
--- a/dts/arm/nordic/nrf54h20_cpurad.dtsi
+++ b/dts/arm/nordic/nrf54h20_cpurad.dtsi
@@ -23,6 +23,10 @@ wdt011: &cpurad_wdt011 {};
 /delete-node/ &cpuflpr;
 
 / {
+	chosen {
+		zephyr,bt-hci = &bt_hci_controller;
+	};
+
 	soc {
 		compatible = "simple-bus";
 		interrupt-parent = <&cpurad_nvic>;
@@ -99,3 +103,7 @@ wdt011: &cpurad_wdt011 {};
 &dppic020 {
 	status = "okay";
 };
+
+&bt_hci_controller {
+	status = "okay";
+};
diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi
index 5730164b412..62ba6e56ca7 100644
--- a/dts/common/nordic/nrf54h20.dtsi
+++ b/dts/common/nordic/nrf54h20.dtsi
@@ -408,6 +408,14 @@
 					compatible = "nordic,nrf-ieee802154";
 					status = "disabled";
 				};
+
+				/* Note: In the nRF Connect SDK the SoftDevice Controller
+				 * is added and set as the default Bluetooth Controller.
+				 */
+				bt_hci_controller: bt_hci_controller {
+					compatible = "zephyr,bt-hci-ll-sw-split";
+					status = "disabled";
+				};
 			};
 
 			ccm030: ccm@3a000 {