mb/google/volteer/var/collis: Add fw_config probe for ALC5682-VD & VS

ALC5682-VD/ALC5682I-VS load different kernel driver by different hid
name. Update hid name depending on the AUDIO_CODEC_SOURCE field of
fw_config. Define FW_CONFIG bits 41 - 43 (SSFC bits 9 - 11)
for codec selection.

ALC5682-VD: _HID = "10EC5682"
ALC5682I-VS: _HID = "RTL5682"

BUG=b:192535692
BRANCH=volteer
TEST=ALC5682-VD/ALC5682I-VS audio codec can work

Signed-off-by: Frank Chu <frank_chu@pegatron.corp-partner.google.com>
Change-Id: Ia6089441dc1ba04c3f7427dda065b85bd295af0d
Reviewed-on: https://review.coreboot.org/c/coreboot/+/60415
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Reviewed-by: Paul Menzel <paulepanter@mailbox.org>
Reviewed-by: Mac Chiang <mac.chiang@intel.com>
This commit is contained in:
FrankChu 2021-12-28 16:03:26 +08:00 committed by Felix Held
parent 110e5ced75
commit 4b38a0b860
3 changed files with 33 additions and 3 deletions

View File

@ -5,3 +5,5 @@ romstage-y += memory.c
bootblock-y += gpio.c
ramstage-y += gpio.c
ramstage-y += variant.c

View File

@ -1,3 +1,10 @@
fw_config
field AUDIO_CODEC_SOURCE 41 43
option AUDIO_CODEC_UNPROVISIONED 0
option AUDIO_CODEC_ALC5682 1
option AUDIO_CODEC_ALC5682I_VS 2
end
end
chip soc/intel/tigerlake
# BitMask where bits [3:0] are Controller 0 Channel [3:0] and
# bits [7:4] are Controller 1 Channel [3:0].
@ -93,7 +100,7 @@ chip soc/intel/tigerlake
end
device ref i2c0 on
chip drivers/i2c/generic
register "hid" = ""10EC5682""
# register "hid" is set in variants.c because of FW_CONFIG
register "name" = ""RT58""
register "desc" = ""Headset Codec""
register "irq_gpio" = "ACPI_GPIO_IRQ_EDGE_BOTH(GPP_R5)"
@ -102,8 +109,7 @@ chip soc/intel/tigerlake
register "property_list[0].type" = "ACPI_DP_TYPE_INTEGER"
register "property_list[0].name" = ""realtek,jd-src""
register "property_list[0].integer" = "1"
device i2c 1a on
end
device i2c 1a alias audio_codec on end
end
chip drivers/i2c/max98373
register "vmon_slot_no" = "0"

View File

@ -0,0 +1,22 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
#include <baseboard/variants.h>
#include <fw_config.h>
#include <drivers/i2c/hid/chip.h>
#include <device/device.h>
static void audio_codec_update(void)
{
struct device *codec = DEV_PTR(audio_codec);
struct drivers_i2c_generic_config *config;
config = codec->chip_info;
if (fw_config_probe(FW_CONFIG(AUDIO_CODEC_SOURCE, AUDIO_CODEC_ALC5682)))
config->hid = "10EC5682";
else
config->hid = "RTL5682";
}
void variant_devtree_update(void)
{
audio_codec_update();
}