From 7c2a6f984a19cab6f2c51e5dce270562a8a27d47 Mon Sep 17 00:00:00 2001 From: Patrick Rudolph Date: Sun, 17 Sep 2017 12:17:13 +0200 Subject: ec/lenovo/h8: Add support for bluetooth on wifi The EC does enable bluetooth on wifi cards and BDC at the same time. Check the new Kconfig to support bluetooth on wifi in case no BDC is installed and the BDC detection fails. Change-Id: I23f14c937252a296dc543db49ec9e093e7e24604 Signed-off-by: Patrick Rudolph Reviewed-on: https://review.coreboot.org/21578 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth --- src/ec/lenovo/h8/Kconfig | 7 +++++++ src/ec/lenovo/h8/h8.c | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/ec/lenovo/h8/Kconfig b/src/ec/lenovo/h8/Kconfig index 190f4a98a737..f9b0b1461215 100644 --- a/src/ec/lenovo/h8/Kconfig +++ b/src/ec/lenovo/h8/Kconfig @@ -21,6 +21,13 @@ config H8_FLASH_LEDS_ON_DEATH help Flash all LEDs when encountered a fatal error. +config H8_SUPPORT_BT_ON_WIFI + bool "Support bluetooth on wifi cards" + default n + help + Disable BDC detection and assume bluetooth is installed. Required for + bluetooth on wifi cards, as it's not possible to detect it in coreboot. + endif config H8_DOCK_EARLY_INIT diff --git a/src/ec/lenovo/h8/h8.c b/src/ec/lenovo/h8/h8.c index 3442f68ff8a6..b034dba99a0a 100644 --- a/src/ec/lenovo/h8/h8.c +++ b/src/ec/lenovo/h8/h8.c @@ -272,7 +272,8 @@ static void h8_enable(struct device *dev) if (get_option(&val, "volume") == CB_SUCCESS && !acpi_is_wakeup_s3()) ec_write(H8_VOLUME_CONTROL, val); - val = h8_has_bdc(dev) && h8_bluetooth_nv_enable(); + val = (IS_ENABLED(CONFIG_H8_SUPPORT_BT_ON_WIFI) || h8_has_bdc(dev)) && + h8_bluetooth_nv_enable(); h8_bluetooth_enable(val); val = h8_has_wwan(dev) && h8_wwan_nv_enable(); -- cgit v1.2.3