diff options
| author | Matt DeVillier <matt.devillier@gmail.com> | 2020-06-18 00:44:25 -0500 |
|---|---|---|
| committer | Matt DeVillier <matt.devillier@gmail.com> | 2020-06-20 20:28:54 +0000 |
| commit | e64ef9dee056b139273a3e0ad83c76dd4c3254f6 (patch) | |
| tree | f5128fd3ca61111c7448afa640bbe0d2ed8f2577 /src | |
| parent | a9f881d039985a468053b25036ef13bc786789bf (diff) | |
mb/google/beltino/**/hda_verb.c: Correct mic pin configs
Commit 0558d0c [mb/google/beltino/**/hda_verb.c: Correct pin configs]
incorrectly flipped the mic pin configs for verb NIDs 0x18 and 0x19,
so set them back to the correct values, which match the original
Chromium sources (where the NID identifiers in the pin config comments
were reversed, which was the source of the confusion originally.
Test: build/boot panther and zako variants, verify mic attached
to 3.5mm jack functional
Change-Id: I172a0bb299049d113a0272ee9c790b25b6242cad
Signed-off-by: Matt DeVillier <matt.devillier@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/42499
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src')
4 files changed, 20 insertions, 20 deletions
diff --git a/src/mainboard/google/beltino/variants/mccloud/hda_verb.c b/src/mainboard/google/beltino/variants/mccloud/hda_verb.c index 878314bccb..550ae829e9 100644 --- a/src/mainboard/google/beltino/variants/mccloud/hda_verb.c +++ b/src/mainboard/google/beltino/variants/mccloud/hda_verb.c @@ -27,15 +27,15 @@ const u32 cim_verb_data[] = { /* Pin Complex (NID 0x17) MONO Out - Disabled */ AZALIA_PIN_CFG(0, 0x17, 0x411111f0), - /* Pin Complex (NID 0x18) MIC1 PORTB */ + /* Pin Complex (NID 0x18) MIC1 PORTB - Disabled */ + AZALIA_PIN_CFG(0, 0x18, 0x411111f0), + + /* Pin Complex (NID 0x19) MIC2 PORTF */ // group 1, cap 1 // black, jack detect // mic in, analog // connector, left panel - AZALIA_PIN_CFG(0, 0x18, 0x03a71011), - - /* Pin Complex (NID 0x19) MIC2 PORTF - Disabled */ - AZALIA_PIN_CFG(0, 0x19, 0x411111f0), + AZALIA_PIN_CFG(0, 0x19, 0x03a71011), /* Pin Complex (NID 0x1A) LINE1 PORTC - Disabled */ AZALIA_PIN_CFG(0, 0x1a, 0x411111f0), diff --git a/src/mainboard/google/beltino/variants/panther/hda_verb.c b/src/mainboard/google/beltino/variants/panther/hda_verb.c index 878314bccb..550ae829e9 100644 --- a/src/mainboard/google/beltino/variants/panther/hda_verb.c +++ b/src/mainboard/google/beltino/variants/panther/hda_verb.c @@ -27,15 +27,15 @@ const u32 cim_verb_data[] = { /* Pin Complex (NID 0x17) MONO Out - Disabled */ AZALIA_PIN_CFG(0, 0x17, 0x411111f0), - /* Pin Complex (NID 0x18) MIC1 PORTB */ + /* Pin Complex (NID 0x18) MIC1 PORTB - Disabled */ + AZALIA_PIN_CFG(0, 0x18, 0x411111f0), + + /* Pin Complex (NID 0x19) MIC2 PORTF */ // group 1, cap 1 // black, jack detect // mic in, analog // connector, left panel - AZALIA_PIN_CFG(0, 0x18, 0x03a71011), - - /* Pin Complex (NID 0x19) MIC2 PORTF - Disabled */ - AZALIA_PIN_CFG(0, 0x19, 0x411111f0), + AZALIA_PIN_CFG(0, 0x19, 0x03a71011), /* Pin Complex (NID 0x1A) LINE1 PORTC - Disabled */ AZALIA_PIN_CFG(0, 0x1a, 0x411111f0), diff --git a/src/mainboard/google/beltino/variants/tricky/hda_verb.c b/src/mainboard/google/beltino/variants/tricky/hda_verb.c index 878314bccb..550ae829e9 100644 --- a/src/mainboard/google/beltino/variants/tricky/hda_verb.c +++ b/src/mainboard/google/beltino/variants/tricky/hda_verb.c @@ -27,15 +27,15 @@ const u32 cim_verb_data[] = { /* Pin Complex (NID 0x17) MONO Out - Disabled */ AZALIA_PIN_CFG(0, 0x17, 0x411111f0), - /* Pin Complex (NID 0x18) MIC1 PORTB */ + /* Pin Complex (NID 0x18) MIC1 PORTB - Disabled */ + AZALIA_PIN_CFG(0, 0x18, 0x411111f0), + + /* Pin Complex (NID 0x19) MIC2 PORTF */ // group 1, cap 1 // black, jack detect // mic in, analog // connector, left panel - AZALIA_PIN_CFG(0, 0x18, 0x03a71011), - - /* Pin Complex (NID 0x19) MIC2 PORTF - Disabled */ - AZALIA_PIN_CFG(0, 0x19, 0x411111f0), + AZALIA_PIN_CFG(0, 0x19, 0x03a71011), /* Pin Complex (NID 0x1A) LINE1 PORTC - Disabled */ AZALIA_PIN_CFG(0, 0x1a, 0x411111f0), diff --git a/src/mainboard/google/beltino/variants/zako/hda_verb.c b/src/mainboard/google/beltino/variants/zako/hda_verb.c index 878314bccb..550ae829e9 100644 --- a/src/mainboard/google/beltino/variants/zako/hda_verb.c +++ b/src/mainboard/google/beltino/variants/zako/hda_verb.c @@ -27,15 +27,15 @@ const u32 cim_verb_data[] = { /* Pin Complex (NID 0x17) MONO Out - Disabled */ AZALIA_PIN_CFG(0, 0x17, 0x411111f0), - /* Pin Complex (NID 0x18) MIC1 PORTB */ + /* Pin Complex (NID 0x18) MIC1 PORTB - Disabled */ + AZALIA_PIN_CFG(0, 0x18, 0x411111f0), + + /* Pin Complex (NID 0x19) MIC2 PORTF */ // group 1, cap 1 // black, jack detect // mic in, analog // connector, left panel - AZALIA_PIN_CFG(0, 0x18, 0x03a71011), - - /* Pin Complex (NID 0x19) MIC2 PORTF - Disabled */ - AZALIA_PIN_CFG(0, 0x19, 0x411111f0), + AZALIA_PIN_CFG(0, 0x19, 0x03a71011), /* Pin Complex (NID 0x1A) LINE1 PORTC - Disabled */ AZALIA_PIN_CFG(0, 0x1a, 0x411111f0), |