From 02d674ac2f9b238ea83ba31e3e4f32d25f9fedf6 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Thu, 4 Sep 2014 22:04:11 +0200 Subject: azalia: Use convenience macros throughout Change-Id: Ic044bf155bfcf93fa7cf3afd7287b7d0b615ef6d Signed-off-by: Vladimir Serbinenko Reviewed-on: http://review.coreboot.org/6839 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer --- src/mainboard/intel/baskingridge/hda_verb.h | 55 ++++++---------------------- src/mainboard/intel/baskingridge/mainboard.c | 2 +- 2 files changed, 12 insertions(+), 45 deletions(-) (limited to 'src/mainboard/intel/baskingridge') diff --git a/src/mainboard/intel/baskingridge/hda_verb.h b/src/mainboard/intel/baskingridge/hda_verb.h index 52e5a3dd0b..2796e92682 100644 --- a/src/mainboard/intel/baskingridge/hda_verb.h +++ b/src/mainboard/intel/baskingridge/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,26 +52,14 @@ 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) }; diff --git a/src/mainboard/intel/baskingridge/mainboard.c b/src/mainboard/intel/baskingridge/mainboard.c index 61ba4aff68..d1f540505c 100644 --- a/src/mainboard/intel/baskingridge/mainboard.c +++ b/src/mainboard/intel/baskingridge/mainboard.c @@ -33,9 +33,9 @@ #include #include #include -#include "hda_verb.h" #include #include +#include "hda_verb.h" void mainboard_suspend_resume(void) { -- cgit v1.2.3