From 02d674ac2f9b238ea83ba31e3e4f32d25f9fedf6 Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Thu, 4 Sep 2014 22:04:11 +0200
Subject: 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>
---
 src/mainboard/lenovo/t520/hda_verb.h  | 102 +++++++---------------------------
 src/mainboard/lenovo/t520/mainboard.c |   2 +-
 src/mainboard/lenovo/t530/hda_verb.h  | 102 +++++++---------------------------
 src/mainboard/lenovo/t530/mainboard.c |   2 +-
 src/mainboard/lenovo/x201/hda_verb.h  |  75 +++++--------------------
 src/mainboard/lenovo/x220/hda_verb.h  |  86 ++++++----------------------
 src/mainboard/lenovo/x220/mainboard.c |   2 +-
 src/mainboard/lenovo/x230/hda_verb.h  | 102 +++++++---------------------------
 src/mainboard/lenovo/x230/mainboard.c |   2 +-
 9 files changed, 92 insertions(+), 383 deletions(-)

(limited to 'src/mainboard/lenovo')

diff --git a/src/mainboard/lenovo/t520/hda_verb.h b/src/mainboard/lenovo/t520/hda_verb.h
index 7d5e75ad1f..4248a7d74d 100644
--- a/src/mainboard/lenovo/t520/hda_verb.h
+++ b/src/mainboard/lenovo/t520/hda_verb.h
@@ -37,83 +37,42 @@ static const u32 mainboard_cim_verb_data[] = {
 /* Bits 7:0  - Payload */
 
 /* NID 0x01 - NodeInfo */
-	0x001720FA,
-	0x00172121,
-	0x001722AA,
-	0x00172317,
+	AZALIA_SUBVENDOR(0x0, 0x17AA21FA),
 
 /* NID 0x0A - External Microphone Connector
  * Config=0x04A11020 (External,Right; MicIn,3.5mm; Black,JD; DA,Seq)
  */
-	0x00A71C20,
-	0x00A71D10,
-	0x00A71EA1,
-	0x00A71F04,
+	AZALIA_PIN_CFG(0x0, 0x0A, 0x04A11020),
 
 /* NID 0x0B - Headphone Connector
  * Config=0x0421101F (External,Right; HP,3.5mm; Black,JD; DA,Seq)
  */
-	0x00B71C1F,
-	0x00B71D10,
-	0x00B71E21,
-	0x00B71F04,
+	AZALIA_PIN_CFG(0x0, 0x0B, 0x0421101F),
 
 /* NID 0x0C - Not connected
  * Config=0x40F000F0 (N/A,N/A; Other,Unknown; Unknown,JD; DA,Seq)
  */
-	0x00C71CF0,
-	0x00C71D00,
-	0x00C71EF0,
-	0x00C71F40,
+	AZALIA_PIN_CFG(0x0, 0x0C, 0x40F000F0),
 
 /* NID 0x0D - Internal Speakers
  * Config=0x90170110 (Fixed,Int; Speaker,Other Analog; Unknown,nJD; DA,Seq)
  */
-	0x00D71C10,
-	0x00D71D01,
-	0x00D71E17,
-	0x00D71F90,
+	AZALIA_PIN_CFG(0x0, 0x0D, 0x90170110),
 
 /* NID 0x0F - Not connected
  * Config=0x40F000F0
  */
-	0x00F71CF0,
-	0x00F71D00,
-	0x00F71EF0,
-	0x00F71F40,
+	AZALIA_PIN_CFG(0x0, 0x0F, 0x40F000F0),
 
 /* NID 0x11 - Internal Microphone
  * Config=0xD5A30140 (Fixed internal,Top; Mic In,ATIPI; Unknown,nJD; DA,Seq)
  */
-	0x01171C40,
-	0x01171D01,
-	0x01171EA3,
-	0x01171FD5,
-
-	0x01271C40,
-	0x01271D01,
-	0x01271EA6,
-	0x01271F90,
-
-	0x01471C10,
-	0x01471D01,
-	0x01471E17,
-	0x01471F90,
-
-	0x01571C20,
-	0x01571D10,
-	0x01571E21,
-	0x01571F03,
-
-	0x01871C30,
-	0x01871D18,
-	0x01871EA1,
-	0x01871F03,
-
-	0x01971CF0,
-	0x01971D11,
-	0x01971E11,
-	0x01971F41,
+	AZALIA_PIN_CFG(0x0, 0x11, 0xD5A30140),
+	AZALIA_PIN_CFG(0x0, 0x12, 0x90A60140),
+	AZALIA_PIN_CFG(0x0, 0x14, 0x90170110),
+	AZALIA_PIN_CFG(0x0, 0x15, 0x03211020),
+	AZALIA_PIN_CFG(0x0, 0x18, 0x03A11830),
+	AZALIA_PIN_CFG(0x0, 0x19, 0x411111F0),
 
 	0x01970804,
 	0x01870803,
@@ -125,20 +84,9 @@ static const u32 mainboard_cim_verb_data[] = {
 	0x00270600,
 	0x00270600,
 
-	0x01A71CF0,
-	0x01A71D11,
-	0x01A71E11,
-	0x01A71F41,
-
-	0x01D71C05,
-	0x01D71D82,
-	0x01D71E13,
-	0x01D71F40,
-
-	0x01E71CF0,
-	0x01E71D11,
-	0x01E71E11,
-	0x01E71F41,
+	AZALIA_PIN_CFG(0x0, 0x1A, 0x411111F0),
+	AZALIA_PIN_CFG(0x0, 0x1D, 0x40138205),
+	AZALIA_PIN_CFG(0x0, 0x1E, 0x411111F0),
 
 	/*
 	 * Hardware EQ Parameters
@@ -283,28 +231,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/t520/mainboard.c b/src/mainboard/lenovo/t520/mainboard.c
index f89001aeea..a93ba706bc 100644
--- a/src/mainboard/lenovo/t520/mainboard.c
+++ b/src/mainboard/lenovo/t520/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>
@@ -41,6 +40,7 @@
 #include <pc80/keyboard.h>
 #include <ec/lenovo/h8/h8.h>
 #include <device/azalia_device.h>
+#include "hda_verb.h"
 
 void mainboard_suspend_resume(void)
 {
diff --git a/src/mainboard/lenovo/t530/hda_verb.h b/src/mainboard/lenovo/t530/hda_verb.h
index cc280a1574..f04eae7e71 100644
--- a/src/mainboard/lenovo/t530/hda_verb.h
+++ b/src/mainboard/lenovo/t530/hda_verb.h
@@ -37,83 +37,42 @@ static const u32 mainboard_cim_verb_data[] = {
 /* Bits 7:0  - Payload */
 
 /* NID 0x01 - NodeInfo */
-	0x001720FA,
-	0x00172121,
-	0x001722AA,
-	0x00172317,
+	AZALIA_SUBVENDOR(0x0, 0x17AA21FA),
 
 /* NID 0x0A - External Microphone Connector
  * Config=0x04A11020 (External,Right; MicIn,3.5mm; Black,JD; DA,Seq)
  */
-	0x00A71C20,
-	0x00A71D10,
-	0x00A71EA1,
-	0x00A71F04,
+	AZALIA_PIN_CFG(0x0, 0x0A, 0x04A11020),
 
 /* NID 0x0B - Headphone Connector
  * Config=0x0421101F (External,Right; HP,3.5mm; Black,JD; DA,Seq)
  */
-	0x00B71C1F,
-	0x00B71D10,
-	0x00B71E21,
-	0x00B71F04,
+	AZALIA_PIN_CFG(0x0, 0x0B, 0x0421101F),
 
 /* NID 0x0C - Not connected
  * Config=0x40F000F0 (N/A,N/A; Other,Unknown; Unknown,JD; DA,Seq)
  */
-	0x00C71CF0,
-	0x00C71D00,
-	0x00C71EF0,
-	0x00C71F40,
+	AZALIA_PIN_CFG(0x0, 0x0C, 0x40F000F0),
 
 /* NID 0x0D - Internal Speakers
  * Config=0x90170110 (Fixed,Int; Speaker,Other Analog; Unknown,nJD; DA,Seq)
  */
-	0x00D71C10,
-	0x00D71D01,
-	0x00D71E17,
-	0x00D71F90,
+	AZALIA_PIN_CFG(0x0, 0x0D, 0x90170110),
 
 /* NID 0x0F - Not connected
  * Config=0x40F000F0
  */
-	0x00F71CF0,
-	0x00F71D00,
-	0x00F71EF0,
-	0x00F71F40,
+	AZALIA_PIN_CFG(0x0, 0x0F, 0x40F000F0),
 
 /* NID 0x11 - Internal Microphone
  * Config=0xD5A30140 (Fixed internal,Top; Mic In,ATIPI; Unknown,nJD; DA,Seq)
  */
-	0x01171C40,
-	0x01171D01,
-	0x01171EA3,
-	0x01171FD5,
-
-	0x01271C40,
-	0x01271D01,
-	0x01271EA6,
-	0x01271F90,
-
-	0x01471C10,
-	0x01471D01,
-	0x01471E17,
-	0x01471F90,
-
-	0x01571C20,
-	0x01571D10,
-	0x01571E21,
-	0x01571F03,
-
-	0x01871C30,
-	0x01871D18,
-	0x01871EA1,
-	0x01871F03,
-
-	0x01971CF0,
-	0x01971D11,
-	0x01971E11,
-	0x01971F41,
+	AZALIA_PIN_CFG(0x0, 0x11, 0xD5A30140),
+	AZALIA_PIN_CFG(0x0, 0x12, 0x90A60140),
+	AZALIA_PIN_CFG(0x0, 0x14, 0x90170110),
+	AZALIA_PIN_CFG(0x0, 0x15, 0x03211020),
+	AZALIA_PIN_CFG(0x0, 0x18, 0x03A11830),
+	AZALIA_PIN_CFG(0x0, 0x19, 0x411111F0),
 
 	0x01970804,
 	0x01870803,
@@ -125,20 +84,9 @@ static const u32 mainboard_cim_verb_data[] = {
 	0x00270600,
 	0x00270600,
 
-	0x01A71CF0,
-	0x01A71D11,
-	0x01A71E11,
-	0x01A71F41,
-
-	0x01D71C05,
-	0x01D71D82,
-	0x01D71E13,
-	0x01D71F40,
-
-	0x01E71CF0,
-	0x01E71D11,
-	0x01E71E11,
-	0x01E71F41,
+	AZALIA_PIN_CFG(0x0, 0x1A, 0x411111F0),
+	AZALIA_PIN_CFG(0x0, 0x1D, 0x40138205),
+	AZALIA_PIN_CFG(0x0, 0x1E, 0x411111F0),
 
 	/*
 	 * Hardware EQ Parameters
@@ -283,28 +231,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/t530/mainboard.c b/src/mainboard/lenovo/t530/mainboard.c
index c3425b3d01..e529d452fc 100644
--- a/src/mainboard/lenovo/t530/mainboard.c
+++ b/src/mainboard/lenovo/t530/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>
@@ -41,6 +40,7 @@
 #include <pc80/keyboard.h>
 #include <ec/lenovo/h8/h8.h>
 #include <device/azalia_device.h>
+#include "hda_verb.h"
 
 void mainboard_suspend_resume(void)
 {
diff --git a/src/mainboard/lenovo/x201/hda_verb.h b/src/mainboard/lenovo/x201/hda_verb.h
index d5a8e7c9c5..17069292af 100644
--- a/src/mainboard/lenovo/x201/hda_verb.h
+++ b/src/mainboard/lenovo/x201/hda_verb.h
@@ -25,96 +25,51 @@ static const u32 mainboard_cim_verb_data[] = {
 	0x0000000B,	/* Number of 4 dword sets */
 
 	/* NID 0x01: Subsystem ID.  */
-	0x00172055,
-	0x00172121,
-	0x001722AA,
-	0x00172317,
+	AZALIA_SUBVENDOR(0x0, 0x17AA2155),
 
 	/* NID 0x19: Headphone jack.  */
-	0x01971CF0,
-	0x01971D40,
-	0x01971E21,
-	0x01971F04,
+	AZALIA_PIN_CFG(0x0, 0x19, 0x042140F0),
 
 	/* NID 0x1A: Dock mic jack.  */
-	0x01A71CF0,
-	0x01A71D90,
-	0x01A71EA1,
-	0x01A71F61,
+	AZALIA_PIN_CFG(0x0, 0x1A, 0x61A190F0),
 
 	/* NID 0x1B: Mic jack.  */
-	0x01B71CF0,
-	0x01B71D90,
-	0x01B71EA1,
-	0x01B71F04,
+	AZALIA_PIN_CFG(0x0, 0x1B, 0x04A190F0),
 
 	/* NID 0x1C: Dock headphone jack.  */
-	0x01C71CF0,
-	0x01C71D40,
-	0x01C71E21,
-	0x01C71F61,
+	AZALIA_PIN_CFG(0x0, 0x1C, 0x612140F0),
 
 	/* NID 0x1D: EAPD detect.  */
-	0x01D71CF0,
-	0x01D71D00,
-	0x01D71E17,
-	0x01D71F60,
+	AZALIA_PIN_CFG(0x0, 0x1D, 0x601700F0),
 
 	/* NID 0x1E  */
-	0x01E71CF0,
-	0x01E71D01,
-	0x01E71EF0,
-	0x01E71F40,
+	AZALIA_PIN_CFG(0x0, 0x1E, 0x40F001F0),
 
 	/* NID 0x1F  */
-	0x01F71CF0,
-	0x01F71D01,
-	0x01F71E17,
-	0x01F71F90,
+	AZALIA_PIN_CFG(0x0, 0x1F, 0x901701F0),
 
 	/* NID 0x20  */
-	0x02071CF0,
-	0x02071D01,
-	0x02071EF0,
-	0x02071F40,
+	AZALIA_PIN_CFG(0x0, 0x20, 0x40F001F0),
 
 	/* NID 0x22  */
-	0x02271CF0,
-	0x02271D01,
-	0x02271EF0,
-	0x02271F40,
+	AZALIA_PIN_CFG(0x0, 0x22, 0x40F001F0),
 
 	/* NID 0x23: Internal mic boost volume.  */
-	0x02371CF0,
-	0x02371D01,
-	0x02371EA6,
-	0x02371F90,
+	AZALIA_PIN_CFG(0x0, 0x23, 0x90A601F0),
 
 	0x80862804,	/* Codec Vendor / Device ID: Intel Ibexpeak HDMI.  */
 	0x17aa21b5,	/* Subsystem ID  */
 	0x00000004,	/* Number of 4 dword sets */
 
 	/* NID 0x01, HDA Codec Subsystem ID Verb Table: 0x17aa21b5 */
-	0x301720B5,
-	0x30172121,
-	0x301722AA,
-	0x30172317,
+	AZALIA_SUBVENDOR(0x3, 0x17AA21B5),
 
 	/* NID 0x04.  */
-	0x30471C10,
-	0x30471D00,
-	0x30471E56,
-	0x30471F58,
+	AZALIA_PIN_CFG(0x3, 0x04, 0x58560010),
 
 	/* NID 0x05.  */
-	0x30571C20,
-	0x30571D00,
-	0x30571E56,
-	0x30571F18,
+	AZALIA_PIN_CFG(0x3, 0x05, 0x18560020),
 
 	/* NID 0x06.  */
-	0x30671C30,
-	0x30671D00,
-	0x30671E56,
-	0x30671F58,
+	AZALIA_PIN_CFG(0x3, 0x06, 0x58560030),
 };
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)
 {
diff --git a/src/mainboard/lenovo/x230/hda_verb.h b/src/mainboard/lenovo/x230/hda_verb.h
index cc280a1574..f04eae7e71 100644
--- a/src/mainboard/lenovo/x230/hda_verb.h
+++ b/src/mainboard/lenovo/x230/hda_verb.h
@@ -37,83 +37,42 @@ static const u32 mainboard_cim_verb_data[] = {
 /* Bits 7:0  - Payload */
 
 /* NID 0x01 - NodeInfo */
-	0x001720FA,
-	0x00172121,
-	0x001722AA,
-	0x00172317,
+	AZALIA_SUBVENDOR(0x0, 0x17AA21FA),
 
 /* NID 0x0A - External Microphone Connector
  * Config=0x04A11020 (External,Right; MicIn,3.5mm; Black,JD; DA,Seq)
  */
-	0x00A71C20,
-	0x00A71D10,
-	0x00A71EA1,
-	0x00A71F04,
+	AZALIA_PIN_CFG(0x0, 0x0A, 0x04A11020),
 
 /* NID 0x0B - Headphone Connector
  * Config=0x0421101F (External,Right; HP,3.5mm; Black,JD; DA,Seq)
  */
-	0x00B71C1F,
-	0x00B71D10,
-	0x00B71E21,
-	0x00B71F04,
+	AZALIA_PIN_CFG(0x0, 0x0B, 0x0421101F),
 
 /* NID 0x0C - Not connected
  * Config=0x40F000F0 (N/A,N/A; Other,Unknown; Unknown,JD; DA,Seq)
  */
-	0x00C71CF0,
-	0x00C71D00,
-	0x00C71EF0,
-	0x00C71F40,
+	AZALIA_PIN_CFG(0x0, 0x0C, 0x40F000F0),
 
 /* NID 0x0D - Internal Speakers
  * Config=0x90170110 (Fixed,Int; Speaker,Other Analog; Unknown,nJD; DA,Seq)
  */
-	0x00D71C10,
-	0x00D71D01,
-	0x00D71E17,
-	0x00D71F90,
+	AZALIA_PIN_CFG(0x0, 0x0D, 0x90170110),
 
 /* NID 0x0F - Not connected
  * Config=0x40F000F0
  */
-	0x00F71CF0,
-	0x00F71D00,
-	0x00F71EF0,
-	0x00F71F40,
+	AZALIA_PIN_CFG(0x0, 0x0F, 0x40F000F0),
 
 /* NID 0x11 - Internal Microphone
  * Config=0xD5A30140 (Fixed internal,Top; Mic In,ATIPI; Unknown,nJD; DA,Seq)
  */
-	0x01171C40,
-	0x01171D01,
-	0x01171EA3,
-	0x01171FD5,
-
-	0x01271C40,
-	0x01271D01,
-	0x01271EA6,
-	0x01271F90,
-
-	0x01471C10,
-	0x01471D01,
-	0x01471E17,
-	0x01471F90,
-
-	0x01571C20,
-	0x01571D10,
-	0x01571E21,
-	0x01571F03,
-
-	0x01871C30,
-	0x01871D18,
-	0x01871EA1,
-	0x01871F03,
-
-	0x01971CF0,
-	0x01971D11,
-	0x01971E11,
-	0x01971F41,
+	AZALIA_PIN_CFG(0x0, 0x11, 0xD5A30140),
+	AZALIA_PIN_CFG(0x0, 0x12, 0x90A60140),
+	AZALIA_PIN_CFG(0x0, 0x14, 0x90170110),
+	AZALIA_PIN_CFG(0x0, 0x15, 0x03211020),
+	AZALIA_PIN_CFG(0x0, 0x18, 0x03A11830),
+	AZALIA_PIN_CFG(0x0, 0x19, 0x411111F0),
 
 	0x01970804,
 	0x01870803,
@@ -125,20 +84,9 @@ static const u32 mainboard_cim_verb_data[] = {
 	0x00270600,
 	0x00270600,
 
-	0x01A71CF0,
-	0x01A71D11,
-	0x01A71E11,
-	0x01A71F41,
-
-	0x01D71C05,
-	0x01D71D82,
-	0x01D71E13,
-	0x01D71F40,
-
-	0x01E71CF0,
-	0x01E71D11,
-	0x01E71E11,
-	0x01E71F41,
+	AZALIA_PIN_CFG(0x0, 0x1A, 0x411111F0),
+	AZALIA_PIN_CFG(0x0, 0x1D, 0x40138205),
+	AZALIA_PIN_CFG(0x0, 0x1E, 0x411111F0),
 
 	/*
 	 * Hardware EQ Parameters
@@ -283,28 +231,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/x230/mainboard.c b/src/mainboard/lenovo/x230/mainboard.c
index c017712855..2df9069672 100644
--- a/src/mainboard/lenovo/x230/mainboard.c
+++ b/src/mainboard/lenovo/x230/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)
 {
-- 
cgit v1.2.3