From 3f137169cbefdc87d251c740db032bc53d4a34b3 Mon Sep 17 00:00:00 2001 From: Mac Chiang Date: Wed, 13 Oct 2021 15:21:22 +0800 Subject: [PATCH] mb/google/brya/var/redrix: Enable bt_offload support Enable CnviBtAudioOffload UPD and program the corresponding VGPIO pins BUG=b:191931762 TEST=emerge-coreboot Signed-off-by: Mac Chiang Change-Id: I81bae537d52592e878db56343970de6fc488950f Reviewed-on: https://review.coreboot.org/c/coreboot/+/58288 Tested-by: build bot (Jenkins) Reviewed-by: Tim Wawrzynczak --- .../google/brya/variants/redrix/fw_config.c | 13 +++++++++++++ .../google/brya/variants/redrix/overridetree.cb | 2 ++ 2 files changed, 15 insertions(+) diff --git a/src/mainboard/google/brya/variants/redrix/fw_config.c b/src/mainboard/google/brya/variants/redrix/fw_config.c index fea546a57f..ac31d99c44 100644 --- a/src/mainboard/google/brya/variants/redrix/fw_config.c +++ b/src/mainboard/google/brya/variants/redrix/fw_config.c @@ -38,6 +38,17 @@ static const struct pad_config i2s_disable_pads[] = { PAD_NC(GPP_S3, NONE), }; +static const struct pad_config bt_i2s_enable_pads[] = { + PAD_CFG_NF(GPP_VGPIO_30, NONE, DEEP, NF3), /* BT_I2S_BCLK */ + PAD_CFG_NF(GPP_VGPIO_31, NONE, DEEP, NF3), /* BT_I2S_SYNC */ + PAD_CFG_NF(GPP_VGPIO_32, NONE, DEEP, NF3), /* BT_I2S_SDO */ + PAD_CFG_NF(GPP_VGPIO_33, NONE, DEEP, NF3), /* BT_I2S_SDI */ + PAD_CFG_NF(GPP_VGPIO_34, NONE, DEEP, NF1), /* SSP2_SCLK */ + PAD_CFG_NF(GPP_VGPIO_35, NONE, DEEP, NF1), /* SSP2_SFRM */ + PAD_CFG_NF(GPP_VGPIO_36, NONE, DEEP, NF1), /* SSP_TXD */ + PAD_CFG_NF(GPP_VGPIO_37, NONE, DEEP, NF1), /* SSP_RXD */ +}; + static void fw_config_handle(void *unused) { if (!fw_config_is_provisioned() || fw_config_probe(FW_CONFIG(AUDIO, AUDIO_UNKNOWN))) { @@ -51,6 +62,8 @@ static void fw_config_handle(void *unused) printk(BIOS_INFO, "Configure audio over I2S with MAX98390 ALC5682I.\n"); gpio_configure_pads(dmic_enable_pads, ARRAY_SIZE(dmic_enable_pads)); gpio_configure_pads(i2s_enable_pads, ARRAY_SIZE(i2s_enable_pads)); + printk(BIOS_INFO, "BT offload enabled\n"); + gpio_configure_pads(bt_i2s_enable_pads, ARRAY_SIZE(bt_i2s_enable_pads)); } } BOOT_STATE_INIT_ENTRY(BS_DEV_ENABLE, BS_ON_ENTRY, fw_config_handle, NULL); diff --git a/src/mainboard/google/brya/variants/redrix/overridetree.cb b/src/mainboard/google/brya/variants/redrix/overridetree.cb index 2e32b24b37..0ed6c529e3 100644 --- a/src/mainboard/google/brya/variants/redrix/overridetree.cb +++ b/src/mainboard/google/brya/variants/redrix/overridetree.cb @@ -33,6 +33,8 @@ end chip soc/intel/alderlake register "SaGv" = "SaGv_Enabled" + register "CnviBtAudioOffload" = "true" + # Intel Common SoC Config #+-------------------+---------------------------+ #| Field | Value |