summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAngel Pons <th3fanbus@gmail.com>2021-02-08 12:37:56 +0100
committerPatrick Georgi <pgeorgi@google.com>2021-02-10 07:21:00 +0000
commit44c431e16194213e5a1bd26d7a1e0dd09e53deef (patch)
treeb090b5776ff34dd98d76a2494e025a0b0f4b2bba
parent2e77443e4766ab16be338110b97763f6bbaec679 (diff)
device/azalia_device: Add function to program a verb table
On some boards, Azalia configuration depends on config settings that are not known at compile-time. Expose a function to program a verb table, to be used in subsequent commits. Change-Id: Ie9607f6e733df66f0ca26a4bb70e0864ce1d4512 Signed-off-by: Angel Pons <th3fanbus@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/50387 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Patrick Rudolph <siro@das-labor.org>
-rw-r--r--src/device/azalia_device.c33
-rw-r--r--src/include/device/azalia_device.h1
2 files changed, 24 insertions, 10 deletions
diff --git a/src/device/azalia_device.c b/src/device/azalia_device.c
index 8e5998cdeb..5a3a5ded04 100644
--- a/src/device/azalia_device.c
+++ b/src/device/azalia_device.c
@@ -188,12 +188,33 @@ static int wait_for_valid(u8 *base)
return -1;
}
+static int azalia_write_verb(u8 *base, u32 verb)
+{
+ if (wait_for_ready(base) < 0)
+ return -1;
+
+ write32(base + HDA_IC_REG, verb);
+
+ return wait_for_valid(base);
+}
+
+int azalia_program_verb_table(u8 *base, const u32 *verbs, u32 verb_size)
+{
+ if (!verbs)
+ return 0;
+
+ for (u32 i = 0; i < verb_size; i++) {
+ if (azalia_write_verb(base, verbs[i]) < 0)
+ return -1;
+ }
+ return 0;
+}
+
static void codec_init(struct device *dev, u8 *base, int addr)
{
u32 reg32;
const u32 *verb;
u32 verb_size;
- int i;
printk(BIOS_DEBUG, "azalia_audio: Initializing codec #%d\n", addr);
@@ -223,15 +244,7 @@ static void codec_init(struct device *dev, u8 *base, int addr)
printk(BIOS_DEBUG, "azalia_audio: verb_size: %u\n", verb_size);
/* 3 */
- for (i = 0; i < verb_size; i++) {
- if (wait_for_ready(base) < 0)
- return;
-
- write32(base + HDA_IC_REG, verb[i]);
-
- if (wait_for_valid(base) < 0)
- return;
- }
+ azalia_program_verb_table(base, verb, verb_size);
printk(BIOS_DEBUG, "azalia_audio: verb loaded.\n");
}
diff --git a/src/include/device/azalia_device.h b/src/include/device/azalia_device.h
index 1b4e769c3f..ce8c0d193e 100644
--- a/src/include/device/azalia_device.h
+++ b/src/include/device/azalia_device.h
@@ -22,6 +22,7 @@ int azalia_set_bits(void *port, u32 mask, u32 val);
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_audio_init(struct device *dev);
extern struct device_operations default_azalia_audio_ops;