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

sb/intel/ibexpeak/azalia.c: Use 'pci_{and,or}_config' 

Change-Id: Iafe1a3476c0afa5ebfb75fb704429594e24e96f2
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/61662
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
This commit is contained in:
Elyes HAOUAS 2022-02-07 08:00:59 +01:00 committed by Felix Held
parent bc13c64a2d
commit f91538c3ec
1 changed files with 11 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/southbridge/intel/ibexpeak/azalia.c
View File

@ -40,8 +40,6 @@ static void azalia_init(struct device *dev)
u8 *base; u8 *base;
struct resource *res; struct resource *res;
u32 codec_mask; u32 codec_mask;
u8 reg8;
u16 reg16;
u32 reg32; u32 reg32;
/* Find base address */ /* Find base address */
@ -61,33 +59,21 @@ static void azalia_init(struct device *dev)
reg32 |= RCBA32(0x2030) & 0xfe; reg32 |= RCBA32(0x2030) & 0xfe;
pci_write_config32(dev, 0x120, reg32); pci_write_config32(dev, 0x120, reg32);
reg16 = pci_read_config16(dev, 0x78); pci_or_config16(dev, 0x78, 1 << 11);
reg16 |= (1 << 11);
pci_write_config16(dev, 0x78, reg16);
} else } else
printk(BIOS_DEBUG, "Azalia: V1CTL disabled.\n"); printk(BIOS_DEBUG, "Azalia: V1CTL disabled.\n");
reg32 = pci_read_config32(dev, 0x114); pci_and_config32(dev, 0x114, ~0xfe);
reg32 &= ~0xfe;
pci_write_config32(dev, 0x114, reg32);
// Set VCi enable bit // Set VCi enable bit
reg32 = pci_read_config32(dev, 0x120); pci_or_config32(dev, 0x120, 1 << 31);
reg32 |= (1 << 31);
pci_write_config32(dev, 0x120, reg32);
// Enable HDMI codec: // Enable HDMI codec:
reg32 = pci_read_config32(dev, 0xc4); pci_or_config32(dev, 0xc4, 1 << 1);
reg32 |= (1 << 1);
pci_write_config32(dev, 0xc4, reg32);
reg8 = pci_read_config8(dev, 0x43); pci_or_config8(dev, 0x43, 1 << 6);
reg8 |= (1 << 6);
pci_write_config8(dev, 0x43, reg8);
reg32 = pci_read_config32(dev, 0xd0); pci_and_config32(dev, 0xd0, ~(1 << 31));
reg32 &= ~(1 << 31);
pci_write_config32(dev, 0xd0, reg32);
/* Set Bus Master */ /* Set Bus Master */
pci_or_config16(dev, PCI_COMMAND, PCI_COMMAND_MASTER); pci_or_config16(dev, PCI_COMMAND, PCI_COMMAND_MASTER);
@ -103,14 +89,11 @@ static void azalia_init(struct device *dev)
/* Wait 1ms */ /* Wait 1ms */
udelay(1000); udelay(1000);
// // Select Azalia mode. This needs to be controlled via devicetree.cb
reg8 = pci_read_config8(dev, 0x40); // Audio Control pci_or_config8(dev, 0x40, 1); // Audio Control
reg8 |= 1; // Select Azalia mode. This needs to be controlled via devicetree.cb
pci_write_config8(dev, 0x40, reg8);
reg8 = pci_read_config8(dev, 0x4d); // Docking Status // Docking not supported
reg8 &= ~(1 << 7); // Docking not supported pci_and_config8(dev, 0x4d, (u8)~(1 << 7)); // Docking Status
pci_write_config8(dev, 0x4d, reg8);
codec_mask = codec_detect(base); codec_mask = codec_detect(base);
@ -120,10 +103,7 @@ static void azalia_init(struct device *dev)
} }
/* Enable dynamic clock gating */ /* Enable dynamic clock gating */
reg8 = pci_read_config8(dev, 0x43); pci_update_config8(dev, 0x43, ~0x07, (1 << 2) | (1 << 0));
reg8 &= ~0x7;
reg8 |= (1 << 2) | (1 << 0);
pci_write_config8(dev, 0x43, reg8);
} }
static struct device_operations azalia_ops = { static struct device_operations azalia_ops = {