GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mb/google/brya/variants/primus: remove board_id check for ALC5682I-VS 

The board ID check for audio codec is no longer required, therefore
remove it.

BUG=b:210705216
TEST=emerge-brya coreboot chromeos-bootimage and check audio function

Signed-off-by: Malik_Hsu <malik_hsu@wistron.corp-partner.google.com>
Change-Id: Ifbe838186da2e64737a9ffb557cf324124e79a9d
Reviewed-on: https://review.coreboot.org/c/coreboot/+/60128
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: YH Lin <yueherngl@google.com>
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
This commit is contained in:
Malik_Hsu 2021-12-15 10:32:20 +08:00 committed by Tim Wawrzynczak
parent 8402c421b1
commit a9796ce010
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/mainboard/google/brya/variants/primus/variant.c
View File

@ -17,14 +17,11 @@ static void devtree_update_emmc_rtd3(uint32_t board_ver)
emmc_rtd3->enabled = 0; emmc_rtd3->enabled = 0;
} }
static void devtree_update_audio_codec(uint32_t board_ver) static void devtree_update_audio_codec(void)
{ {
struct device *audio_codec = DEV_PTR(audio_codec); struct device *audio_codec = DEV_PTR(audio_codec);
struct drivers_i2c_generic_config *config = audio_codec->chip_info; struct drivers_i2c_generic_config *config = audio_codec->chip_info;
if (board_ver <= 1)
return;
if (fw_config_probe(FW_CONFIG(AUDIO, MAX98360_ALC5682I_VS_I2S))) if (fw_config_probe(FW_CONFIG(AUDIO, MAX98360_ALC5682I_VS_I2S)))
config->hid = "RTL5682"; config->hid = "RTL5682";
} }
@ -58,5 +55,5 @@ void variant_devtree_update(void)
uint32_t board_ver = board_id(); uint32_t board_ver = board_id();
disable_unused_gpios(); disable_unused_gpios();
devtree_update_emmc_rtd3(board_ver); devtree_update_emmc_rtd3(board_ver);
devtree_update_audio_codec(board_ver); devtree_update_audio_codec();
} }

7
src/mainboard/google/brya/variants/primus4es/variant.c
View File

@ -17,14 +17,11 @@ static void devtree_update_emmc_rtd3(uint32_t board_ver)
emmc_rtd3->enabled = 0; emmc_rtd3->enabled = 0;
} }
static void devtree_update_audio_codec(uint32_t board_ver) static void devtree_update_audio_codec(void)
{ {
struct device *audio_codec = DEV_PTR(audio_codec); struct device *audio_codec = DEV_PTR(audio_codec);
struct drivers_i2c_generic_config *config = audio_codec->chip_info; struct drivers_i2c_generic_config *config = audio_codec->chip_info;
if (board_ver <= 1)
return;
if (fw_config_probe(FW_CONFIG(AUDIO, MAX98360_ALC5682I_VS_I2S))) if (fw_config_probe(FW_CONFIG(AUDIO, MAX98360_ALC5682I_VS_I2S)))
config->hid = "RTL5682"; config->hid = "RTL5682";
} }
@ -58,5 +55,5 @@ void variant_devtree_update(void)
uint32_t board_ver = board_id(); uint32_t board_ver = board_id();
disable_unused_gpios(); disable_unused_gpios();
devtree_update_emmc_rtd3(board_ver); devtree_update_emmc_rtd3(board_ver);
devtree_update_audio_codec(board_ver); devtree_update_audio_codec();
} }