mb/google/volteer/var/delbin: 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:204523176 BRANCH=volteer TEST=ALC5682-VD/ALC5682I-VS audio codec can work Signed-off-by: FrankChu <frank_chu@pegatron.corp-partner.google.com> Change-Id: Ieef638f78edd3428e572a76f06fb9c8757278971 Reviewed-on: https://review.coreboot.org/c/coreboot/+/59557 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org> Reviewed-by: Nick Vaccaro <nvaccaro@google.com>
This commit is contained in:
parent
a265c49eaa
commit
df1d2b4bb9
4 changed files with 45 additions and 1 deletions
|
@ -18,6 +18,7 @@ config BOARD_GOOGLE_BASEBOARD_VOLTEER
|
||||||
select DRIVERS_USB_ACPI
|
select DRIVERS_USB_ACPI
|
||||||
select EC_GOOGLE_CHROMEEC
|
select EC_GOOGLE_CHROMEEC
|
||||||
select EC_GOOGLE_CHROMEEC_BOARDID
|
select EC_GOOGLE_CHROMEEC_BOARDID
|
||||||
|
select EC_GOOGLE_CHROMEEC_INCLUDE_SSFC_IN_FW_CONFIG
|
||||||
select EC_GOOGLE_CHROMEEC_LPC
|
select EC_GOOGLE_CHROMEEC_LPC
|
||||||
select EC_GOOGLE_CHROMEEC_SKUID
|
select EC_GOOGLE_CHROMEEC_SKUID
|
||||||
select FW_CONFIG
|
select FW_CONFIG
|
||||||
|
|
|
@ -5,3 +5,5 @@ romstage-y += memory.c
|
||||||
bootblock-y += gpio.c
|
bootblock-y += gpio.c
|
||||||
|
|
||||||
ramstage-y += gpio.c
|
ramstage-y += gpio.c
|
||||||
|
|
||||||
|
ramstage-y += variant.c
|
||||||
|
|
|
@ -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
|
chip soc/intel/tigerlake
|
||||||
register "DdiPort1Hpd" = "0"
|
register "DdiPort1Hpd" = "0"
|
||||||
register "DdiPort2Hpd" = "0"
|
register "DdiPort2Hpd" = "0"
|
||||||
|
@ -129,7 +136,7 @@ chip soc/intel/tigerlake
|
||||||
end # DPTF 0x9A03
|
end # DPTF 0x9A03
|
||||||
device ref i2c0 on
|
device ref i2c0 on
|
||||||
chip drivers/i2c/generic
|
chip drivers/i2c/generic
|
||||||
register "hid" = ""10EC5682""
|
# register "hid" is set in variant.c because of FW_CONFIG
|
||||||
register "name" = ""RT58""
|
register "name" = ""RT58""
|
||||||
register "desc" = ""Headset Codec""
|
register "desc" = ""Headset Codec""
|
||||||
register "irq_gpio" = "ACPI_GPIO_IRQ_EDGE_BOTH(GPP_F8)"
|
register "irq_gpio" = "ACPI_GPIO_IRQ_EDGE_BOTH(GPP_F8)"
|
||||||
|
|
34
src/mainboard/google/volteer/variants/delbin/variant.c
Normal file
34
src/mainboard/google/volteer/variants/delbin/variant.c
Normal file
|
@ -0,0 +1,34 @@
|
||||||
|
/* SPDX-License-Identifier: GPL-2.0-or-later */
|
||||||
|
|
||||||
|
#include <baseboard/variants.h>
|
||||||
|
#include <fw_config.h>
|
||||||
|
#include <drivers/i2c/generic/chip.h>
|
||||||
|
#include <soc/pci_devs.h>
|
||||||
|
|
||||||
|
extern struct chip_operations drivers_i2c_generic_ops;
|
||||||
|
static void audio_codec_update(void)
|
||||||
|
{
|
||||||
|
const struct device_path codec_path[] = {
|
||||||
|
{.type = DEVICE_PATH_PCI, .pci.devfn = PCH_DEVFN_I2C0},
|
||||||
|
{.type = DEVICE_PATH_I2C, .i2c.device = 0x1a}
|
||||||
|
};
|
||||||
|
const struct device *codec =
|
||||||
|
find_dev_nested_path(pci_root_bus(), codec_path,
|
||||||
|
ARRAY_SIZE(codec_path));
|
||||||
|
struct drivers_i2c_generic_config *config;
|
||||||
|
|
||||||
|
if (!codec || (codec->chip_ops != &drivers_i2c_generic_ops) ||
|
||||||
|
!codec->chip_info)
|
||||||
|
return;
|
||||||
|
config = codec->chip_info;
|
||||||
|
|
||||||
|
if (fw_config_probe(FW_CONFIG(AUDIO_CODEC_SOURCE, AUDIO_CODEC_ALC5682)))
|
||||||
|
config->hid = "10EC5682";
|
||||||
|
else if (fw_config_probe(FW_CONFIG(AUDIO_CODEC_SOURCE,
|
||||||
|
AUDIO_CODEC_ALC5682I_VS)))
|
||||||
|
config->hid = "RTL5682";
|
||||||
|
}
|
||||||
|
void variant_devtree_update(void)
|
||||||
|
{
|
||||||
|
audio_codec_update();
|
||||||
|
}
|
Loading…
Reference in a new issue