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, 16 insertions, 61 deletions

diff --git a/src/mainboard/google/stout/hda_verb.h b/src/mainboard/google/stout/hda_verb.h
index 08fc10c51c..43dae91f85 100644
--- a/src/mainboard/google/stout/hda_verb.h
+++ b/src/mainboard/google/stout/hda_verb.h
@@ -24,72 +24,39 @@ static const u32 mainboard_cim_verb_data[] = {
 	0x0000000c,	// Number of jacks
 
 	/* NID 0x01, HDA Codec Subsystem ID Verb Table: 0x17aa21fe */
-	0x001720fe,
-	0x00172121,
-	0x001722aa,
-	0x00172317,
+	AZALIA_SUBVENDOR(0x0, 0x17aa21fe),
 
 	/* Pin Widget Verb Table */
 
 	/* Pin Complex (NID 0x12): 0x90a60930 DMIC */
-	0x01271c30,
-	0x01271d09,
-	0x01271ea6,
-	0x01271f90,
+	AZALIA_PIN_CFG(0x0, 0x12, 0x90a60930),
 
 	/* Pin Complex (NID 0x14): 0x90170110 SPEAKER-OUT (Port-D) */
-	0x01471c10,
-	0x01471d01,
-	0x01471e17,
-	0x01471f90,
+	AZALIA_PIN_CFG(0x0, 0x14, 0x90170110),
 
 	/* Pin Complex (NID 0x15): 0x0321101f HP-OUT (Port-A) */
-	0x01571c1f,
-	0x01571d10,
-	0x01571e21,
-	0x01571f03,
+	AZALIA_PIN_CFG(0x0, 0x15, 0x0321101f),
 
 	/* Pin Complex (NID 0x17): 0x411111f0 MONO-OUT (Port-H) */
-	0x01771cf0,
-	0x01771d11,
-	0x01771e11,
-	0x01771f41,
+	AZALIA_PIN_CFG(0x0, 0x17, 0x411111f0),
 
 	/* Pin Complex (NID 0x18): 0x03a11820 MIC1 (Port-B) */
-	0x01871c20,
-	0x01871d18,
-	0x01871ea1,
-	0x01871f03,
+	AZALIA_PIN_CFG(0x0, 0x18, 0x03a11820),
 
 	/* Pin Complex (NID 0x19): 0x411111f0 MIC2 (Port-F) */
-	0x01971cf0,
-	0x01971d11,
-	0x01971e11,
-	0x01971f41,
+	AZALIA_PIN_CFG(0x0, 0x19, 0x411111f0),
 
 	/* Pin Complex (NID 0x1a): 0x411111f0 LINE1 (Port-C) */
-	0x01a71cf0,
-	0x01a71d11,
-	0x01a71e11,
-	0x01a71f41,
+	AZALIA_PIN_CFG(0x0, 0x1a, 0x411111f0),
 
 	/* Pin Complex (NID 0x1b): 0x411111f0 LINE2 (Port-E) */
-	0x01b71cf0,
-	0x01b71d11,
-	0x01b71e11,
-	0x01b71f41,
+	AZALIA_PIN_CFG(0x0, 0x1b, 0x411111f0),
 
 	/* Pin Complex (NID 0x1d): 0x4016862d PC-BEEP */
-	0x01d71c2d,
-	0x01d71d86,
-	0x01d71e16,
-	0x01d71f40,
+	AZALIA_PIN_CFG(0x0, 0x1d, 0x4016862d),
 
 	/* Pin Complex (NID 0x1e): 0x411111f0 S/PDIF-OUT */
-	0x01e71cf0,
-	0x01e71d11,
-	0x01e71e11,
-	0x01e71f41,
+	AZALIA_PIN_CFG(0x0, 0x1e, 0x411111f0),
 
 	/* Stout MIC detect setup */
 	0x02050018,
@@ -103,28 +70,16 @@ static const u32 mainboard_cim_verb_data[] = {
 	0x00000004,	// Number of jacks
 
 	/* 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) Not Connected */
-	0x30671c20,
-	0x30671d00,
-	0x30671e56,
-	0x30671f58,
+	AZALIA_PIN_CFG(0x3, 0x06, 0x58560020),
 
 	/* Pin Complex (NID 0x07) Not Connected */
-	0x30771c30,
-	0x30771d00,
-	0x30771e56,
-	0x30771f58
+	AZALIA_PIN_CFG(0x3, 0x07, 0x58560030)
 };
 
 static const u32 mainboard_pc_beep_verbs[] = {
diff --git a/src/mainboard/google/stout/mainboard.c b/src/mainboard/google/stout/mainboard.c
index b0ed3c11f7..aaa78e9ce0 100644
--- a/src/mainboard/google/stout/mainboard.c
+++ b/src/mainboard/google/stout/mainboard.c
@@ -32,7 +32,6 @@
 #include <arch/io.h>
 #include <arch/interrupt.h>
 #include <boot/coreboot_tables.h>
-#include "hda_verb.h"
 #include "onboard.h"
 #include "ec.h"
 #include <southbridge/intel/bd82x6x/pch.h>
@@ -40,6 +39,7 @@
 #include <device/pci.h>
 #include <ec/quanta/it8518/ec.h>
 #include <device/azalia_device.h>
+#include "hda_verb.h"
 
 void mainboard_suspend_resume(void)
 {