azalia: Use convenience macros throughout

Change-Id: Ic044bf155bfcf93fa7cf3afd7287b7d0b615ef6d
Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com>
Reviewed-on: http://review.coreboot.org/6839
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>

2 files changed, 17 insertions, 71 deletions

diff --git a/src/mainboard/lenovo/x220/hda_verb.h b/src/mainboard/lenovo/x220/hda_verb.h
index 6cf79c5fc6..ce980fc2a8 100644
--- a/src/mainboard/lenovo/x220/hda_verb.h
+++ b/src/mainboard/lenovo/x220/hda_verb.h
@@ -37,60 +37,18 @@ static const u32 mainboard_cim_verb_data[] = {
 /* Bits 7:0  - Payload */
 
 /* NID 0x01 - NodeInfo */
-	0x001720DB,
-	0x00172121,
-	0x001722AA,
-	0x00172317,
-
-	0x01971C40,
-	0x01971D10,
-	0x01971E21,
-	0x01971F04,
-
-	0x01A71C50,
-	0x01A71D90,
-	0x01A71EA1,
-	0x01A71F61,
-
-	0x01B71C60,
-	0x01B71D10,
-	0x01B71EA1,
-	0x01B71F04,
-
-	0x01C71C1F,
-	0x01C71D40,
-	0x01C71E21,
-	0x01C71F61,
-
-	0x01D71CF0,
-	0x01D71D01,
-	0x01D71EF0,
-	0x01D71F40,
-
-	0x01E71CF0,
-	0x01E71D01,
-	0x01E71EF0,
-	0x01E71F40,
-
-	0x01F71C10,
-	0x01F71D01,
-	0x01F71E17,
-	0x01F71F90,
-
-	0x02071CF0,
-	0x02071D01,
-	0x02071EF0,
-	0x02071F40,
-
-	0x02271CF0,
-	0x02271D01,
-	0x02271EF0,
-	0x02271F40,
-
-	0x02371C70,
-	0x02371D01,
-	0x02371EA6,
-	0x02371F90,
+	AZALIA_SUBVENDOR(0x0, 0x17AA21DB),
+
+	AZALIA_PIN_CFG(0x0, 0x19, 0x04211040),
+	AZALIA_PIN_CFG(0x0, 0x1A, 0x61A19050),
+	AZALIA_PIN_CFG(0x0, 0x1B, 0x04A11060),
+	AZALIA_PIN_CFG(0x0, 0x1C, 0x6121401F),
+	AZALIA_PIN_CFG(0x0, 0x1D, 0x40F001F0),
+	AZALIA_PIN_CFG(0x0, 0x1E, 0x40F001F0),
+	AZALIA_PIN_CFG(0x0, 0x1F, 0x90170110),
+	AZALIA_PIN_CFG(0x0, 0x20, 0x40F001F0),
+	AZALIA_PIN_CFG(0x0, 0x22, 0x40F001F0),
+	AZALIA_PIN_CFG(0x0, 0x23, 0x90A60170),
 
 	/*
 	 * Hardware EQ Parameters
@@ -235,28 +193,16 @@ static const u32 mainboard_cim_verb_data[] = {
 	0x00000004,	// Number of IDs
 
 	/* NID 0x01, HDA Codec Subsystem ID Verb Table: 0x80860101 */
-	0x30172001,
-	0x30172101,
-	0x30172286,
-	0x30172380,
+	AZALIA_SUBVENDOR(0x3, 0x80860101),
 
 	/* Pin Complex (NID 0x05) Digital Out at Int HDMI */
-	0x30571c10,
-	0x30571d00,
-	0x30571e56,
-	0x30571f18,
+	AZALIA_PIN_CFG(0x3, 0x05, 0x18560010),
 
 	/* Pin Complex (NID 0x06) Digital Out at Int HDMI */
-	0x30671c20,
-	0x30671d00,
-	0x30671e56,
-	0x30671f18,
+	AZALIA_PIN_CFG(0x3, 0x06, 0x18560020),
 
 	/* Pin Complex (NID 0x07) Digital Out at Int HDMI */
-	0x30771c30,
-	0x30771d00,
-	0x30771e56,
-	0x30771f18
+	AZALIA_PIN_CFG(0x3, 0x07, 0x18560030)
 };
 
 static const u32 mainboard_pc_beep_verbs[] = {
diff --git a/src/mainboard/lenovo/x220/mainboard.c b/src/mainboard/lenovo/x220/mainboard.c
index 28cd8142dc..3656c224e5 100644
--- a/src/mainboard/lenovo/x220/mainboard.c
+++ b/src/mainboard/lenovo/x220/mainboard.c
@@ -33,7 +33,6 @@
 #include <arch/io.h>
 #include <arch/interrupt.h>
 #include <boot/coreboot_tables.h>
-#include "hda_verb.h"
 #include <southbridge/intel/bd82x6x/pch.h>
 #include <smbios.h>
 #include <device/pci.h>
@@ -42,6 +41,7 @@
 #include <ec/lenovo/h8/h8.h>
 #include <build.h>
 #include <device/azalia_device.h>
+#include "hda_verb.h"
 
 void mainboard_suspend_resume(void)
 {