Hi Hugo,
> The hci_h5 already supports Realtek controllers discovered via ACPI. This
> commit adds support for discovering via device tree for ACPI-less
> platforms.
>
> Signed-off-by: Hugo Grostabussiat <bonstra@xxxxxxxxxxxxxxxxx>
> ---
> drivers/bluetooth/Kconfig | 2 +-
> drivers/bluetooth/btrtl.c | 75 +++++++++++++++++++++-----------------
> drivers/bluetooth/btrtl.h | 3 +-
> drivers/bluetooth/hci_h5.c | 65 ++++++++++++++++++++++++++-------
> 4 files changed, 95 insertions(+), 50 deletions(-)
>
> diff --git a/drivers/bluetooth/Kconfig b/drivers/bluetooth/Kconfig
> index aae665a3a254..48c9a004b033 100644
> --- a/drivers/bluetooth/Kconfig
> +++ b/drivers/bluetooth/Kconfig
> @@ -211,7 +211,7 @@ config BT_HCIUART_RTL
> depends on BT_HCIUART
> depends on BT_HCIUART_SERDEV
> depends on GPIOLIB
> - depends on ACPI
> + depends on (ACPI || OF)
> select BT_HCIUART_3WIRE
> select BT_RTL
> help
> diff --git a/drivers/bluetooth/btrtl.c b/drivers/bluetooth/btrtl.c
> index 4f75a9b61d09..01b0eb4b57d7 100644
> --- a/drivers/bluetooth/btrtl.c
> +++ b/drivers/bluetooth/btrtl.c
> @@ -17,6 +17,8 @@
>
> #define VERSION "0.1"
>
> +#define FW_DIR "rtl_bt"
> +
> #define RTL_EPATCH_SIGNATURE "Realtech"
> #define RTL_ROM_LMP_3499 0x3499
> #define RTL_ROM_LMP_8723A 0x1200
> @@ -45,7 +47,7 @@ struct id_table {
> bool config_needed;
> bool has_rom_version;
> char *fw_name;
> - char *cfg_name;
> + char *cfg_basename;
> };
you need to split this into individual patches. I am not in favor of doing a refactor and then adding DT support in the same patch.
Regards
Marcel
