From a9796ce010efe31172eaa9677fd7ad1de313a257 Mon Sep 17 00:00:00 2001 From: Malik_Hsu Date: Wed, 15 Dec 2021 10:32:20 +0800 Subject: [PATCH] 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 Change-Id: Ifbe838186da2e64737a9ffb557cf324124e79a9d Reviewed-on: https://review.coreboot.org/c/coreboot/+/60128 Tested-by: build bot (Jenkins) Reviewed-by: YH Lin Reviewed-by: Tim Wawrzynczak --- src/mainboard/google/brya/variants/primus/variant.c | 7 ++----- src/mainboard/google/brya/variants/primus4es/variant.c | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/mainboard/google/brya/variants/primus/variant.c b/src/mainboard/google/brya/variants/primus/variant.c index 4c2458acf7..90999ec223 100644 --- a/src/mainboard/google/brya/variants/primus/variant.c +++ b/src/mainboard/google/brya/variants/primus/variant.c @@ -17,14 +17,11 @@ static void devtree_update_emmc_rtd3(uint32_t board_ver) 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 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))) config->hid = "RTL5682"; } @@ -58,5 +55,5 @@ void variant_devtree_update(void) uint32_t board_ver = board_id(); disable_unused_gpios(); devtree_update_emmc_rtd3(board_ver); - devtree_update_audio_codec(board_ver); + devtree_update_audio_codec(); } diff --git a/src/mainboard/google/brya/variants/primus4es/variant.c b/src/mainboard/google/brya/variants/primus4es/variant.c index 4c2458acf7..90999ec223 100644 --- a/src/mainboard/google/brya/variants/primus4es/variant.c +++ b/src/mainboard/google/brya/variants/primus4es/variant.c @@ -17,14 +17,11 @@ static void devtree_update_emmc_rtd3(uint32_t board_ver) 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 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))) config->hid = "RTL5682"; } @@ -58,5 +55,5 @@ void variant_devtree_update(void) uint32_t board_ver = board_id(); disable_unused_gpios(); devtree_update_emmc_rtd3(board_ver); - devtree_update_audio_codec(board_ver); + devtree_update_audio_codec(); }