From 1e1bbb17a05410bd5fd95459a9bdbc0c5ac6804d Mon Sep 17 00:00:00 2001 From: Matt DeVillier Date: Fri, 19 May 2017 16:47:08 -0500 Subject: [PATCH] purism/librem13v2: Fix HDA verb values, use azalia macros Use verb table values from AMI firmware, consolidate NID definitions using azalia macros. Fixes headphone jack detection and microphone. Change-Id: Ia31be6efc7afe921ad91b400f66694d951f0a260 Signed-off-by: Matt DeVillier Reviewed-on: https://review.coreboot.org/19944 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth Reviewed-by: Paul Menzel --- src/mainboard/purism/librem13v2/hda_verb.h | 59 +++++----------------- 1 file changed, 13 insertions(+), 46 deletions(-) diff --git a/src/mainboard/purism/librem13v2/hda_verb.h b/src/mainboard/purism/librem13v2/hda_verb.h index a2984f068a..660ad0c10c 100644 --- a/src/mainboard/purism/librem13v2/hda_verb.h +++ b/src/mainboard/purism/librem13v2/hda_verb.h @@ -35,72 +35,39 @@ const u32 cim_verb_data[] = { /* Bits 7:0 - Payload */ /* NID 0x01, HDA Codec Subsystem ID Verb Table: 0x19910269 */ - 0x00172069, - 0x00172102, - 0x00172291, - 0x00172319, + AZALIA_SUBVENDOR(0x0, 0x19910269), /* Pin Widget Verb Table */ /* Pin Complex (NID 0x12) */ - 0x01271c00, - 0x01271d00, - 0x01271e00, - 0x01271f40, + AZALIA_PIN_CFG(0x0, 0x12, 0x40000000), /* Pin Complex (NID 0x14) */ - 0x01471c10, - 0x01471d01, - 0x01471e17, - 0x01471f90, + AZALIA_PIN_CFG(0x0, 0x14, 0x90170110), + + /* Pin Complex (NID 0x15) */ + AZALIA_PIN_CFG(0x0, 0x15, 0x04214020), /* Pin Complex (NID 0x17) */ - 0x01771cf0, - 0x01771d11, - 0x01771e11, - 0x01771f41, + AZALIA_PIN_CFG(0x0, 0x17, 0x411111f0), /* Pin Complex (NID 0x18) */ - 0x01871c20, - 0x01871d10, - 0x01871ea1, - 0x01871f04, + AZALIA_PIN_CFG(0x0, 0x18, 0x04a19040), /* Pin Complex (NID 0x19) */ - 0x01971c30, - 0x01971d01, - 0x01971ea7, - 0x01971f90, + AZALIA_PIN_CFG(0x0, 0x19, 0x90a70130), /* Pin Complex (NID 0x1A) */ - 0x01a71cf0, - 0x01a71d11, - 0x01a71e11, - 0x01a71f41, + AZALIA_PIN_CFG(0x0, 0x1A, 0x411111f0), /* Pin Complex (NID 0x1B) */ - 0x01b71cf0, - 0x01b71d11, - 0x01b71e11, - 0x01b71f41, + AZALIA_PIN_CFG(0x0, 0x1B, 0x411111f0), /* Pin Complex (NID 0x1D) */ - 0x01d71c05, - 0x01d71d9d, - 0x01d71e56, - 0x01d71f40, + AZALIA_PIN_CFG(0x0, 0x1D, 0x40548505), /* Pin Complex (NID 0x1E) */ - 0x01e71cf0, - 0x01e71d11, - 0x01e71e11, - 0x01e71f41, - - /* Pin Complex (NID 0x21) */ - 0x02171c1f, - 0x02171d10, - 0x02171e21, - 0x02171f04, + AZALIA_PIN_CFG(0x0, 0x1E, 0x411111f0), }; const u32 pc_beep_verbs[] = {