summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/device/azalia_device.c4
-rw-r--r--src/include/device/azalia_device.h1
-rw-r--r--src/southbridge/intel/bd82x6x/azalia.c20
-rw-r--r--src/southbridge/intel/i82801gx/azalia.c20
-rw-r--r--src/southbridge/intel/i82801ix/azalia.c20
-rw-r--r--src/southbridge/intel/i82801jx/azalia.c20
-rw-r--r--src/southbridge/intel/ibexpeak/azalia.c20
7 files changed, 8 insertions, 97 deletions
diff --git a/src/device/azalia_device.c b/src/device/azalia_device.c
index e12ffad61e..20e7d2b50e 100644
--- a/src/device/azalia_device.c
+++ b/src/device/azalia_device.c
@@ -85,7 +85,7 @@ no_codec:
return 0;
}
-static u32 find_verb(struct device *dev, u32 viddid, const u32 **verb)
+u32 azalia_find_verb(struct device *dev, u32 viddid, const u32 **verb)
{
int idx = 0;
@@ -179,7 +179,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 = find_verb(dev, reg32, &verb);
+ verb_size = azalia_find_verb(dev, reg32, &verb);
if (!verb_size) {
printk(BIOS_DEBUG, "azalia_audio: No verb!\n");
diff --git a/src/include/device/azalia_device.h b/src/include/device/azalia_device.h
index 7bb8e10fbc..7b5f5d61b1 100644
--- a/src/include/device/azalia_device.h
+++ b/src/include/device/azalia_device.h
@@ -19,6 +19,7 @@
#define HDA_ICII_VALID (1 << 1)
int azalia_set_bits(void *port, u32 mask, u32 val);
+u32 azalia_find_verb(struct device *dev, u32 viddid, const u32 **verb);
void azalia_audio_init(struct device *dev);
extern struct device_operations default_azalia_audio_ops;
diff --git a/src/southbridge/intel/bd82x6x/azalia.c b/src/southbridge/intel/bd82x6x/azalia.c
index 5e810c4cc0..1925a6f47b 100644
--- a/src/southbridge/intel/bd82x6x/azalia.c
+++ b/src/southbridge/intel/bd82x6x/azalia.c
@@ -41,24 +41,6 @@ no_codec:
return 0;
}
-static u32 find_verb(struct device *dev, u32 viddid, const u32 **verb)
-{
- int idx = 0;
-
- while (idx < (cim_verb_data_size / sizeof(u32))) {
- u32 verb_size = 4 * cim_verb_data[idx + 2]; // in u32
- if (cim_verb_data[idx] != viddid) {
- idx += verb_size + 3; // skip verb + header
- continue;
- }
- *verb = &cim_verb_data[idx + 3];
- return verb_size;
- }
-
- /* Not all codecs need to load another verb */
- return 0;
-}
-
/*
* Wait 50usec for the codec to indicate it is ready.
* No response would imply that the codec is non-operative.
@@ -131,7 +113,7 @@ static void codec_init(struct device *dev, u8 *base, int addr)
/* 2 */
reg32 = read32(base + HDA_IR_REG);
printk(BIOS_DEBUG, "Azalia: codec viddid: %08x\n", reg32);
- verb_size = find_verb(dev, reg32, &verb);
+ verb_size = azalia_find_verb(dev, reg32, &verb);
if (!verb_size) {
printk(BIOS_DEBUG, "Azalia: No verb!\n");
diff --git a/src/southbridge/intel/i82801gx/azalia.c b/src/southbridge/intel/i82801gx/azalia.c
index a511468171..fa3e9b405c 100644
--- a/src/southbridge/intel/i82801gx/azalia.c
+++ b/src/southbridge/intel/i82801gx/azalia.c
@@ -39,24 +39,6 @@ no_codec:
return 0;
}
-static u32 find_verb(struct device *dev, u32 viddid, const u32 **verb)
-{
- int idx = 0;
-
- while (idx < (cim_verb_data_size / sizeof(u32))) {
- u32 verb_size = 4 * cim_verb_data[idx + 2]; // in u32
- if (cim_verb_data[idx] != viddid) {
- idx += verb_size + 3; // skip verb + header
- continue;
- }
- *verb = &cim_verb_data[idx + 3];
- return verb_size;
- }
-
- /* Not all codecs need to load another verb */
- return 0;
-}
-
/*
* Wait 50usec for the codec to indicate it is ready.
* No response would imply that the codec is non-operative.
@@ -129,7 +111,7 @@ static void codec_init(struct device *dev, u8 *base, int addr)
/* 2 */
reg32 = read32(base + HDA_IR_REG);
printk(BIOS_DEBUG, "Azalia: codec viddid: %08x\n", reg32);
- verb_size = find_verb(dev, reg32, &verb);
+ verb_size = azalia_find_verb(dev, reg32, &verb);
if (!verb_size) {
printk(BIOS_DEBUG, "Azalia: No verb!\n");
diff --git a/src/southbridge/intel/i82801ix/azalia.c b/src/southbridge/intel/i82801ix/azalia.c
index 7078e6798b..9752285632 100644
--- a/src/southbridge/intel/i82801ix/azalia.c
+++ b/src/southbridge/intel/i82801ix/azalia.c
@@ -39,24 +39,6 @@ no_codec:
return 0;
}
-static u32 find_verb(struct device *dev, u32 viddid, const u32 **verb)
-{
- int idx = 0;
-
- while (idx < (cim_verb_data_size / sizeof(u32))) {
- u32 verb_size = 4 * cim_verb_data[idx + 2]; // in u32
- if (cim_verb_data[idx] != viddid) {
- idx += verb_size + 3; // skip verb + header
- continue;
- }
- *verb = &cim_verb_data[idx + 3];
- return verb_size;
- }
-
- /* Not all codecs need to load another verb */
- return 0;
-}
-
/*
* Wait 50usec for the codec to indicate it is ready.
* No response would imply that the codec is non-operative.
@@ -129,7 +111,7 @@ static void codec_init(struct device *dev, u8 *base, int addr)
/* 2 */
reg32 = read32(base + HDA_IR_REG);
printk(BIOS_DEBUG, "Azalia: codec viddid: %08x\n", reg32);
- verb_size = find_verb(dev, reg32, &verb);
+ verb_size = azalia_find_verb(dev, reg32, &verb);
if (!verb_size) {
printk(BIOS_DEBUG, "Azalia: No verb!\n");
diff --git a/src/southbridge/intel/i82801jx/azalia.c b/src/southbridge/intel/i82801jx/azalia.c
index 982efb7412..81768bb693 100644
--- a/src/southbridge/intel/i82801jx/azalia.c
+++ b/src/southbridge/intel/i82801jx/azalia.c
@@ -39,24 +39,6 @@ no_codec:
return 0;
}
-static u32 find_verb(struct device *dev, u32 viddid, const u32 **verb)
-{
- int idx = 0;
-
- while (idx < (cim_verb_data_size / sizeof(u32))) {
- u32 verb_size = 4 * cim_verb_data[idx + 2]; // in u32
- if (cim_verb_data[idx] != viddid) {
- idx += verb_size + 3; // skip verb + header
- continue;
- }
- *verb = &cim_verb_data[idx + 3];
- return verb_size;
- }
-
- /* Not all codecs need to load another verb */
- return 0;
-}
-
/*
* Wait 50usec for the codec to indicate it is ready.
* No response would imply that the codec is non-operative.
@@ -129,7 +111,7 @@ static void codec_init(struct device *dev, u8 *base, int addr)
/* 2 */
reg32 = read32(base + HDA_IR_REG);
printk(BIOS_DEBUG, "Azalia: codec viddid: %08x\n", reg32);
- verb_size = find_verb(dev, reg32, &verb);
+ verb_size = azalia_find_verb(dev, reg32, &verb);
if (!verb_size) {
printk(BIOS_DEBUG, "Azalia: No verb!\n");
diff --git a/src/southbridge/intel/ibexpeak/azalia.c b/src/southbridge/intel/ibexpeak/azalia.c
index 0c19598aa3..af4f8ff2b2 100644
--- a/src/southbridge/intel/ibexpeak/azalia.c
+++ b/src/southbridge/intel/ibexpeak/azalia.c
@@ -37,24 +37,6 @@ no_codec:
return 0;
}
-static u32 find_verb(struct device *dev, u32 viddid, const u32 **verb)
-{
- int idx = 0;
-
- while (idx < (cim_verb_data_size / sizeof(u32))) {
- u32 verb_size = 4 * cim_verb_data[idx + 2]; // in u32
- if (cim_verb_data[idx] != viddid) {
- idx += verb_size + 3; // skip verb + header
- continue;
- }
- *verb = &cim_verb_data[idx + 3];
- return verb_size;
- }
-
- /* Not all codecs need to load another verb */
- return 0;
-}
-
/*
* Wait 50usec for the codec to indicate it is ready.
* No response would imply that the codec is non-operative.
@@ -127,7 +109,7 @@ static void codec_init(struct device *dev, u8 *base, int addr)
/* 2 */
reg32 = read32(base + HDA_IR_REG);
printk(BIOS_DEBUG, "Azalia: codec viddid: %08x\n", reg32);
- verb_size = find_verb(dev, reg32, &verb);
+ verb_size = azalia_find_verb(dev, reg32, &verb);
if (!verb_size) {
printk(BIOS_DEBUG, "Azalia: No verb!\n");
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 04:42:10 +0000