zephyrproject-rtos · nashif · Jun 11, 2024 · May 5, 2024 · May 5, 2024 · May 5, 2024
diff --git a/boards/96boards/carbon/96b_carbon_stm32f401xe.dts b/boards/96boards/carbon/96b_carbon_stm32f401xe.dts
@@ -20,6 +20,7 @@
 		zephyr,sram = &sram0;
 		zephyr,flash = &flash0;
 		zephyr,code-partition = &slot0_partition;
+		zephyr,bt-hci = &hci_spi;
 	};
 
 	leds {
@@ -124,7 +125,7 @@
 	pinctrl-names = "default";
 
 	/* Nordic nRF51822-QFAC */
-	bt-hci@0 {
+	hci_spi: bt-hci@0 {
 		compatible = "zephyr,bt-hci-spi";
 		reg = <0>;
 		reset-gpios = <&gpiob 4 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;

diff --git a/boards/96boards/carbon/Kconfig.defconfig b/boards/96boards/carbon/Kconfig.defconfig
@@ -14,9 +14,8 @@ if BT
 config SPI
 	default y
 
-choice BT_HCI_BUS_TYPE
-	default BT_SPI
-endchoice
+config BT_SPI
+	default y
 
 endif # BT
 

diff --git a/boards/ambiq/apollo3_evb/apollo3_evb.dts b/boards/ambiq/apollo3_evb/apollo3_evb.dts
@@ -15,6 +15,7 @@
 		zephyr,shell-uart = &uart0;
 		zephyr,uart-pipe = &uart0;
 		zephyr,flash-controller = &flash;
+		zephyr,bt_hci = &bt_hci_apollo;
 	};
 
 	aliases {

diff --git a/boards/ambiq/apollo3p_evb/apollo3p_evb.dts b/boards/ambiq/apollo3p_evb/apollo3p_evb.dts
@@ -15,6 +15,7 @@
 		zephyr,shell-uart = &uart0;
 		zephyr,uart-pipe = &uart0;
 		zephyr,flash-controller = &flash;
+		zephyr,bt_hci = &bt_hci_apollo;
 	};
 
 	aliases {

diff --git a/boards/ambiq/apollo4p_blue_kxr_evb/Kconfig.defconfig b/boards/ambiq/apollo4p_blue_kxr_evb/Kconfig.defconfig
@@ -9,10 +9,6 @@ if BT
 config MAIN_STACK_SIZE
 	default 2048
 
-choice BT_HCI_BUS_TYPE
-	default BT_AMBIQ_HCI
-endchoice
-
 config BT_BUF_ACL_TX_COUNT
 	default 14
 

diff --git a/boards/ambiq/apollo4p_blue_kxr_evb/apollo4p_blue_kxr_evb.dts b/boards/ambiq/apollo4p_blue_kxr_evb/apollo4p_blue_kxr_evb.dts
@@ -15,6 +15,7 @@
 		zephyr,shell-uart = &uart0;
 		zephyr,uart-pipe = &uart0;
 		zephyr,flash-controller = &flash;
+		zephyr,bt-hci = &bt_hci_apollo;
 	};
 
 	aliases {

diff --git a/boards/arduino/giga_r1/arduino_giga_r1_stm32h747xx_m7.dts b/boards/arduino/giga_r1/arduino_giga_r1_stm32h747xx_m7.dts
@@ -18,7 +18,7 @@
 		zephyr,console = &usart1;
 		zephyr,shell-uart = &usart1;
 		zephyr,uart-mcumgr = &usart1;
-		zephyr,bt-uart = &uart7;
+		zephyr,bt-hci = &bt_hci_uart;
 		zephyr,sram = &sram0;
 		zephyr,flash = &flash0;
 		zephyr,canbus = &fdcan2;
@@ -97,12 +97,17 @@
 	status = "okay";
 	hw-flow-control;
 
-	murata-1dx {
-		compatible = "infineon,cyw43xxx-bt-hci";
-		bt-reg-on-gpios = <&gpioa 10 GPIO_ACTIVE_HIGH>;
-		bt-host-wake-gpios = <&gpiog 3 GPIO_ACTIVE_HIGH>;
-		bt-dev-wake-gpios = <&gpioh 7 GPIO_ACTIVE_HIGH>;
-		fw-download-speed = <115200>;
+	bt_hci_uart: bt_hci_uart {
+		compatible = "zephyr,bt-hci-uart";
+		status = "okay";
+
+		murata-1dx {
+			compatible = "infineon,cyw43xxx-bt-hci";
+			bt-reg-on-gpios = <&gpioa 10 GPIO_ACTIVE_HIGH>;
+			bt-host-wake-gpios = <&gpiog 3 GPIO_ACTIVE_HIGH>;
+			bt-dev-wake-gpios = <&gpioh 7 GPIO_ACTIVE_HIGH>;
+			fw-download-speed = <115200>;
+		};
 	};
 };
 

diff --git a/boards/espressif/esp32_devkitc_wroom/Kconfig.defconfig b/boards/espressif/esp32_devkitc_wroom/Kconfig.defconfig
@@ -12,10 +12,6 @@ config HEAP_MEM_POOL_ADD_SIZE_BOARD
 	default 40960 if BT
 	default 4096
 
-choice BT_HCI_BUS_TYPE
-	default BT_ESP32 if BT
-endchoice
-
 endif # BOARD_ESP32_DEVKITC_WROOM_ESP32_PROCPU
 
 if BOARD_ESP32_DEVKITC_WROOM_ESP32_APPCPU

diff --git a/boards/espressif/esp32_devkitc_wroom/esp32_devkitc_wroom_procpu.dts b/boards/espressif/esp32_devkitc_wroom/esp32_devkitc_wroom_procpu.dts
@@ -36,6 +36,7 @@
 		zephyr,shell-uart = &uart0;
 		zephyr,flash = &flash0;
 		zephyr,code-partition = &slot0_partition;
+		zephyr,bt-hci = &esp32_bt_hci;
 	};
 };
 
@@ -165,3 +166,7 @@
 		};
 	};
 };
+
+&esp32_bt_hci {
+	status = "okay";
+};
diff --git a/boards/espressif/esp32_devkitc_wrover/Kconfig.defconfig b/boards/espressif/esp32_devkitc_wrover/Kconfig.defconfig
@@ -10,10 +10,6 @@ config HEAP_MEM_POOL_ADD_SIZE_BOARD
 	default 40960 if BT
 	default 4096
 
-choice BT_HCI_BUS_TYPE
-	default BT_ESP32 if BT
-endchoice
-
 endif # BOARD_ESP32_DEVKITC_WROVER_ESP32_PROCPU
 
 if BOARD_ESP32_DEVKITC_WROVER_ESP32_APPCPU

diff --git a/boards/espressif/esp32_devkitc_wrover/esp32_devkitc_wrover_procpu.dts b/boards/espressif/esp32_devkitc_wrover/esp32_devkitc_wrover_procpu.dts
@@ -36,6 +36,7 @@
 		zephyr,shell-uart = &uart0;
 		zephyr,flash = &flash0;
 		zephyr,code-partition = &slot0_partition;
+		zephyr,bt-hci = &esp32_bt_hci;
 	};
 };
 
@@ -161,3 +162,7 @@
 		};
 	};
 };
+
+&esp32_bt_hci {
+	status = "okay";
+};
diff --git a/boards/espressif/esp32_ethernet_kit/Kconfig.defconfig b/boards/espressif/esp32_ethernet_kit/Kconfig.defconfig
@@ -19,10 +19,6 @@ config HEAP_MEM_POOL_ADD_SIZE_BOARD
 	default 40960 if BT
 	default 4096
 
-choice BT_HCI_BUS_TYPE
-	default BT_ESP32 if BT
-endchoice
-
 endif # BOARD_ESP32_ETHERNET_KIT_ESP32_PROCPU
 
 if BOARD_ESP32_ETHERNET_KIT_ESP32_APPCPU

diff --git a/boards/espressif/esp32_ethernet_kit/esp32_ethernet_kit_procpu.dts b/boards/espressif/esp32_ethernet_kit/esp32_ethernet_kit_procpu.dts
@@ -23,6 +23,7 @@
 		zephyr,shell-uart = &uart0;
 		zephyr,flash = &flash0;
 		zephyr,code-partition = &slot0_partition;
+		zephyr,bt-hci = &esp32_bt_hci;
 	};
 };
 
@@ -122,3 +123,7 @@
 &eth {
 	phy-handle = <&phy>;
 };
+
+&esp32_bt_hci {
+	status = "okay";
+};
diff --git a/boards/espressif/esp32c3_devkitm/Kconfig.defconfig b/boards/espressif/esp32c3_devkitm/Kconfig.defconfig
@@ -9,7 +9,3 @@ config HEAP_MEM_POOL_ADD_SIZE_BOARD
 	default 51200 if WIFI
 	default 40960 if BT
 	default 4096
-
-choice BT_HCI_BUS_TYPE
-	default BT_ESP32 if BT
-endchoice
diff --git a/boards/espressif/esp32c3_devkitm/esp32c3_devkitm.dts b/boards/espressif/esp32c3_devkitm/esp32c3_devkitm.dts
@@ -20,6 +20,7 @@
 		zephyr,shell-uart = &uart0;
 		zephyr,flash = &flash0;
 		zephyr,code-partition = &slot0_partition;
+		zephyr,bt-hci = &esp32_bt_hci;
 	};
 
 	aliases {
@@ -130,3 +131,7 @@
 		};
 	};
 };
+
+&esp32_bt_hci {
+	status = "okay";
+};
diff --git a/boards/espressif/esp32s3_devkitc/Kconfig.defconfig b/boards/espressif/esp32s3_devkitc/Kconfig.defconfig
@@ -12,10 +12,6 @@ config HEAP_MEM_POOL_ADD_SIZE_BOARD
 	default 40960 if BT
 	default 4096
 
-choice BT_HCI_BUS_TYPE
-	default BT_ESP32 if BT
-endchoice
-
 endif # BOARD_ESP32S3_DEVKITC_ESP32S3_PROCPU
 
 if BOARD_ESP32S3_DEVKITC_ESP32S3_APPCPU

diff --git a/boards/espressif/esp32s3_devkitc/esp32s3_devkitc_procpu.dts b/boards/espressif/esp32s3_devkitc/esp32s3_devkitc_procpu.dts
@@ -25,6 +25,7 @@
 		zephyr,shell-uart = &uart0;
 		zephyr,flash = &flash0;
 		zephyr,code-partition = &slot0_partition;
+		zephyr,bt-hci = &esp32_bt_hci;
 	};
 
 	aliases {
@@ -168,3 +169,7 @@
 		};
 	};
 };
+
+&esp32_bt_hci {
+	status = "okay";
+};
diff --git a/boards/espressif/esp32s3_devkitm/Kconfig.defconfig b/boards/espressif/esp32s3_devkitm/Kconfig.defconfig
@@ -12,10 +12,6 @@ config HEAP_MEM_POOL_ADD_SIZE_BOARD
 	default 40960 if BT
 	default 4096
 
-choice BT_HCI_BUS_TYPE
-	default BT_ESP32 if BT
-endchoice
-
 endif # BOARD_ESP32S3_DEVKITM_ESP32S3_PROCPU
 
 if BOARD_ESP32S3_DEVKITM_ESP32S3_APPCPU

diff --git a/boards/espressif/esp32s3_devkitm/esp32s3_devkitm_procpu.dts b/boards/espressif/esp32s3_devkitm/esp32s3_devkitm_procpu.dts
@@ -25,6 +25,7 @@
 		zephyr,shell-uart = &uart0;
 		zephyr,flash = &flash0;
 		zephyr,code-partition = &slot0_partition;
+		zephyr,bt-hci = &esp32_bt_hci;
 	};
 
 	aliases {
@@ -172,3 +173,7 @@
 		};
 	};
 };
+
+&esp32_bt_hci {
+	status = "okay";
+};
diff --git a/boards/espressif/esp_wrover_kit/Kconfig.defconfig b/boards/espressif/esp_wrover_kit/Kconfig.defconfig
@@ -12,10 +12,6 @@ config HEAP_MEM_POOL_ADD_SIZE_BOARD
 	default 40960 if BT
 	default 4096
 
-choice BT_HCI_BUS_TYPE
-	default BT_ESP32 if BT
-endchoice
-
 config DISK_DRIVER_SDMMC
 	default y
 

diff --git a/boards/espressif/esp_wrover_kit/esp_wrover_kit_procpu.dts b/boards/espressif/esp_wrover_kit/esp_wrover_kit_procpu.dts
@@ -36,6 +36,7 @@
 		zephyr,code-partition = &slot0_partition;
 		zephyr,display = &ili9341;
 		zephyr,sdhc = &sdhc1;
+		zephyr,bt-hci = &esp32_bt_hci;
 	};
 
 	leds {
@@ -243,3 +244,7 @@
 		};
 	};
 };
+
+&esp32_bt_hci {
+	status = "okay";
+};
diff --git a/boards/ezurio/bl5340_dvk/Kconfig.defconfig b/boards/ezurio/bl5340_dvk/Kconfig.defconfig
@@ -57,9 +57,8 @@ config FLASH_LOAD_SIZE
 
 endif # BOARD_BL5340_DVK_NRF5340_CPUAPP_NS
 
-choice BT_HCI_BUS_TYPE
-	default BT_HCI_IPC if BT
-endchoice
+config BT_HCI_IPC
+	default y if BT
 
 config HEAP_MEM_POOL_ADD_SIZE_BOARD
 	int

diff --git a/boards/ezurio/bl5340_dvk/bl5340_dvk_nrf5340_cpuapp_common.dtsi b/boards/ezurio/bl5340_dvk/bl5340_dvk_nrf5340_cpuapp_common.dtsi
@@ -15,7 +15,7 @@
 		zephyr,bt-mon-uart = &uart0;
 		zephyr,bt-c2h-uart = &uart0;
 		zephyr,display = &ili9340;
-		zephyr,bt-hci-ipc = &ipc0;
+		zephyr,bt-hci = &bt_hci_ipc0;
 	};
 
 	/* Main LEDs and buttons are on an I2C TCA9538 GPIO port expander */

diff --git a/boards/hardkernel/odroid_go/Kconfig.defconfig b/boards/hardkernel/odroid_go/Kconfig.defconfig
@@ -25,10 +25,6 @@ config HEAP_MEM_POOL_ADD_SIZE_BOARD
 	default 40960 if BT
 	default 4096
 
-choice BT_HCI_BUS_TYPE
-	default BT_ESP32 if BT
-endchoice
-
 endif # BOARD_ODROID_GO_ESP32_PROCPU
 
 if BOARD_ODROID_GO_ESP32_APPCPU

diff --git a/boards/hardkernel/odroid_go/odroid_go_procpu.dts b/boards/hardkernel/odroid_go/odroid_go_procpu.dts
@@ -20,6 +20,7 @@
 		zephyr,flash = &flash0;
 		zephyr,code-partition = &slot0_partition;
 		zephyr,display = &ili9341;
+		zephyr,bt-hci = &esp32_bt_hci;
 	};
 
 	leds {
@@ -206,3 +207,7 @@
 		};
 	};
 };
+
+&esp32_bt_hci {
+	status = "okay";
+};
diff --git a/boards/heltec/heltec_wifi_lora32_v2/Kconfig.defconfig b/boards/heltec/heltec_wifi_lora32_v2/Kconfig.defconfig
@@ -12,10 +12,6 @@ config HEAP_MEM_POOL_ADD_SIZE_BOARD
 	default 40960 if BT
 	default 4096
 
-choice BT_HCI_BUS_TYPE
-	default BT_ESP32 if BT
-endchoice
-
 endif # BOARD_HELTEC_WIFI_LORA32_V2_ESP32_PROCPU
 
 if BOARD_HELTEC_WIFI_LORA32_V2_ESP32_APPCPU

diff --git a/boards/heltec/heltec_wifi_lora32_v2/heltec_wifi_lora32_v2_procpu.dts b/boards/heltec/heltec_wifi_lora32_v2/heltec_wifi_lora32_v2_procpu.dts
@@ -55,6 +55,7 @@
 		zephyr,shell-uart = &uart0;
 		zephyr,flash = &flash0;
 		zephyr,code-partition = &slot0_partition;
+		zephyr,bt-hci = &esp32_bt_hci;
 	};
 };
 
@@ -149,5 +150,9 @@
 	};
 };
 
+&esp32_bt_hci {
+	status = "okay";
+};
+
 /* Required by the ssd1306_128x64 shield which enables the OLED display */
 arduino_i2c: &i2c0 {};
diff --git a/boards/heltec/heltec_wireless_stick_lite_v3/Kconfig.defconfig b/boards/heltec/heltec_wireless_stick_lite_v3/Kconfig.defconfig
@@ -13,10 +13,6 @@ config HEAP_MEM_POOL_ADD_SIZE_BOARD
 	default 40960 if BT
 	default 4096
 
-choice BT_HCI_BUS_TYPE
-	default BT_ESP32 if BT
-endchoice
-
 endif # BOARD_HELTEC_WIRELESS_STICK_LITE_V3_ESP32S3_PROCPU
 
 if BOARD_HELTEC_WIRELESS_STICK_LITE_V3_ESP32S3_APPCPU

diff --git a/boards/heltec/heltec_wireless_stick_lite_v3/heltec_wireless_stick_lite_v3_procpu.dts b/boards/heltec/heltec_wireless_stick_lite_v3/heltec_wireless_stick_lite_v3_procpu.dts
@@ -72,6 +72,7 @@
 		zephyr,shell-uart = &uart0;
 		zephyr,flash = &flash0;
 		zephyr,code-partition = &slot0_partition;
+		zephyr,bt-hci = &esp32_bt_hci;
 	};
 };
 
@@ -205,3 +206,7 @@
 		};
 	};
 };
+
+&esp32_bt_hci {
+	status = "okay";
+};