2 files changed, 11 insertions, 41 deletions
diff --git a/src/mainboard/packardbell/ms2290/hda_verb.h b/src/mainboard/packardbell/ms2290/hda_verb.h
index 1e3ccc4fc1..3cc00dbe9c 100644
--- a/src/mainboard/packardbell/ms2290/hda_verb.h
+++ b/src/mainboard/packardbell/ms2290/hda_verb.h
@@ -25,66 +25,36 @@ static const u32 mainboard_cim_verb_data[] = {
 	0x00000006,	/* Number of 4 dword sets */
 
 	/* NID 0x01: Subsystem ID.  */
-	0x00172079,
-	0x00172103,
-	0x00172225,
-	0x00172310,
+	AZALIA_SUBVENDOR(0x0, 0x10250379),
 
 	/* NID 0x14.  */
-	0x01471C10,
-	0x01471D01,
-	0x01471E13,
-	0x01471F99,
+	AZALIA_PIN_CFG(0x0, 0x14, 0x99130110),
 
 	/* NID 0x18.  */
-	0x01871C30,
-	0x01871D18,
-	0x01871EA1,
-	0x01871F03,
+	AZALIA_PIN_CFG(0x0, 0x18, 0x03A11830),
 
 	/* NID 0x19.  */
-	0x01971C20,
-	0x01971D09,
-	0x01971EA3,
-	0x01971F99,
+	AZALIA_PIN_CFG(0x0, 0x19, 0x99A30920),
 
 	/* NID 0x1D.  */
-	0x01D71C2D,
-	0x01D71D99,
-	0x01D71E17,
-	0x01D71F40,
+	AZALIA_PIN_CFG(0x0, 0x1D, 0x4017992D),
 
 	/* NID 0x21.  */
-	0x02171C1F,
-	0x02171D10,
-	0x02171E21,
-	0x02171F03,
+	AZALIA_PIN_CFG(0x0, 0x21, 0x0321101F),
 
 	0x80862804,	/* Codec Vendor / Device ID: Intel Ibexpeak HDMI.  */
 	0x80860101,	/* Subsystem ID  */
 	0x00000004,	/* Number of 4 dword sets */
 
 	/* NID 0x01, HDA Codec Subsystem ID Verb Table: 0x17aa21b5 */
-	0x30172001,
-	0x30172101,
-	0x30172286,
-	0x30172380,
+	AZALIA_SUBVENDOR(0x3, 0x80860101),
 
 	/* NID 0x04.  */
-	0x30471C10,
-	0x30471D00,
-	0x30471E56,
-	0x30471F18,
+	AZALIA_PIN_CFG(0x3, 0x04, 0x18560010),
 
 	/* NID 0x05.  */
-	0x30571C20,
-	0x30571D00,
-	0x30571E56,
-	0x30571F58,
+	AZALIA_PIN_CFG(0x3, 0x05, 0x58560020),
 
 	/* NID 0x06.  */
-	0x30671C30,
-	0x30671D00,
-	0x30671E56,
-	0x30671F58,
+	AZALIA_PIN_CFG(0x3, 0x06, 0x58560030),
 };
diff --git a/src/mainboard/packardbell/ms2290/mainboard.c b/src/mainboard/packardbell/ms2290/mainboard.c
index aca221a7b3..62e7fd906d 100644
--- a/src/mainboard/packardbell/ms2290/mainboard.c
+++ b/src/mainboard/packardbell/ms2290/mainboard.c
@@ -34,7 +34,6 @@
 #include <ec/acpi/ec.h>
 
 #include <pc80/mc146818rtc.h>
-#include "hda_verb.h"
 #include <arch/x86/include/arch/acpigen.h>
 #if CONFIG_PCI_OPTION_ROM_RUN_YABEL || CONFIG_PCI_OPTION_ROM_RUN_REALMODE
 #include <x86emu/regs.h>
@@ -45,6 +44,7 @@
 #include <device/pci.h>
 #include <smbios.h>
 #include <device/azalia_device.h>
+#include "hda_verb.h"
 
 static acpi_cstate_t cst_entries[] = {
 	{1, 1, 1000, {0x7f, 1, 2, {0}, 1, 0}},