GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sb/intel/i82801ix: Use <device/azalia_device.h> registers 

Change-Id: Id6c2c7b474ad8f57294bae67c33b2dd26a6a95ad
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/44129
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Elyes HAOUAS 2020-08-03 15:35:47 +02:00 committed by Patrick Georgi
parent f1da909dd4
commit e5954bad5b
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/southbridge/intel/i82801ix/azalia.c
View File

@ -11,10 +11,6 @@
#include "chip.h" #include "chip.h"
#include "i82801ix.h" #include "i82801ix.h"
#define HDA_ICII_REG 0x68
#define HDA_ICII_BUSY (1 << 0)
#define HDA_ICII_VALID (1 << 1)
static int set_bits(void *port, u32 mask, u32 val) static int set_bits(void *port, u32 mask, u32 val)
{ {
u32 reg32; u32 reg32;
@ -47,15 +43,15 @@ static int codec_detect(u8 *base)
u32 reg32; u32 reg32;
/* Set Bit0 to 0 to enter reset state (BAR + 0x8)[0] */ /* Set Bit0 to 0 to enter reset state (BAR + 0x8)[0] */
if (set_bits(base + 0x08, 1, 0) == -1) if (set_bits(base + HDA_GCTL_REG, 1, 0) == -1)
goto no_codec; goto no_codec;
/* Set Bit 0 to 1 to exit reset state (BAR + 0x8)[0] */ /* Set Bit 0 to 1 to exit reset state (BAR + 0x8)[0] */
if (set_bits(base + 0x08, 1, 1) == -1) if (set_bits(base + HDA_GCTL_REG, 1, 1) == -1)
goto no_codec; goto no_codec;
/* Read in Codec location (BAR + 0xe)[2..0]*/ /* Read in Codec location (BAR + 0xe)[2..0]*/
reg32 = read32(base + 0xe); reg32 = read32(base + HDA_STATESTS_REG);
reg32 &= 0x0f; reg32 &= 0x0f;
if (!reg32) if (!reg32)
goto no_codec; goto no_codec;
@ -65,7 +61,7 @@ static int codec_detect(u8 *base)
no_codec: no_codec:
/* Codec Not found */ /* Codec Not found */
/* Put HDA back in reset (BAR + 0x8) [0] */ /* Put HDA back in reset (BAR + 0x8) [0] */
set_bits(base + 0x08, 1, 0); set_bits(base + HDA_GCTL_REG, 1, 0);
printk(BIOS_DEBUG, "Azalia: No codec!\n"); printk(BIOS_DEBUG, "Azalia: No codec!\n");
return 0; return 0;
} }
@ -118,9 +114,9 @@ static int wait_for_valid(u8 *base)
u32 reg32; u32 reg32;
/* Send the verb to the codec */ /* Send the verb to the codec */
reg32 = read32(base + 0x68); reg32 = read32(base + HDA_ICII_REG);
reg32 |= (1 << 0) | (1 << 1); reg32 |= HDA_ICII_BUSY | HDA_ICII_VALID;
write32(base + 0x68, reg32); write32(base + HDA_ICII_REG, reg32);
/* Use a 50 usec timeout - the Linux kernel uses the same duration */ /* Use a 50 usec timeout - the Linux kernel uses the same duration */
@ -149,12 +145,12 @@ static void codec_init(struct device *dev, u8 *base, int addr)
return; return;
reg32 = (addr << 28) | 0x000f0000; reg32 = (addr << 28) | 0x000f0000;
write32(base + 0x60, reg32); write32(base + HDA_IC_REG, reg32);
if (wait_for_valid(base) == -1) if (wait_for_valid(base) == -1)
return; return;
reg32 = read32(base + 0x64); reg32 = read32(base + HDA_IR_REG);
/* 2 */ /* 2 */
printk(BIOS_DEBUG, "Azalia: codec viddid: %08x\n", reg32); printk(BIOS_DEBUG, "Azalia: codec viddid: %08x\n", reg32);
@ -171,7 +167,7 @@ static void codec_init(struct device *dev, u8 *base, int addr)
if (wait_for_ready(base) == -1) if (wait_for_ready(base) == -1)
return; return;
write32(base + 0x60, verb[i]); write32(base + HDA_IC_REG, verb[i]);
if (wait_for_valid(base) == -1) if (wait_for_valid(base) == -1)
return; return;
@ -191,7 +187,7 @@ static void codecs_init(struct device *dev, u8 *base, u32 codec_mask)
if (wait_for_ready(base) == -1) if (wait_for_ready(base) == -1)
return; return;
write32(base + 0x60, pc_beep_verbs[i]); write32(base + HDA_IC_REG, pc_beep_verbs[i]);
if (wait_for_valid(base) == -1) if (wait_for_valid(base) == -1)
return; return;