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 <siro@das-labor.org>
Reviewed-on: https://review.coreboot.org/21578
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Martin Roth <martinroth@google.com>
This commit is contained in:
Patrick Rudolph 2017-09-17 12:17:13 +02:00 committed by Martin Roth
parent 09f8a834b3
commit 7c2a6f984a
2 changed files with 9 additions and 1 deletions

View file

@ -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

View file

@ -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();