HAOUAS Elyes has uploaded this change for review.
{soc/intel/common,sb/intel/lynxpoint}/hda_verb.c: Reduce differences
Change-Id: Ie63d7671eb19f0d4c4f67dfe242193e7949afdea
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
---
M src/soc/intel/common/hda_verb.c
M src/southbridge/intel/lynxpoint/hda_verb.c
2 files changed, 29 insertions(+), 44 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/92/44392/1
diff --git a/src/soc/intel/common/hda_verb.c b/src/soc/intel/common/hda_verb.c
index 6c0ace7..80ac489 100644
--- a/src/soc/intel/common/hda_verb.c
+++ b/src/soc/intel/common/hda_verb.c
@@ -22,9 +22,7 @@
reg32 |= val;
write32(port, reg32);
- /* Wait for readback of register to
- * match what was just written to it
- */
+ /* Wait for readback of register to match what was just written to it */
count = 50;
do {
/* Wait 1ms based on BKDG wait time */
@@ -83,18 +81,16 @@
}
/*
- * Wait 50usec for the codec to indicate it is ready
- * no response would imply that the codec is non-operative
+ * Wait 50usec for the codec to indicate it is ready.
+ * No response would imply that the codec is non-operative.
*/
static int hda_wait_for_ready(u8 *base)
{
- /* Use a 50 usec timeout - the Linux kernel uses the
- * same duration */
-
+ /* Use a 50 usec timeout - the Linux kernel uses the same duration */
int timeout = 50;
while (timeout--) {
- u32 reg32 = read32(base + HDA_ICII_REG);
+ u32 reg32 = read32(base + HDA_ICII_REG);
if (!(reg32 & HDA_ICII_BUSY))
return 0;
udelay(1);
@@ -104,27 +100,23 @@
}
/*
- * Wait 50usec for the codec to indicate that it accepted
- * the previous command. No response would imply that the code
- * is non-operative
+ * Wait 50usec for the codec to indicate that it accepted the previous command.
+ * No response would imply that the code is non-operative.
*/
static int hda_wait_for_valid(u8 *base)
{
u32 reg32;
+ /* Use a 50 usec timeout - the Linux kernel uses the same duration */
+ int timeout = 50;
/* Send the verb to the codec */
reg32 = read32(base + HDA_ICII_REG);
reg32 |= HDA_ICII_BUSY | HDA_ICII_VALID;
write32(base + HDA_ICII_REG, reg32);
- /* Use a 50 usec timeout - the Linux kernel uses the
- * same duration */
-
- int timeout = 50;
while (timeout--) {
reg32 = read32(base + HDA_ICII_REG);
- if ((reg32 & (HDA_ICII_VALID | HDA_ICII_BUSY)) ==
- HDA_ICII_VALID)
+ if ((reg32 & (HDA_ICII_VALID | HDA_ICII_BUSY)) == HDA_ICII_VALID)
return 0;
udelay(1);
}
diff --git a/src/southbridge/intel/lynxpoint/hda_verb.c b/src/southbridge/intel/lynxpoint/hda_verb.c
index 6017d56..85fde86 100644
--- a/src/southbridge/intel/lynxpoint/hda_verb.c
+++ b/src/southbridge/intel/lynxpoint/hda_verb.c
@@ -4,10 +4,11 @@
#include <device/azalia_device.h>
#include <device/mmio.h>
#include <delay.h>
+
#include "pch.h"
#include "hda_verb.h"
-/**
+/*
* Set bits in a register and wait for status
*/
static int set_bits(void *port, u32 mask, u32 val)
@@ -22,9 +23,7 @@
reg32 |= val;
write32(port, reg32);
- /* Wait for readback of register to
- * match what was just written to it
- */
+ /* Wait for readback of register to match what was just written to it */
count = 50;
do {
/* Wait 1ms based on BKDG wait time */
@@ -39,7 +38,7 @@
return 0;
}
-/**
+/*
* Probe for supported codecs
*/
int hda_codec_detect(u8 *base)
@@ -69,19 +68,17 @@
return 0;
}
-/**
- * Wait 50usec for the codec to indicate it is ready
- * no response would imply that the codec is non-operative
+/*
+ * Wait 50usec for the codec to indicate it is ready.
+ * No response would imply that the codec is non-operative.
*/
static int hda_wait_for_ready(u8 *base)
{
- /* Use a 50 usec timeout - the Linux kernel uses the
- * same duration */
-
+ /* Use a 50 usec timeout - the Linux kernel uses the same duration */
int timeout = 50;
while (timeout--) {
- u32 reg32 = read32(base + HDA_ICII_REG);
+ u32 reg32 = read32(base + HDA_ICII_REG);
if (!(reg32 & HDA_ICII_BUSY))
return 0;
udelay(1);
@@ -90,28 +87,24 @@
return -1;
}
-/**
- * Wait 50usec for the codec to indicate that it accepted
- * the previous command. No response would imply that the code
- * is non-operative
+/*
+ * Wait 50usec for the codec to indicate that it accepted the previous command.
+ * No response would imply that the code is non-operative.
*/
static int hda_wait_for_valid(u8 *base)
{
u32 reg32;
+ /* Use a 50 usec timeout - the Linux kernel uses the same duration */
+ int timeout = 50;
/* Send the verb to the codec */
reg32 = read32(base + HDA_ICII_REG);
reg32 |= HDA_ICII_BUSY | HDA_ICII_VALID;
write32(base + HDA_ICII_REG, reg32);
- /* Use a 50 usec timeout - the Linux kernel uses the
- * same duration */
-
- int timeout = 50;
while (timeout--) {
reg32 = read32(base + HDA_ICII_REG);
- if ((reg32 & (HDA_ICII_VALID | HDA_ICII_BUSY)) ==
- HDA_ICII_VALID)
+ if ((reg32 & (HDA_ICII_VALID | HDA_ICII_BUSY)) == HDA_ICII_VALID)
return 0;
udelay(1);
}
@@ -119,7 +112,7 @@
return -1;
}
-/**
+/*
* Find a specific entry within a verb table
*
* @param verb_table_bytes: verb table size in bytes
@@ -148,7 +141,7 @@
const u32 *verb_table_data,
u32 viddid, const u32 **verb)
{
- int idx=0;
+ int idx = 0;
while (idx < (verb_table_bytes / sizeof(u32))) {
u32 verb_size = 4 * verb_table_data[idx+2]; // in u32
@@ -164,7 +157,7 @@
return 0;
}
-/**
+/*
* Write a supplied verb table
*/
int hda_codec_write(u8 *base, u32 size, const u32 *data)
@@ -184,7 +177,7 @@
return 0;
}
-/**
+/*
* Initialize codec, then find the verb table and write it
*/
int hda_codec_init(u8 *base, int addr, int verb_size, const u32 *verb_data)
To view, visit change 44392. To unsubscribe, or for help writing mail filters, visit settings.