Skip to content

Commit

Permalink
drivers: bluetooth: Rename Silabs HCI driver
Browse files Browse the repository at this point in the history
Rename the Silabs HCI driver to hci_silabs_efr32.c to better indicate what
hardware it supports. Also rename the associated devicetree binding and
Kconfig options to be consistent with the new driver name.

Signed-off-by: Johan Hedberg <johan.hedberg@silabs.com>
  • Loading branch information
jhedberg committed Oct 21, 2024
1 parent 6773f33 commit cc151a8
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion MAINTAINERS.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3531,7 +3531,7 @@ Silabs Platforms:
- dts/arm/silabs/
- dts/bindings/*/silabs*
- drivers/*/*_gecko*
- drivers/bluetooth/hci/slz_hci*
- drivers/bluetooth/hci/hci_silabs_*
- drivers/*/*_silabs*
labels:
- "platform: Silabs"
Expand Down
2 changes: 1 addition & 1 deletion drivers/bluetooth/hci/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ if(CONFIG_DT_HAS_ST_HCI_STM32WBA_ENABLED)
zephyr_blobs_verify(MODULE hal_stm32 REQUIRED)
endif()
zephyr_library_sources_ifdef(CONFIG_BT_USERCHAN userchan.c)
zephyr_library_sources_ifdef(CONFIG_BT_SILABS_HCI slz_hci.c)
zephyr_library_sources_ifdef(CONFIG_BT_SILABS_EFR32 hci_silabs_efr32.c)
if(CONFIG_DT_HAS_SILABS_BT_HCI_ENABLED)
zephyr_blobs_verify(MODULE hal_silabs REQUIRED)
endif()
Expand Down
8 changes: 4 additions & 4 deletions drivers/bluetooth/hci/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,10 @@ config BT_STM32WBA
help
ST STM32WBA HCI Bluetooth interface

config BT_SILABS_HCI
config BT_SILABS_EFR32
bool
default y
depends on DT_HAS_SILABS_BT_HCI_ENABLED
depends on DT_HAS_SILABS_BT_HCI_EFR32_ENABLED
depends on ZEPHYR_HAL_SILABS_MODULE_BLOBS
depends on !PM || SOC_GECKO_PM_BACKEND_PMGR
select SOC_GECKO_USE_RAIL
Expand Down Expand Up @@ -260,9 +260,9 @@ config BT_DRV_RX_STACK_SIZE
help
Stack size for the HCI driver's RX thread.

config BT_SILABS_HCI_BUFFER_MEMORY
config BT_SILABS_EFR32_BUFFER_MEMORY
int "Silicon Labs Bluetooth Library memory buffer size"
depends on BT_SILABS_HCI
depends on BT_SILABS_EFR32
default 6144
help
Select the size of allocated memory buffer for the Silicon Labs
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@

#define LOG_LEVEL CONFIG_BT_HCI_DRIVER_LOG_LEVEL
#include <zephyr/logging/log.h>
LOG_MODULE_REGISTER(bt_hci_driver_slz);
LOG_MODULE_REGISTER(bt_hci_driver_efr32);

#define DT_DRV_COMPAT silabs_bt_hci
#define DT_DRV_COMPAT silabs_bt_hci_efr32

struct hci_data {
bt_hci_recv_t recv;
Expand All @@ -24,7 +24,7 @@ struct hci_data {
#define SL_BT_CONFIG_ACCEPT_LIST_SIZE 1
#define SL_BT_CONFIG_MAX_CONNECTIONS 1
#define SL_BT_CONFIG_USER_ADVERTISERS 1
#define SL_BT_CONTROLLER_BUFFER_MEMORY CONFIG_BT_SILABS_HCI_BUFFER_MEMORY
#define SL_BT_CONTROLLER_BUFFER_MEMORY CONFIG_BT_SILABS_EFR32_BUFFER_MEMORY
#define SL_BT_CONTROLLER_LE_BUFFER_SIZE_MAX CONFIG_BT_BUF_ACL_TX_COUNT
#define SL_BT_CONTROLLER_COMPLETED_PACKETS_THRESHOLD 1
#define SL_BT_CONTROLLER_COMPLETED_PACKETS_EVENTS_TIMEOUT 3
Expand Down
2 changes: 1 addition & 1 deletion dts/arm/silabs/efr32bg2x.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@
};

bt_hci_silabs: bt_hci_silabs {
compatible = "silabs,bt-hci";
compatible = "silabs,bt-hci-efr32";
status = "disabled";
};
};
Expand Down
2 changes: 1 addition & 1 deletion dts/arm/silabs/efr32mg.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@
};

bt_hci_silabs: bt_hci_silabs {
compatible = "silabs,bt-hci";
compatible = "silabs,bt-hci-efr32";
status = "disabled";
};

Expand Down
2 changes: 1 addition & 1 deletion dts/arm/silabs/efr32mg24.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@


bt_hci_silabs: bt_hci_silabs {
compatible = "silabs,bt-hci";
compatible = "silabs,bt-hci-efr32";
status = "disabled";
};
};
Expand Down
2 changes: 1 addition & 1 deletion dts/arm/silabs/efr32xg13p.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@
};

bt_hci_silabs: bt_hci_silabs {
compatible = "silabs,bt-hci";
compatible = "silabs,bt-hci-efr32";
status = "disabled";
};

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
description: Bluetooth HCI on Silabs boards

compatible: "silabs,bt-hci"
compatible: "silabs,bt-hci-efr32"

include: bt-hci.yaml

properties:
bt-hci-name:
default: "sl:bt"
default: "efr32"
bt-hci-bus:
default: "virtual"
bt-hci-quirks:
Expand Down

0 comments on commit cc151a8

Please sign in to comment.