azalia: Change specific PIN_CFGs to generic AZALIA_PIN_CFG

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

4 files changed, 32 insertions, 56 deletions

diff --git a/src/mainboard/kontron/ktqm77/hda_verb.h b/src/mainboard/kontron/ktqm77/hda_verb.h
index 53b3fc9f35..34c2b7a5b0 100644
--- a/src/mainboard/kontron/ktqm77/hda_verb.h
+++ b/src/mainboard/kontron/ktqm77/hda_verb.h
@@ -18,18 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-/*
- * Pin widget configuration:
- *
- * Port-Con.  Location  Def.-Dev.  Con.-Type   Color    Misc  Def.-Aso.     Seq
- *    31..30    29..24     23..20     19..16  15..12  11..00     07..04  03..00
- */
-#define PIN_CFG(pin, val) \
-	(pin << 20) | ( 0x71c << 8) | (val & 0xff), \
-	(pin << 20) | ( 0x71d << 8) | ((val >> 8) & 0xff), \
-	(pin << 20) | ( 0x71e << 8) | ((val >> 16) & 0xff), \
-	(pin << 20) | ( 0x71f << 8) | ((val >> 24) & 0xff), \
-
 static const u32 mainboard_cim_verb_data[] = {
 	/* coreboot specific header */
 	0x11060397,	// Codec Vendor / Device ID: Via VT1708S
@@ -48,67 +36,67 @@ static const u32 mainboard_cim_verb_data[] = {
 	 * NID 0x19 [Port A (SURR)]:
 	 * Jack     Internal    Speaker     N/A             Black
 	 */
-	PIN_CFG(0x19, 0x10101112)
+	AZALIA_PIN_CFG(0, 0x19, 0x10101112),
 
 	/*
 	 * NID 0x1a [Port B (MIC1/2)]:
 	 * Jack     Rear        Mic In      1/8"            Pink
 	 */
-	PIN_CFG(0x1a, 0x01a19036)
+	AZALIA_PIN_CFG(0, 0x1a, 0x01a19036),
 
 	/*
 	 * NID 0x1b [Port C (LINEIN)]:
 	 * Jack     Rear        Line In     1/8"            Blue
 	 */
-	PIN_CFG(0x1b, 0x0181303e)
+	AZALIA_PIN_CFG(0, 0x1b, 0x0181303e),
 
 	/*
 	 * NID 0x1c [Port D (Front)]:
 	 * Jack     Rear        Line Out    1/8"            Green
 	 */
-	PIN_CFG(0x1c, 0x01014010)
+	AZALIA_PIN_CFG(0, 0x1c, 0x01014010),
 
 	/*
 	 * NID 0x1d [Port E (Front HP/MIC)]:
 	 * Jack     Front       HP Out      1/8"            Green
 	 */
-	PIN_CFG(0x1d, 0x022141f0)
+	AZALIA_PIN_CFG(0, 0x1d, 0x022141f0),
 
 	/*
 	 * NID 0x1e [Port F (Front HP/MIC)]:
 	 * Jack     Front       Mic In      1/8"            Pink
 	 */
-	PIN_CFG(0x1e, 0x02a19138)
+	AZALIA_PIN_CFG(0, 0x1e, 0x02a19138),
 
 	/*
 	 * NID 0x1f [CD]:
 	 * Jack     Int.(ATAPI) CD          ATAPI internal  Black
 	 */
-	PIN_CFG(0x1f, 0x19331137)
+	AZALIA_PIN_CFG(0, 0x1f, 0x19331137),
 
 	/*
 	 * NID 0x20 [N/A]:
 	 * Jack     Rear        S/PDIF Out  RCA             Unknown
 	 */
-	PIN_CFG(0x20, 0x014401f0)
+	AZALIA_PIN_CFG(0, 0x20, 0x014401f0),
 
 	/*
 	 * NID 0x21 [N/A]:
 	 * None     Internal    S/PDIF Out  Other Digital   Unknown
 	 */
-	PIN_CFG(0x21, 0x504600f0)
+	AZALIA_PIN_CFG(0, 0x21, 0x504600f0),
 
 	/*
 	 * NID 0x22 [Port G (C/LFE)]:
 	 * Jack     Internal    Speaker     Unknown         Orange
 	 */
-	PIN_CFG(0x22, 0x10106111)
+	AZALIA_PIN_CFG(0, 0x22, 0x10106111),
 
 	/*
 	 * NID 0x23 [Port H (SSL/SSR)]:
 	 * Jack     Internal    Speaker     Unknown         Grey
 	 */
-	PIN_CFG(0x23, 0x10102114)
+	AZALIA_PIN_CFG(0, 0x23, 0x10102114),
 
 
 	/* coreboot specific header */
diff --git a/src/mainboard/kontron/ktqm77/mainboard.c b/src/mainboard/kontron/ktqm77/mainboard.c
index 4804a7eba7..c09082aa5a 100644
--- a/src/mainboard/kontron/ktqm77/mainboard.c
+++ b/src/mainboard/kontron/ktqm77/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)
 {
diff --git a/src/mainboard/lenovo/x200/hda_verb.h b/src/mainboard/lenovo/x200/hda_verb.h
index 6be7518e1a..3d922589f8 100644
--- a/src/mainboard/lenovo/x200/hda_verb.h
+++ b/src/mainboard/lenovo/x200/hda_verb.h
@@ -18,12 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define PIN_CFG(pin, val) \
-	(pin << 20) | ( 0x71c << 8) | (val & 0xff), \
-	(pin << 20) | ( 0x71d << 8) | ((val >> 8) & 0xff), \
-	(pin << 20) | ( 0x71e << 8) | ((val >> 16) & 0xff), \
-	(pin << 20) | ( 0x71f << 8) | ((val >> 24) & 0xff)
-
 static const u32 mainboard_cim_verb_data[] = {
 	/* coreboot specific header */
 	0x14f15051,	// Conexant CX20561 (Hermosa)
@@ -32,14 +26,14 @@ static const u32 mainboard_cim_verb_data[] = {
 
 	/* Pin Widget Verb Table */
 
-	PIN_CFG(0x16, 0x042140f0),
-	PIN_CFG(0x17, 0x61a190f0),
-	PIN_CFG(0x18, 0x04a190f0),
-	PIN_CFG(0x19, 0x612140f0),
-	PIN_CFG(0x1a, 0x901701f0),
-	PIN_CFG(0x1b, 0x40f001f0),
-	PIN_CFG(0x1c, 0x40f001f0),
-	PIN_CFG(0x1d, 0x90a601f0)
+	AZALIA_PIN_CFG(0, 0x16, 0x042140f0),
+	AZALIA_PIN_CFG(0, 0x17, 0x61a190f0),
+	AZALIA_PIN_CFG(0, 0x18, 0x04a190f0),
+	AZALIA_PIN_CFG(0, 0x19, 0x612140f0),
+	AZALIA_PIN_CFG(0, 0x1a, 0x901701f0),
+	AZALIA_PIN_CFG(0, 0x1b, 0x40f001f0),
+	AZALIA_PIN_CFG(0, 0x1c, 0x40f001f0),
+	AZALIA_PIN_CFG(0, 0x1d, 0x90a601f0)
 };
 
 static const u32 mainboard_pc_beep_verbs[] = {
diff --git a/src/mainboard/roda/rk9/hda_verb.h b/src/mainboard/roda/rk9/hda_verb.h
index db9e0e30e4..64a3c8eec4 100644
--- a/src/mainboard/roda/rk9/hda_verb.h
+++ b/src/mainboard/roda/rk9/hda_verb.h
@@ -18,12 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define PIN_CFG(pin, val) \
-	(pin << 20) | ( 0x71c << 8) | (val & 0xff), \
-	(pin << 20) | ( 0x71d << 8) | ((val >> 8) & 0xff), \
-	(pin << 20) | ( 0x71e << 8) | ((val >> 16) & 0xff), \
-	(pin << 20) | ( 0x71f << 8) | ((val >> 24) & 0xff), \
-
 static const u32 mainboard_cim_verb_data[] = {
 	/* coreboot specific header */
 	0x10ec0262,	// Codec Vendor / Device ID: Realtek ALC262
@@ -33,29 +27,29 @@ static const u32 mainboard_cim_verb_data[] = {
 	/* Pin Widget Verb Table */
 
 	/* Pin Complex (NID 0x11), S/PDIF-OUT2: not connected */
-	PIN_CFG(0x11, 0x411111f0)
+	AZALIA_PIN_CFG(0, 0x11, 0x411111f0),
 	/* Pin Complex (NID 0x14), LINE_OUT (port D): Speakers */
-	PIN_CFG(0x14, 0x99130110)
+	AZALIA_PIN_CFG(0, 0x14, 0x99130110),
 	/* Pin Complex (NID 0x15), HP_OUT (port A): Head phones */
-	PIN_CFG(0x15, 0x0121411f)
+	AZALIA_PIN_CFG(0, 0x15, 0x0121411f),
 	/* Pin Complex (NID 0x16), MONO-OUT: not connected */
-	PIN_CFG(0x16, 0x411111f0)
+	AZALIA_PIN_CFG(0, 0x16, 0x411111f0),
 	/* Pin Complex (NID 0x18), MIC1 (port B): Microphone */
-	PIN_CFG(0x18, 0x01a19920)
+	AZALIA_PIN_CFG(0, 0x18, 0x01a19920),
 	/* Pin Complex (NID 0x19), MIC2 (port F): not connected */
-	PIN_CFG(0x19, 0x411111f0)
+	AZALIA_PIN_CFG(0, 0x19, 0x411111f0),
 	/* Pin Complex (NID 0x1a), LINE1 (port C): Line-In */
-	PIN_CFG(0x1a, 0x01813121)
+	AZALIA_PIN_CFG(0, 0x1a, 0x01813121),
 	/* Pin Complex (NID 0x1b), LINE2 (port E): MDC */
-	PIN_CFG(0x1b, 0x9983012f)
+	AZALIA_PIN_CFG(0, 0x1b, 0x9983012f),
 	/* Pin Complex (NID 0x1c), CD_IN */
-	PIN_CFG(0x1c, 0x593301f0)
+	AZALIA_PIN_CFG(0, 0x1c, 0x593301f0),
 	/* Pin Complex (NID 0x1d), PCBEEP */
-	PIN_CFG(0x1d, 0x4014022d)
+	AZALIA_PIN_CFG(0, 0x1d, 0x4014022d),
 	/* Pin Complex (NID 0x1e), S/PDIF-OUT: not connected */
-	PIN_CFG(0x1e, 0x411111f0)
+	AZALIA_PIN_CFG(0, 0x1e, 0x411111f0),
 	/* Pin Complex (NID 0x1f), S/PDIF-IN: not connected */
-	PIN_CFG(0x1f, 0x411111f0)
+	AZALIA_PIN_CFG(0, 0x1f, 0x411111f0)
 };
 
 static const u32 mainboard_pc_beep_verbs[] = {