Patrick Rudolph has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/44772 )
Change subject: mb/prodrive/hermes/hda_verb: Fix some issues ......................................................................
mb/prodrive/hermes/hda_verb: Fix some issues
* Use correct NID port mapping * Fix verb count in ACL888 header * Fix NID in Intel codec verbs * Add more NIDs
Change-Id: I24ea9149eb2cddb815ff82744a351c926a94aaef Signed-off-by: Patrick Rudolph patrick.rudolph@9elements.com --- M src/mainboard/prodrive/hermes/hda_verb.c 1 file changed, 74 insertions(+), 60 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/72/44772/1
diff --git a/src/mainboard/prodrive/hermes/hda_verb.c b/src/mainboard/prodrive/hermes/hda_verb.c index 59b8aa6..6cde639 100644 --- a/src/mainboard/prodrive/hermes/hda_verb.c +++ b/src/mainboard/prodrive/hermes/hda_verb.c @@ -5,47 +5,11 @@ const u32 cim_verb_data[] = { 0x10ec0888, /* Codec Vendor / Device ID: Realtek ALC888 */ 0x10ec0888, /* Subsystem ID */ - 10, /* Number of 4 dword sets */ + 13, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0, 0x10ec0888),
- /* Port A: Front, Audio Header #1 */ - AZALIA_PIN_CFG(0, 0x14, AZALIA_PIN_DESC( - INTEGRATED, - INTERNAL, - SPECIAL7, - LINE_OUT, - OTHER_ANALOG, - COLOR_UNKNOWN, - false, - 0xf, - 0 - )), - /* Port B: Mic1, Line input (pink) */ - AZALIA_PIN_CFG(0, 0x15, AZALIA_PIN_DESC( - JACK, - EXTERNAL_PRIMARY_CHASSIS, - REAR, //FIXME - LINE_IN, - STEREO_MONO_1_8, - PINK, - false, - 0xf, - 0 - )), - /* Port C: Line, Speaker (only L) */ - AZALIA_PIN_CFG(0, 0x16, AZALIA_PIN_DESC( - INTEGRATED, - INTERNAL, - NA, - SPEAKER, - TYPE_UNKNOWN, - COLOR_UNKNOWN, - false, - 0xf, - 0 - )), /* Port D: Sidesurr, Line out (green) */ - AZALIA_PIN_CFG(0, 0x17, AZALIA_PIN_DESC( + AZALIA_PIN_CFG(0, 0x14, AZALIA_PIN_DESC( //JACK, LINE_OUT, EXTERNAL_PRIMARY_CHASSIS, @@ -57,14 +21,50 @@ 0xf, 0 )), - /* Port E: Line2, Line input (blue) */ + /* Port A: Front, Audio Header #1 */ + AZALIA_PIN_CFG(0, 0x15, AZALIA_PIN_DESC( + INTEGRATED, + INTERNAL, + SPECIAL7, + LINE_OUT, + OTHER_ANALOG, + COLOR_UNKNOWN, + false, + 0xf, + 0 + )), + /* Port G: Not connected */ + AZALIA_PIN_CFG(0, 0x16, AZALIA_PIN_DESC( + NC, + LOCATION_OTHER, + NA, + DEVICE_OTHER, + TYPE_OTHER, + COLOR_OTHER, + true, + 0, + 0 + )), + /* Port H: Not connected */ + AZALIA_PIN_CFG(0, 0x17, AZALIA_PIN_DESC( + NC, + LOCATION_OTHER, + NA, + DEVICE_OTHER, + TYPE_OTHER, + COLOR_OTHER, + true, + 0, + 0 + )), + /* Port B: Mic1, Line input (pink) */ AZALIA_PIN_CFG(0, 0x18, AZALIA_PIN_DESC( JACK, EXTERNAL_PRIMARY_CHASSIS, REAR, //FIXME LINE_IN, STEREO_MONO_1_8, - BLUE, + PINK, false, 0xf, 0 @@ -81,20 +81,32 @@ 0xf, 0 )), - /* Port G: Not connected */ + /* Port C: Line, Speaker (only L) */ AZALIA_PIN_CFG(0, 0x1a, AZALIA_PIN_DESC( - NC, - LOCATION_OTHER, + INTEGRATED, + INTERNAL, NA, - DEVICE_OTHER, - TYPE_OTHER, - COLOR_OTHER, - true, - 0, + SPEAKER, + TYPE_UNKNOWN, + COLOR_UNKNOWN, + false, + 0xf, 0 )), - /* Port H: Not connected */ + /* Port E: Line2, Line input (blue) */ AZALIA_PIN_CFG(0, 0x1b, AZALIA_PIN_DESC( + JACK, + EXTERNAL_PRIMARY_CHASSIS, + REAR, //FIXME + LINE_IN, + STEREO_MONO_1_8, + BLUE, + false, + 0xf, + 0 + )), + /* Port CD: Not connected */ + AZALIA_PIN_CFG(0, 0x1c, AZALIA_PIN_DESC( NC, LOCATION_OTHER, NA, @@ -105,6 +117,8 @@ 0, 0 )), + /* BEEPIN: This NID is also used as SSID. Use magic constant to satisfy the driver. */ + AZALIA_PIN_CFG(0, 0x1d, 0x4000c601),
/* S/PDIF-OUT */ AZALIA_PIN_CFG(0, 0x1e, AZALIA_PIN_DESC( @@ -131,16 +145,16 @@ 0 )),
- //FIXME COdec ID /* * VerbTable: CFL Display Audio Codec * Revision ID = 0xFF * Codec Vendor: 0x8086280B */ - 0x8086280B, 0xFFFFFFFF, - 5, /* Number of 4 dword sets */ + 6, /* Number of 4 dword sets */ + + AZALIA_SUBVENDOR(2, 0x80860101),
/* * Display Audio Verb Table @@ -148,10 +162,10 @@ * Port to be exposed to the inbox driver in the vanilla mode * PORT C - BIT[7:6] = 01b */ - 0x00878140, - 0x00878140, - 0x00878140, - 0x00878140, + 0x02878140, + 0x02878140, + 0x02878140, + 0x02878140, /* Pin Widget 5 - PORT B - Configuration Default: 0x18560010 */ AZALIA_PIN_CFG(2, 0x05, 0x18560010), /* Pin Widget 6 - PORT C - Configuration Default: 0x18560020 */ @@ -159,10 +173,10 @@ /* Pin Widget 7 - PORT D - Configuration Default: 0x18560030 */ AZALIA_PIN_CFG(2, 0x07, 0x18560030), /* Disable the third converter and third Pin (NID 08h) */ - 0x00878140, - 0x00878140, - 0x00878140, - 0x00878140, + 0x02878140, + 0x02878140, + 0x02878140, + 0x02878140, };
const u32 pc_beep_verbs[0] = {};