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/google/bolt/hda_verb.h | 71 +++++++++------------- src/mainboard/google/butterfly/hda_verb.h | 55 ++++------------- src/mainboard/google/butterfly/mainboard.c | 2 +- src/mainboard/google/falco/hda_verb.h | 71 +++++++++------------- src/mainboard/google/falco/mainboard.c | 2 +- src/mainboard/google/link/hda_verb.h | 70 +++++----------------- src/mainboard/google/link/mainboard.c | 2 +- src/mainboard/google/panther/hda_verb.h | 67 ++++++++------------- src/mainboard/google/parrot/hda_verb.h | 95 +++++++++++------------------- src/mainboard/google/parrot/mainboard.c | 2 +- src/mainboard/google/peppy/hda_verb.h | 75 ++++++++++------------- src/mainboard/google/peppy/mainboard.c | 2 +- src/mainboard/google/slippy/gma.c | 1 - src/mainboard/google/slippy/hda_verb.h | 71 +++++++++------------- src/mainboard/google/slippy/mainboard.c | 2 +- src/mainboard/google/stout/hda_verb.h | 75 +++++------------------ src/mainboard/google/stout/mainboard.c | 2 +- 17 files changed, 217 insertions(+), 448 deletions(-) (limited to 'src/mainboard/google') diff --git a/src/mainboard/google/bolt/hda_verb.h b/src/mainboard/google/bolt/hda_verb.h index f27480d69b..54f27f13ae 100644 --- a/src/mainboard/google/bolt/hda_verb.h +++ b/src/mainboard/google/bolt/hda_verb.h @@ -24,71 +24,54 @@ static const u32 mainboard_cim_verb_data[] = { 0x0000000b, // Number of jacks (NID entries) /* NID 0x01, HDA Codec Subsystem ID Verb Table: 0x10ec0283 */ - 0x00172083, - 0x00172102, - 0x001722ec, - 0x00172310, + AZALIA_SUBVENDOR(0x0, 0x10ec0283), /* Pin Widget Verb Table */ /* Pin Complex (NID 0x12) DMIC - interior mobile lid */ - 0x01271c10, - 0x01271d10, - 0x01271ea6, - 0x01271fb7, + AZALIA_PIN_CFG(0x0, 0x12, 0xb7a61010), /* Pin Complex (NID 0x14) SPKR-OUT PORTD */ - 0x01471c10, // group 1, front left/right - 0x01471d01, // no connector, no jack detect - 0x01471e17, // speaker out, analog - 0x01471f90, // fixed function, internal + // group 1, front left/right + // no connector, no jack detect + // speaker out, analog + // fixed function, internal + AZALIA_PIN_CFG(0x0, 0x14, 0x90170110), /* Pin Complex (NID 0x17) */ - 0x01771cf0, - 0x01771d11, - 0x01771e11, - 0x01771f41, + AZALIA_PIN_CFG(0x0, 0x17, 0x411111f0), /* Pin Complex (NID 0x18) MIC1 PORTB */ - 0x01971c11, // group 1, cap 1 - 0x01971d10, // black, jack detect - 0x01971ea7, // mic in, analog - 0x01971f03, // connector, left panel + // group 1, cap 1 + // black, jack detect + // mic in, analog + // connector, left panel + AZALIA_PIN_CFG(0x0, 0x19, 0x03a71011), /* Pin Complex (NID 0x19) MIC2 PORTF */ - 0x01871cf0, - 0x01871d11, - 0x01871e11, - 0x01871f41, + AZALIA_PIN_CFG(0x0, 0x18, 0x411111f0), /* Pin Complex (NID 0x1A) LINE1 PORTC */ - 0x01a71cf0, - 0x01a71d11, - 0x01a71e11, - 0x01a71f41, + AZALIA_PIN_CFG(0x0, 0x1a, 0x411111f0), /* Pin Complex (NID 0x1B) LINE2 PORTE */ - 0x01a71cf0, - 0x01a71d11, - 0x01a71e11, - 0x01a71f41, + AZALIA_PIN_CFG(0x0, 0x1a, 0x411111f0), /* Pin Complex (NID 0x1d) PCBeep */ - 0x01d71c2d, // eapd low on ex-amp, laptop, custom enable - 0x01d71d81, // mute spkr on hpout - 0x01d71e15, // pcbeep en able, checksum - 0x01d71f40, // no physical, internal + // eapd low on ex-amp, laptop, custom enable + // mute spkr on hpout + // pcbeep en able, checksum + // no physical, internal + AZALIA_PIN_CFG(0x0, 0x1d, 0x4015812d), /* Pin Complex (NID 0x1E) SPDIF-OUT */ - 0x01e71cf0, - 0x01e71d11, - 0x01e71e11, - 0x01e71f41, + AZALIA_PIN_CFG(0x0, 0x1e, 0x411111f0), /* Pin Complex (NID 0x21) HPOUT PORT-I */ - 0x02171c1f, // group1, - 0x02171d10, // black, jack detect - 0x02171e21, // HPOut, 1/8 stereo - 0x02171f03, // connector, left panel + // group1, + // black, jack detect + // HPOut, 1/8 stereo + // connector, left panel + AZALIA_PIN_CFG(0x0, 0x21, 0x0321101f), }; diff --git a/src/mainboard/google/butterfly/hda_verb.h b/src/mainboard/google/butterfly/hda_verb.h index 89a81fef71..e06a1bea49 100644 --- a/src/mainboard/google/butterfly/hda_verb.h +++ b/src/mainboard/google/butterfly/hda_verb.h @@ -36,58 +36,37 @@ static const u32 mainboard_cim_verb_data[] = { /* Bits 7:0 - Payload */ /* NID 0x01 - NodeInfo */ - 0x001720F9, - 0x00172118, - 0x0017223C, - 0x00172310, + AZALIA_SUBVENDOR(0x0, 0x103C18F9), /* 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, + AZALIA_PIN_CFG(0x0, 0x11, 0xD5A30140), /* * Hardware EQ Parameters @@ -232,28 +211,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/google/butterfly/mainboard.c b/src/mainboard/google/butterfly/mainboard.c index 85b86cbbaa..19e7926667 100644 --- a/src/mainboard/google/butterfly/mainboard.c +++ b/src/mainboard/google/butterfly/mainboard.c @@ -32,7 +32,6 @@ #include #include #include -#include "hda_verb.h" #include "onboard.h" #include "ec.h" #include @@ -40,6 +39,7 @@ #include #include #include +#include "hda_verb.h" #if CONFIG_CHROMEOS #include #else diff --git a/src/mainboard/google/falco/hda_verb.h b/src/mainboard/google/falco/hda_verb.h index ae7dbb31bc..5c37f510ea 100644 --- a/src/mainboard/google/falco/hda_verb.h +++ b/src/mainboard/google/falco/hda_verb.h @@ -29,72 +29,55 @@ static const u32 mainboard_cim_verb_data[] = { 0x000F0002, // Pad - get revision id /* NID 0x01, HDA Codec Subsystem ID Verb Table: 0x10ec0283 */ - 0x00172083, - 0x00172102, - 0x001722ec, - 0x00172310, + AZALIA_SUBVENDOR(0x0, 0x10ec0283), /* Pin Widget Verb Table */ /* Pin Complex (NID 0x12) DMIC - interior mobile lid */ - 0x01271c10, - 0x01271d10, - 0x01271ea6, - 0x01271fb7, + AZALIA_PIN_CFG(0x0, 0x12, 0xb7a61010), /* Pin Complex (NID 0x14) SPKR-OUT PORTD */ - 0x01471c10, // group 1, front left/right - 0x01471d01, // no connector, no jack detect - 0x01471e17, // speaker out, analog - 0x01471f90, // fixed function, internal + // group 1, front left/right + // no connector, no jack detect + // speaker out, analog + // fixed function, internal + AZALIA_PIN_CFG(0x0, 0x14, 0x90170110), /* Pin Complex (NID 0x17) */ - 0x01771cf0, - 0x01771d11, - 0x01771e11, - 0x01771f41, + AZALIA_PIN_CFG(0x0, 0x17, 0x411111f0), /* Pin Complex (NID 0x18) MIC1 PORTB */ - 0x01971c11, // group 1, cap 1 - 0x01971d10, // black, jack detect - 0x01971ea7, // mic in, analog - 0x01971f03, // connector, left panel + // group 1, cap 1 + // black, jack detect + // mic in, analog + // connector, left panel + AZALIA_PIN_CFG(0x0, 0x19, 0x03a71011), /* Pin Complex (NID 0x19) MIC2 PORTF */ - 0x01871cf0, - 0x01871d11, - 0x01871e11, - 0x01871f41, + AZALIA_PIN_CFG(0x0, 0x18, 0x411111f0), /* Pin Complex (NID 0x1A) LINE1 PORTC */ - 0x01a71cf0, - 0x01a71d11, - 0x01a71e11, - 0x01a71f41, + AZALIA_PIN_CFG(0x0, 0x1a, 0x411111f0), /* Pin Complex (NID 0x1B) LINE2 PORTE */ - 0x01a71cf0, - 0x01a71d11, - 0x01a71e11, - 0x01a71f41, + AZALIA_PIN_CFG(0x0, 0x1a, 0x411111f0), /* Pin Complex (NID 0x1d) PCBeep */ - 0x01d71c2d, // eapd low on ex-amp, laptop, custom enable - 0x01d71d81, // mute spkr on hpout - 0x01d71e15, // pcbeep en able, checksum - 0x01d71f40, // no physical, internal + // eapd low on ex-amp, laptop, custom enable + // mute spkr on hpout + // pcbeep en able, checksum + // no physical, internal + AZALIA_PIN_CFG(0x0, 0x1d, 0x4015812d), /* Pin Complex (NID 0x1E) SPDIF-OUT */ - 0x01e71cf0, - 0x01e71d11, - 0x01e71e11, - 0x01e71f41, + AZALIA_PIN_CFG(0x0, 0x1e, 0x411111f0), /* Pin Complex (NID 0x21) HPOUT PORT-I */ - 0x02171c1f, // group1, - 0x02171d10, // black, jack detect - 0x02171e21, // HPOut, 1/8 stereo - 0x02171f03, // connector, left panel + // group1, + // black, jack detect + // HPOut, 1/8 stereo + // connector, left panel + AZALIA_PIN_CFG(0x0, 0x21, 0x0321101f), /* Undocumented settings from Realtek (needed for beep_gen) */ /* Widget node 0x20 */ diff --git a/src/mainboard/google/falco/mainboard.c b/src/mainboard/google/falco/mainboard.c index 38edb5ca48..824b1ff3b4 100644 --- a/src/mainboard/google/falco/mainboard.c +++ b/src/mainboard/google/falco/mainboard.c @@ -34,9 +34,9 @@ #include #include #include -#include "hda_verb.h" #include #include +#include "hda_verb.h" #include "ec.h" #include "onboard.h" diff --git a/src/mainboard/google/link/hda_verb.h b/src/mainboard/google/link/hda_verb.h index ed18d63231..bb5ff106c5 100644 --- a/src/mainboard/google/link/hda_verb.h +++ b/src/mainboard/google/link/hda_verb.h @@ -78,64 +78,34 @@ static const u32 mainboard_cim_verb_data[] = { /* Pin Widget Verb Table */ /* NID 0x01, HDA Codec Subsystem ID Verb Table: 0x144DC0C2 */ - 0x001720c2, - 0x001721c0, - 0x0017224d, - 0x00172314, + AZALIA_SUBVENDOR(0x0, 0x144dc0c2), /* Pin Complex (NID 0x0B) Port-G Analog Unknown Speaker at Int N/A */ - 0x00b71cf0, - 0x00b71d00, - 0x00b71e17, - 0x00b71f90, + AZALIA_PIN_CFG(0x0, 0x0b, 0x901700f0), /* Pin Complex (NID 0x0C) N/C */ - 0x00c71cf0, - 0x00c71d00, - 0x00c71ef0, - 0x00c71f70, + AZALIA_PIN_CFG(0x0, 0x0c, 0x70f000f0), /* Pin Complex (NID 0x0D) N/C */ - 0x00d71cf0, - 0x00d71d00, - 0x00d71ef0, - 0x00d71f70, + AZALIA_PIN_CFG(0x0, 0x0d, 0x70f000f0), /* Pin Complex (NID 0x0E) N/C */ - 0x00e71cf0, - 0x00e71d00, - 0x00e71ef0, - 0x00e71f70, + AZALIA_PIN_CFG(0x0, 0x0e, 0x70f000f0), /* Pin Complex (NID 0x0F) N/C */ - 0x00f71cf0, - 0x00f71d00, - 0x00f71ef0, - 0x00f71f70, + AZALIA_PIN_CFG(0x0, 0x0f, 0x70f000f0), /* Pin Complex (NID 0x10) Port-D 1/8 Black HP Out at Ext Left */ - 0x01071cf0, - 0x01071d10, - 0x01071e21, - 0x01071f03, + AZALIA_PIN_CFG(0x0, 0x10, 0x032110f0), /* Pin Complex (NID 0x11) Port-B Click Mic */ - 0x01171cf0, - 0x01171d00, - 0x01171ea7, - 0x01171f90, + AZALIA_PIN_CFG(0x0, 0x11, 0x90a700f0), /* Pin Complex (NID 0x12) Port-C Combo Jack Mic or D-Mic */ - 0x01271cf0, - 0x01271d10, - 0x01271ea1, - 0x01271f03, + AZALIA_PIN_CFG(0x0, 0x12, 0x03a110f0), /* Pin Complex (NID 0x13) What you hear */ - 0x01371cf0, - 0x01371d00, - 0x01371ed6, - 0x01371f90, + AZALIA_PIN_CFG(0x0, 0x13, 0x90d600f0), /* coreboot specific header */ 0x80862806, // Codec Vendor / Device ID: Intel CougarPoint HDMI @@ -143,28 +113,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) 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/google/link/mainboard.c b/src/mainboard/google/link/mainboard.c index ee83089bbe..9d86458912 100644 --- a/src/mainboard/google/link/mainboard.c +++ b/src/mainboard/google/link/mainboard.c @@ -33,7 +33,6 @@ #include #include #include -#include "hda_verb.h" #include "onboard.h" #include "ec.h" #include @@ -41,6 +40,7 @@ #include #include #include +#include "hda_verb.h" /* placeholder for evenual link post. Not sure what we'll * do but it will look nice diff --git a/src/mainboard/google/panther/hda_verb.h b/src/mainboard/google/panther/hda_verb.h index 456561b6d5..47311e308d 100644 --- a/src/mainboard/google/panther/hda_verb.h +++ b/src/mainboard/google/panther/hda_verb.h @@ -29,72 +29,51 @@ static const u32 mainboard_cim_verb_data[] = { 0x0000000c, // Number of jacks (NID entries) /* NID 0x01, HDA Codec Subsystem ID Verb Table: 0x10ec0283 */ - 0x00172083, - 0x00172102, - 0x001722ec, - 0x00172310, + AZALIA_SUBVENDOR(0x0, 0x10ec0283), /* Pin Widget Verb Table */ /* Pin Complex (NID 0x12) DMIC */ - 0x01271cf0, - 0x01271d11, - 0x01271e11, - 0x01271f41, + AZALIA_PIN_CFG(0x0, 0x12, 0x411111f0), /* Pin Complex (NID 0x14) SPKR-OUT PORTD */ - 0x01471cf0, - 0x01471d11, - 0x01471e11, - 0x01471f40, + AZALIA_PIN_CFG(0x0, 0x14, 0x401111f0), /* Pin Complex (NID 0x17) */ - 0x01771cf0, - 0x01771d11, - 0x01771e11, - 0x01771f41, + AZALIA_PIN_CFG(0x0, 0x17, 0x411111f0), /* Pin Complex (NID 0x18) MIC1 PORTB */ - 0x01971c11, // group 1, cap 1 - 0x01971d10, // black, jack detect - 0x01971ea7, // mic in, analog - 0x01971f03, // connector, left panel + // group 1, cap 1 + // black, jack detect + // mic in, analog + // connector, left panel + AZALIA_PIN_CFG(0x0, 0x19, 0x03a71011), /* Pin Complex (NID 0x19) MIC2 PORTF */ - 0x01871cf0, - 0x01871d11, - 0x01871e11, - 0x01871f41, + AZALIA_PIN_CFG(0x0, 0x18, 0x411111f0), /* Pin Complex (NID 0x1A) LINE1 PORTC */ - 0x01a71cf0, - 0x01a71d11, - 0x01a71e11, - 0x01a71f41, + AZALIA_PIN_CFG(0x0, 0x1a, 0x411111f0), /* Pin Complex (NID 0x1B) LINE2 PORTE */ - 0x01a71cf0, - 0x01a71d11, - 0x01a71e11, - 0x01a71f41, + AZALIA_PIN_CFG(0x0, 0x1a, 0x411111f0), /* Pin Complex (NID 0x1d) PCBeep */ - 0x01d71c2d, // eapd low on ex-amp, laptop, custom enable - 0x01d71d81, // mute spkr on hpout - 0x01d71e15, // pcbeep en able, checksum - 0x01d71f40, // no physical, internal + // eapd low on ex-amp, laptop, custom enable + // mute spkr on hpout + // pcbeep en able, checksum + // no physical, internal + AZALIA_PIN_CFG(0x0, 0x1d, 0x4015812d), /* Pin Complex (NID 0x1E) SPDIF-OUT */ - 0x01e71cf0, - 0x01e71d11, - 0x01e71e11, - 0x01e71f41, + AZALIA_PIN_CFG(0x0, 0x1e, 0x411111f0), /* Pin Complex (NID 0x21) HPOUT PORT-I */ - 0x02171c1f, // group1, - 0x02171d10, // black, jack detect - 0x02171e21, // HPOut, 1/8 stereo - 0x02171f03, // connector, left panel + // group1, + // black, jack detect + // HPOut, 1/8 stereo + // connector, left panel + AZALIA_PIN_CFG(0x0, 0x21, 0x0321101f), /* Undocumented settings from Realtek (needed for beep_gen) */ /* Widget node 0x20 */ diff --git a/src/mainboard/google/parrot/hda_verb.h b/src/mainboard/google/parrot/hda_verb.h index ca68ad32fc..dfa7a817a3 100644 --- a/src/mainboard/google/parrot/hda_verb.h +++ b/src/mainboard/google/parrot/hda_verb.h @@ -40,72 +40,59 @@ static const u32 mainboard_cim_verb_data[] = { /* NID 0x01, HDA Codec Subsystem ID Verb Table: 0x10250742 */ - 0x00172042, - 0x00172107, - 0x00172225, - 0x00172310, + AZALIA_SUBVENDOR(0x0, 0x10250742), /* Pin Widget Verb Table */ /* Pin Complex (NID 0x12) DMIC */ - 0x01271cf0, - 0x01271d11, - 0x01271e11, - 0x01271f41, + AZALIA_PIN_CFG(0x0, 0x12, 0x411111f0), /* Pin Complex (NID 0x14) SPKR-OUT PORTD */ - 0x01471c10, // group 1, front left/right - 0x01471d01, // no connector, no jack detect - 0x01471e17, // speaker out, analog - 0x01471f90, // fixed function, internal + // group 1, front left/right + // no connector, no jack detect + // speaker out, analog + // fixed function, internal + AZALIA_PIN_CFG(0x0, 0x14, 0x90170110), /* Pin Complex (NID 0x17) */ - 0x01771cf0, - 0x01771d11, - 0x01771e11, - 0x01771f41, + AZALIA_PIN_CFG(0x0, 0x17, 0x411111f0), /* Pin Complex (NID 0x18) MIC1 PORTB */ - 0x01871cf0, - 0x01871d11, - 0x01871e11, - 0x01871f41, + AZALIA_PIN_CFG(0x0, 0x18, 0x411111f0), /* Pin Complex (NID 0x19) MIC2 PORTF */ - 0x01971c21, // group 2, cap 1 - 0x01971d10, // black, jack detect - 0x01971ea7, // mic in, analog - 0x01971f04, // connector, right panel + // group 2, cap 1 + // black, jack detect + // mic in, analog + // connector, right panel + AZALIA_PIN_CFG(0x0, 0x19, 0x04a71021), /* Pin Complex (NID 0x1A) LINE1 PORTC */ - 0x01a71cf0, - 0x01a71d11, - 0x01a71e11, - 0x01a71f41, + AZALIA_PIN_CFG(0x0, 0x1a, 0x411111f0), /* Pin Complex (NID 0x1B) LINE2 PORTE */ - 0x01b71c20, // group 2, cap 0 - 0x01b71d01, // no connector, no jack detect - 0x01b71ea7, // mic in, analog - 0x01b71f90, // fixed function, internal + // group 2, cap 0 + // no connector, no jack detect + // mic in, analog + // fixed function, internal + AZALIA_PIN_CFG(0x0, 0x1b, 0x90a70120), /* Pin Complex (NID 0x1d) PCBeep */ - 0x01d71c2d, // eapd low on ex-amp, laptop, custom enable - 0x01d71d81, // mute spkr on hpout - 0x01d71e15, // pcbeep en able, checksum - 0x01d71f40, // no physical, internal + // eapd low on ex-amp, laptop, custom enable + // mute spkr on hpout + // pcbeep en able, checksum + // no physical, internal + AZALIA_PIN_CFG(0x0, 0x1d, 0x4015812d), /* Pin Complex (NID 0x1E) SPDIF-OUT */ - 0x01e71cf0, - 0x01e71d11, - 0x01e71e11, - 0x01e71f41, + AZALIA_PIN_CFG(0x0, 0x1e, 0x411111f0), /* Pin Complex (NID 0x21) HPOUT PORTA? */ - 0x02171c1f, // group1, - 0x02171d10, // black, jack detect - 0x02171e21, // HPOut, 1/8 stereo - 0x02171f04, // connector, right panel + // group1, + // black, jack detect + // HPOut, 1/8 stereo + // connector, right panel + AZALIA_PIN_CFG(0x0, 0x21, 0x0421101f), /* Undocumented speaker output volume settings from Compal and Realtek */ /* Widget node 0x20 */ @@ -132,28 +119,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/google/parrot/mainboard.c b/src/mainboard/google/parrot/mainboard.c index 6aa3fcaffb..3e0c05268b 100644 --- a/src/mainboard/google/parrot/mainboard.c +++ b/src/mainboard/google/parrot/mainboard.c @@ -32,7 +32,6 @@ #include #include #include -#include "hda_verb.h" #include "onboard.h" #include "ec.h" #include @@ -40,6 +39,7 @@ #include #include #include +#include "hda_verb.h" void mainboard_suspend_resume(void) { diff --git a/src/mainboard/google/peppy/hda_verb.h b/src/mainboard/google/peppy/hda_verb.h index ec1b57d02e..9203522443 100644 --- a/src/mainboard/google/peppy/hda_verb.h +++ b/src/mainboard/google/peppy/hda_verb.h @@ -29,72 +29,59 @@ static const u32 mainboard_cim_verb_data[] = { /* Bits 7:0 - Payload */ /* NID 0x01, HDA Codec Subsystem ID Verb Table: 0x10ec0283 */ - 0x00172083, - 0x00172102, - 0x001722ec, - 0x00172310, + AZALIA_SUBVENDOR(0x0, 0x10ec0283), /* Pin Widget Verb Table */ /* Pin Complex (NID 0x12) DMIC - Disabled */ - 0x01271cf0, // - 0x01271d11, // - 0x01271e11, // - 0x01271f41, // + AZALIA_PIN_CFG(0x0, 0x12, 0x411111f0), /* Pin Complex (NID 0x14) SPKR-OUT - Internal Speakers */ - 0x01471c10, // group 1, cap 0 - 0x01471d01, // no connector, no jack detect - 0x01471e17, // speaker out, analog - 0x01471f90, // fixed function, internal, Location N/A + // group 1, cap 0 + // no connector, no jack detect + // speaker out, analog + // fixed function, internal, Location N/A + AZALIA_PIN_CFG(0x0, 0x14, 0x90170110), /* Pin Complex (NID 0x17) MONO Out - Disabled */ - 0x01771cf0, // - 0x01771d11, // - 0x01771e11, // - 0x01771f41, // + AZALIA_PIN_CFG(0x0, 0x17, 0x411111f0), /* Pin Complex (NID 0x18) Disabled */ - 0x01871cf0, // - 0x01871d11, // - 0x01871e11, // - 0x01871f41, // + AZALIA_PIN_CFG(0x0, 0x18, 0x411111f0), /* Pin Complex (NID 0x19) MIC2 - 3.5mm Jack */ - 0x01971c20, // group2, cap 0 - 0x01971d10, // black, jack detect - 0x01971ea1, // Mic in, 3.5mm Jack - 0x01971f03, // connector, External left panel + // group2, cap 0 + // black, jack detect + // Mic in, 3.5mm Jack + // connector, External left panel + AZALIA_PIN_CFG(0x0, 0x19, 0x03a11020), /* Pin Complex (NID 0x1A) LINE1 - Internal Mic */ - 0x01a71c11, // group 1, cap 1 - 0x01a71d01, // no connector, no jack detect - 0x01a71ea7, // mic in, analog connection - 0x01a71f90, // Fixed function, internal, Location N/A + // group 1, cap 1 + // no connector, no jack detect + // mic in, analog connection + // Fixed function, internal, Location N/A + AZALIA_PIN_CFG(0x0, 0x1a, 0x90a70111), /* Pin Complex (NID 0x1B) LINE2 - Disabled */ - 0x01b71cf0, // - 0x01b71d11, // - 0x01b71e11, // - 0x01b71f41, // + AZALIA_PIN_CFG(0x0, 0x1b, 0x411111f0), /* Pin Complex (NID 0x1D) PCBeep */ - 0x01d71c2d, // eapd low on ex-amp, laptop, custom enable - 0x01d71d81, // mute spkr on hpout - 0x01d71e15, // pcbeep en able, checksum - 0x01d71f40, // no physical, Internal, Location N/A + // eapd low on ex-amp, laptop, custom enable + // mute spkr on hpout + // pcbeep en able, checksum + // no physical, Internal, Location N/A + AZALIA_PIN_CFG(0x0, 0x1d, 0x4015812d), /* Pin Complex (NID 0x1E) SPDIF-OUT - Disabled*/ - 0x01e71cf0, // - 0x01e71d11, // - 0x01e71e11, // - 0x01e71f41, // + AZALIA_PIN_CFG(0x0, 0x1e, 0x411111f0), /* Pin Complex (NID 0x21) HP-OUT - 3.5mm Jack*/ - 0x02171c21, // group2, cap 1 - 0x02171d10, // black, jack detect - 0x02171e21, // HPOut, 3.5mm Jack - 0x02171f03, // connector, left panel + // group2, cap 1 + // black, jack detect + // HPOut, 3.5mm Jack + // connector, left panel + AZALIA_PIN_CFG(0x0, 0x21, 0x03211021), /* Undocumented settings from Realtek (needed for beep_gen) */ /* Widget node 0x20 */ diff --git a/src/mainboard/google/peppy/mainboard.c b/src/mainboard/google/peppy/mainboard.c index 38edb5ca48..ec3322abf5 100644 --- a/src/mainboard/google/peppy/mainboard.c +++ b/src/mainboard/google/peppy/mainboard.c @@ -34,11 +34,11 @@ #include #include #include -#include "hda_verb.h" #include #include #include "ec.h" #include "onboard.h" +#include "hda_verb.h" void mainboard_suspend_resume(void) { diff --git a/src/mainboard/google/slippy/gma.c b/src/mainboard/google/slippy/gma.c index f3316f4a47..bbb4e7218e 100644 --- a/src/mainboard/google/slippy/gma.c +++ b/src/mainboard/google/slippy/gma.c @@ -31,7 +31,6 @@ #include #include #include -#include "hda_verb.h" #include #include #include diff --git a/src/mainboard/google/slippy/hda_verb.h b/src/mainboard/google/slippy/hda_verb.h index ba0da1c1a4..b1f1cb6bf9 100644 --- a/src/mainboard/google/slippy/hda_verb.h +++ b/src/mainboard/google/slippy/hda_verb.h @@ -24,72 +24,55 @@ static const u32 mainboard_cim_verb_data[] = { 0x0000000c, // Number of jacks (NID entries) /* NID 0x01, HDA Codec Subsystem ID Verb Table: 0x10ec0283 */ - 0x00172083, - 0x00172102, - 0x001722ec, - 0x00172310, + AZALIA_SUBVENDOR(0x0, 0x10ec0283), /* Pin Widget Verb Table */ /* Pin Complex (NID 0x12) DMIC - interior mobile lid */ - 0x01271c10, - 0x01271d10, - 0x01271ea6, - 0x01271fb7, + AZALIA_PIN_CFG(0x0, 0x12, 0xb7a61010), /* Pin Complex (NID 0x14) SPKR-OUT PORTD */ - 0x01471c10, // group 1, front left/right - 0x01471d01, // no connector, no jack detect - 0x01471e17, // speaker out, analog - 0x01471f90, // fixed function, internal + // group 1, front left/right + // no connector, no jack detect + // speaker out, analog + // fixed function, internal + AZALIA_PIN_CFG(0x0, 0x14, 0x90170110), /* Pin Complex (NID 0x17) */ - 0x01771cf0, - 0x01771d11, - 0x01771e11, - 0x01771f41, + AZALIA_PIN_CFG(0x0, 0x17, 0x411111f0), /* Pin Complex (NID 0x18) MIC1 PORTB */ - 0x01971c11, // group 1, cap 1 - 0x01971d10, // black, jack detect - 0x01971ea7, // mic in, analog - 0x01971f03, // connector, left panel + // group 1, cap 1 + // black, jack detect + // mic in, analog + // connector, left panel + AZALIA_PIN_CFG(0x0, 0x19, 0x03a71011), /* Pin Complex (NID 0x19) MIC2 PORTF */ - 0x01871cf0, - 0x01871d11, - 0x01871e11, - 0x01871f41, + AZALIA_PIN_CFG(0x0, 0x18, 0x411111f0), /* Pin Complex (NID 0x1A) LINE1 PORTC */ - 0x01a71cf0, - 0x01a71d11, - 0x01a71e11, - 0x01a71f41, + AZALIA_PIN_CFG(0x0, 0x1a, 0x411111f0), /* Pin Complex (NID 0x1B) LINE2 PORTE */ - 0x01a71cf0, - 0x01a71d11, - 0x01a71e11, - 0x01a71f41, + AZALIA_PIN_CFG(0x0, 0x1a, 0x411111f0), /* Pin Complex (NID 0x1d) PCBeep */ - 0x01d71c2d, // eapd low on ex-amp, laptop, custom enable - 0x01d71d81, // mute spkr on hpout - 0x01d71e15, // pcbeep en able, checksum - 0x01d71f40, // no physical, internal + // eapd low on ex-amp, laptop, custom enable + // mute spkr on hpout + // pcbeep en able, checksum + // no physical, internal + AZALIA_PIN_CFG(0x0, 0x1d, 0x4015812d), /* Pin Complex (NID 0x1E) SPDIF-OUT */ - 0x01e71cf0, - 0x01e71d11, - 0x01e71e11, - 0x01e71f41, + AZALIA_PIN_CFG(0x0, 0x1e, 0x411111f0), /* Pin Complex (NID 0x21) HPOUT PORT-I */ - 0x02171c1f, // group1, - 0x02171d10, // black, jack detect - 0x02171e21, // HPOut, 1/8 stereo - 0x02171f03, // connector, left panel + // group1, + // black, jack detect + // HPOut, 1/8 stereo + // connector, left panel + AZALIA_PIN_CFG(0x0, 0x21, 0x0321101f), /* Undocumented settings from Realtek (needed for beep_gen) */ /* Widget node 0x20 */ diff --git a/src/mainboard/google/slippy/mainboard.c b/src/mainboard/google/slippy/mainboard.c index 022c1e8be0..a0e6ffa359 100644 --- a/src/mainboard/google/slippy/mainboard.c +++ b/src/mainboard/google/slippy/mainboard.c @@ -34,11 +34,11 @@ #include #include #include -#include "hda_verb.h" #include #include "ec.h" #include "onboard.h" #include +#include "hda_verb.h" void mainboard_suspend_resume(void) { 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 #include #include -#include "hda_verb.h" #include "onboard.h" #include "ec.h" #include @@ -40,6 +39,7 @@ #include #include #include +#include "hda_verb.h" void mainboard_suspend_resume(void) { -- cgit v1.2.3