michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: bluetooth: Rename Silabs HCI driver

Browse source 
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>
This commit is contained in:
Johan Hedberg 2024-10-21 17:07:13 +03:00 • committed by Carles Cufí
commit 393ecf4426
10 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
MAINTAINERS.yml
View file

@ -3532,7 +3532,7 @@ Silabs Platforms:
- dts/arm/silabs/ - dts/arm/silabs/
- dts/bindings/*/silabs* - dts/bindings/*/silabs*
- drivers/*/*gecko* - drivers/*/*gecko*
- drivers/bluetooth/hci/slz_hci* - drivers/bluetooth/hci/hci_silabs_*
- drivers/*/*silabs* - drivers/*/*silabs*
labels: labels:
- "platform: Silabs" - "platform: Silabs"

4
drivers/bluetooth/hci/CMakeLists.txt
View file

@ -36,8 +36,8 @@ if(CONFIG_DT_HAS_ST_HCI_STM32WBA_ENABLED)
zephyr_blobs_verify(MODULE hal_stm32 REQUIRED) zephyr_blobs_verify(MODULE hal_stm32 REQUIRED)
endif() endif()
zephyr_library_sources_ifdef(CONFIG_BT_USERCHAN userchan.c) 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) if(CONFIG_DT_HAS_SILABS_BT_HCI_EFR32_ENABLED)
zephyr_blobs_verify(MODULE hal_silabs REQUIRED) zephyr_blobs_verify(MODULE hal_silabs REQUIRED)
endif() endif()
zephyr_library_sources_ifdef(CONFIG_BT_PSOC6_BLESS hci_ifx_psoc6_bless.c) zephyr_library_sources_ifdef(CONFIG_BT_PSOC6_BLESS hci_ifx_psoc6_bless.c)

8
drivers/bluetooth/hci/Kconfig
View file

@ -77,10 +77,10 @@ config BT_STM32WBA
help help
ST STM32WBA HCI Bluetooth interface ST STM32WBA HCI Bluetooth interface
config BT_SILABS_HCI config BT_SILABS_EFR32
bool bool
default y 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 ZEPHYR_HAL_SILABS_MODULE_BLOBS
depends on !PM || SOC_GECKO_PM_BACKEND_PMGR depends on !PM || SOC_GECKO_PM_BACKEND_PMGR
select SOC_GECKO_USE_RAIL select SOC_GECKO_USE_RAIL
@ -260,9 +260,9 @@ config BT_DRV_RX_STACK_SIZE
help help
Stack size for the HCI driver's RX thread. 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" int "Silicon Labs Bluetooth Library memory buffer size"
depends on BT_SILABS_HCI depends on BT_SILABS_EFR32
default 6144 default 6144
help help
Select the size of allocated memory buffer for the Silicon Labs Select the size of allocated memory buffer for the Silicon Labs

6
drivers/bluetooth/hci/slz_hci.c → drivers/bluetooth/hci/hci_silabs_efr32.c
View file

@ -13,9 +13,9 @@
#define LOG_LEVEL CONFIG_BT_HCI_DRIVER_LOG_LEVEL #define LOG_LEVEL CONFIG_BT_HCI_DRIVER_LOG_LEVEL
#include <zephyr/logging/log.h> #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 { struct hci_data {
bt_hci_recv_t recv; bt_hci_recv_t recv;
@ -24,7 +24,7 @@ struct hci_data {
#define SL_BT_CONFIG_ACCEPT_LIST_SIZE 1 #define SL_BT_CONFIG_ACCEPT_LIST_SIZE 1
#define SL_BT_CONFIG_MAX_CONNECTIONS 1 #define SL_BT_CONFIG_MAX_CONNECTIONS 1
#define SL_BT_CONFIG_USER_ADVERTISERS 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_LE_BUFFER_SIZE_MAX CONFIG_BT_BUF_ACL_TX_COUNT
#define SL_BT_CONTROLLER_COMPLETED_PACKETS_THRESHOLD 1 #define SL_BT_CONTROLLER_COMPLETED_PACKETS_THRESHOLD 1
#define SL_BT_CONTROLLER_COMPLETED_PACKETS_EVENTS_TIMEOUT 3 #define SL_BT_CONTROLLER_COMPLETED_PACKETS_EVENTS_TIMEOUT 3

2
dts/arm/silabs/efr32bg2x.dtsi
View file

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

2
dts/arm/silabs/efr32mg.dtsi
View file

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

2
dts/arm/silabs/efr32mg24.dtsi
View file

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

2
dts/arm/silabs/efr32xg13p.dtsi
View file

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

4
dts/bindings/bluetooth/silabs,bt-hci.yaml → dts/bindings/bluetooth/silabs,bt-hci-efr32.yaml
View file

@ -1,12 +1,12 @@
description: Bluetooth HCI on Silabs boards description: Bluetooth HCI on Silabs boards
compatible: "silabs,bt-hci" compatible: "silabs,bt-hci-efr32"
include: bt-hci.yaml include: bt-hci.yaml
properties: properties:
bt-hci-name: bt-hci-name:
default: "sl:bt" default: "efr32"
bt-hci-bus: bt-hci-bus:
default: "virtual" default: "virtual"
bt-hci-quirks: bt-hci-quirks:

4
modules/hal_silabs/simplicity_sdk/CMakeLists.txt
View file

@ -47,12 +47,12 @@ if(CONFIG_SOC_GECKO_HAS_RADIO)
) )
# sl_protocol_crypto # sl_protocol_crypto
zephyr_library_sources_ifdef(CONFIG_BT_SILABS_HCI zephyr_library_sources_ifdef(CONFIG_BT_SILABS_EFR32
${SECURITY_DIR}/sl_component/sl_protocol_crypto/src/sli_radioaes_management.c ${SECURITY_DIR}/sl_component/sl_protocol_crypto/src/sli_radioaes_management.c
${SECURITY_DIR}/sl_component/sl_protocol_crypto/src/sli_protocol_crypto_radioaes.c ${SECURITY_DIR}/sl_component/sl_protocol_crypto/src/sli_protocol_crypto_radioaes.c
) )
if(CONFIG_BT_SILABS_HCI) if(CONFIG_BT_SILABS_EFR32)
# prebuilt libs # prebuilt libs
add_prebuilt_library(liblinklayer protocol/bluetooth/bgstack/ll/lib/libbluetooth_controller_efr32xg${SILABS_DEVICE_FAMILY_NUMBER}_gcc_release.a) add_prebuilt_library(liblinklayer protocol/bluetooth/bgstack/ll/lib/libbluetooth_controller_efr32xg${SILABS_DEVICE_FAMILY_NUMBER}_gcc_release.a)
add_prebuilt_library(libbgcommon protocol/bluetooth/bgcommon/lib/build/gcc/cortex-m33/bgcommon/release/libbgcommon.a) add_prebuilt_library(libbgcommon protocol/bluetooth/bgcommon/lib/build/gcc/cortex-m33/bgcommon/release/libbgcommon.a)