4 files changed, 20 insertions, 74 deletions
diff --git a/src/mainboard/samsung/lumpy/hda_verb.h b/src/mainboard/samsung/lumpy/hda_verb.h
index dfadf5562a..4806b75f5b 100644
--- a/src/mainboard/samsung/lumpy/hda_verb.h
+++ b/src/mainboard/samsung/lumpy/hda_verb.h
@@ -24,50 +24,29 @@ static const u32 mainboard_cim_verb_data[] = {
 	0x00000007,	// Number of jacks
 
 	/* NID 0x01, HDA Codec Subsystem ID Verb Table: 0x144dc0c2 */
-	0x00172082,
-	0x001721b0,
-	0x0017224d,
-	0x00172314,
+	AZALIA_SUBVENDOR(0x0, 0x144db082),
 
 	0x00170500,
 
 	/* Pin Widget Verb Table */
 
 	/* Pin Complex (NID 0x05) */
-	0x00571cf0,
-	0x00571d10,
-	0x00571e21,
-	0x00571f02,
+	AZALIA_PIN_CFG(0x0, 0x05, 0x022110f0),
 
 	/* Pin Complex (NID 0x06) */
-	0x00671cf0,
-	0x00671d00,
-	0x00671e17,
-	0x00671f90,
+	AZALIA_PIN_CFG(0x0, 0x06, 0x901700f0),
 
 	/* Pin Complex (NID 0x07) */
-	0x00771cf0,
-	0x00771d10,
-	0x00771ea1,
-	0x00771f02,
+	AZALIA_PIN_CFG(0x0, 0x07, 0x02a110f0),
 
 	/* Pin Complex (NID 0x08) */
-	0x00871c37,
-	0x00871d00,
-	0x00871ea7,
-	0x00871f77,
+	AZALIA_PIN_CFG(0x0, 0x08, 0x77a70037),
 
 	/* Pin Complex (NID 0x09) */
-	0x00971c3e,
-	0x00971d00,
-	0x00971ea6,
-	0x00971fb7,
+	AZALIA_PIN_CFG(0x0, 0x09, 0xb7a6003e),
 
 	/* Pin Complex (NID 0x0a) */
-	0x00a71cf0,
-	0x00a71d10,
-	0x00a71e45,
-	0x00a71f43
+	AZALIA_PIN_CFG(0x0, 0x0a, 0x434510f0)
 };
 
 static const u32 mainboard_pc_beep_verbs[] = {
diff --git a/src/mainboard/samsung/lumpy/mainboard.c b/src/mainboard/samsung/lumpy/mainboard.c
index ee6728f6a2..bce20d6d98 100644
--- a/src/mainboard/samsung/lumpy/mainboard.c
+++ b/src/mainboard/samsung/lumpy/mainboard.c
@@ -33,12 +33,12 @@
 #include <arch/interrupt.h>
 #include <boot/coreboot_tables.h>
 #include <ec/smsc/mec1308/ec.h>
-#include "hda_verb.h"
 #include "ec.h"
 #include "onboard.h"
 #include <southbridge/intel/bd82x6x/pch.h>
 #include <smbios.h>
 #include <device/azalia_device.h>
+#include "hda_verb.h"
 
 void mainboard_suspend_resume(void)
 {
diff --git a/src/mainboard/samsung/stumpy/hda_verb.h b/src/mainboard/samsung/stumpy/hda_verb.h
index b263fbe972..3992eeec04 100644
--- a/src/mainboard/samsung/stumpy/hda_verb.h
+++ b/src/mainboard/samsung/stumpy/hda_verb.h
@@ -24,48 +24,27 @@ static const u32 mainboard_cim_verb_data[] = {
 	0x00000007,	// Number of jacks
 
 	/* NID 0x01, HDA Codec Subsystem ID Verb Table: 0x10134210 */
-	0x00172010,
-	0x00172142,
-	0x00172213,
-	0x00172310,
+	AZALIA_SUBVENDOR(0x0, 0x10134210),
 
 	/* Pin Widget Verb Table */
 
 	/* Pin Complex (NID 0x05)     1/8   Gray  HP Out at Ext Front */
-	0x00571cf0,
-	0x00571d20,
-	0x00571e21,
-	0x00571f02,
+	AZALIA_PIN_CFG(0x0, 0x05, 0x022120f0),
 
 	/* Pin Complex (NID 0x06)  Analog Unknown  Speaker at Int N/A */
-	0x00671c10,
-	0x00671d00,
-	0x00671e17,
-	0x00671f90,
+	AZALIA_PIN_CFG(0x0, 0x06, 0x90170010),
 
 	/* Pin Complex (NID 0x07)     1/8    Grey  Line In at Ext Front */
-	0x00771cf0,
-	0x00771d20,
-	0x00771ea1,
-	0x00771f02,
+	AZALIA_PIN_CFG(0x0, 0x07, 0x02a120f0),
 
 	/* Pin Complex (NID 0x08)  Analog Unknown  Mic at Oth Mobile-In */
-	0x00871c37,
-	0x00871d00,
-	0x00871ea7,
-	0x00871f77,
+	AZALIA_PIN_CFG(0x0, 0x08, 0x77a70037),
 
 	/* Pin Complex (NID 0x09) Digital Unknown  Mic at Oth Mobile-In */
-	0x00971c3e,
-	0x00971d00,
-	0x00971ea6,
-	0x00971f77,
+	AZALIA_PIN_CFG(0x0, 0x09, 0x77a6003e),
 
 	/* Pin Complex (NID 0x0a) Optical   Black  SPDIF Out at Ext N/A */
-	0x00a71cf0,
-	0x00a71d10,
-	0x00a71e45,
-	0x00a71f43,
+	AZALIA_PIN_CFG(0x0, 0x0a, 0x434510f0),
 
 	/* coreboot specific header */
 	0x80862805,	// Codec Vendor / Device ID: Intel CougarPoint HDMI
@@ -73,28 +52,16 @@ static const u32 mainboard_cim_verb_data[] = {
 	0x00000004,	// Number of jacks
 
 	/* NID 0x01, HDA Codec Subsystem ID Verb Table: 0x80860101 */
-	0x00172001,
-	0x00172101,
-	0x00172286,
-	0x00172380,
+	AZALIA_SUBVENDOR(0x0, 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/samsung/stumpy/mainboard.c b/src/mainboard/samsung/stumpy/mainboard.c
index 99fe725498..2256b41ef4 100644
--- a/src/mainboard/samsung/stumpy/mainboard.c
+++ b/src/mainboard/samsung/stumpy/mainboard.c
@@ -33,9 +33,9 @@
 #include <arch/io.h>
 #include <arch/interrupt.h>
 #include <boot/coreboot_tables.h>
-#include "hda_verb.h"
 #include <southbridge/intel/bd82x6x/pch.h>
 #include <device/azalia_device.h>
+#include "hda_verb.h"
 
 void mainboard_suspend_resume(void)
 {