diff --git a/src/soc/intel/broadwell/pch/hda.c b/src/soc/intel/broadwell/pch/hda.c
index 04390d1342..c6ae590bc4 100644
--- a/src/soc/intel/broadwell/pch/hda.c
+++ b/src/soc/intel/broadwell/pch/hda.c
@@ -60,10 +60,6 @@ static void hda_pch_init(struct device *dev, u8 *base)
 	reg32 |= (1 << 24);
 	pci_write_config32(dev, 0xc4, reg32);
 
-	reg8 = pci_read_config8(dev, 0x40); // Audio Control
-	reg8 |= 1; // Select HDA mode
-	pci_write_config8(dev, 0x40, reg8);
-
 	reg8 = pci_read_config8(dev, 0x4d); // Docking Status
 	reg8 &= ~(1 << 7); // Docking not supported
 	pci_write_config8(dev, 0x4d, reg8);
diff --git a/src/southbridge/intel/lynxpoint/azalia.c b/src/southbridge/intel/lynxpoint/azalia.c
index ef450a501f..ad84b0093a 100644
--- a/src/southbridge/intel/lynxpoint/azalia.c
+++ b/src/southbridge/intel/lynxpoint/azalia.c
@@ -81,9 +81,6 @@ static void azalia_pch_init(struct device *dev, u8 *base)
 	if (!pch_is_lp())
 		pci_and_config32(dev, 0xd0, ~(1 << 31));
 
-	// Select Azalia mode
-	pci_or_config8(dev, 0x40, 1); // Audio Control
-
 	// Docking not supported
 	pci_and_config8(dev, 0x4d, (u8)~(1 << 7)); // Docking Status