From 86dfd3c08329ff59c976c24fa47a2d2f6c88c1b5 Mon Sep 17 00:00:00 2001 From: Angel Pons Date: Wed, 10 Nov 2021 17:58:12 +0100 Subject: [PATCH] device/azalia_device: Adapt and export `codec_init()` Make the `codec_init()` function non-static so that it can be used in other places. Rename it to `azalia_codec_init()` for consistency with the other functions of the API. Also, update the function's signature to make it more flexible. Remove the unused `dev` parameter and allow callers to pass the verb table to use. Update the original call site to preserve behavior. Change-Id: I5343796242065b5fedc78cd95bcf010c9e2623dd Signed-off-by: Angel Pons Reviewed-on: https://review.coreboot.org/c/coreboot/+/59117 Reviewed-by: Arthur Heymans Tested-by: build bot (Jenkins) --- src/device/azalia_device.c | 6 +++--- src/include/device/azalia_device.h | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/device/azalia_device.c b/src/device/azalia_device.c index c390db18fa..2305101019 100644 --- a/src/device/azalia_device.c +++ b/src/device/azalia_device.c @@ -227,7 +227,7 @@ __weak void mainboard_azalia_program_runtime_verbs(u8 *base, u32 viddid) { } -static void codec_init(struct device *dev, u8 *base, int addr) +void azalia_codec_init(u8 *base, int addr, const u32 *verb_table, u32 verb_table_bytes) { u32 reg32; const u32 *verb; @@ -252,7 +252,7 @@ static void codec_init(struct device *dev, u8 *base, int addr) /* 2 */ reg32 = read32(base + HDA_IR_REG); printk(BIOS_DEBUG, "azalia_audio: codec viddid: %08x\n", reg32); - verb_size = azalia_find_verb(cim_verb_data, cim_verb_data_size, reg32, &verb); + verb_size = azalia_find_verb(verb_table, verb_table_bytes, reg32, &verb); if (!verb_size) { printk(BIOS_DEBUG, "azalia_audio: No verb!\n"); @@ -276,7 +276,7 @@ void azalia_codecs_init(struct device *dev, u8 *base, u16 codec_mask) for (i = CONFIG_AZALIA_MAX_CODECS - 1; i >= 0; i--) { if (codec_mask & (1 << i)) - codec_init(dev, base, i); + azalia_codec_init(base, i, cim_verb_data, cim_verb_data_size); } azalia_program_verb_table(base, pc_beep_verbs, pc_beep_verbs_size); diff --git a/src/include/device/azalia_device.h b/src/include/device/azalia_device.h index 8f0d212205..d717fdd7ef 100644 --- a/src/include/device/azalia_device.h +++ b/src/include/device/azalia_device.h @@ -23,6 +23,7 @@ int azalia_enter_reset(u8 *base); int azalia_exit_reset(u8 *base); u32 azalia_find_verb(const u32 *verb_table, u32 verb_table_bytes, u32 viddid, const u32 **verb); int azalia_program_verb_table(u8 *base, const u32 *verbs, u32 verb_size); +void azalia_codec_init(u8 *base, int addr, const u32 *verb_table, u32 verb_table_bytes); void azalia_codecs_init(struct device *dev, u8 *base, u16 codec_mask); void azalia_audio_init(struct device *dev); extern struct device_operations default_azalia_audio_ops;