Patrick Georgi submitted this change.

View Change

Approvals: build bot (Jenkins): Verified Matt DeVillier: Looks good to me, approved
mb/google/beltino/**/hda_verb.c: Correct pin configs

NIDs 0x18 and 0x19 are flipped, and the verbs for NID 0x1b are instead
applied onto NID 0x1a. Fix that, so that it matches original Chromium
sources for the boards.

Change-Id: I20cc4b282602f8557fa4f25489adf899b7460a09
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/37852
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Matt DeVillier <matt.devillier@gmail.com>
---
M src/mainboard/google/beltino/variants/mccloud/hda_verb.c
M src/mainboard/google/beltino/variants/monroe/hda_verb.c
M src/mainboard/google/beltino/variants/panther/hda_verb.c
M src/mainboard/google/beltino/variants/tricky/hda_verb.c
M src/mainboard/google/beltino/variants/zako/hda_verb.c
5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/mainboard/google/beltino/variants/mccloud/hda_verb.c b/src/mainboard/google/beltino/variants/mccloud/hda_verb.c
index a60bee4..14f1410 100644
--- a/src/mainboard/google/beltino/variants/mccloud/hda_verb.c
+++ b/src/mainboard/google/beltino/variants/mccloud/hda_verb.c
@@ -45,16 +45,16 @@
// black, jack detect
// mic in, analog
// connector, left panel
- AZALIA_PIN_CFG(0, 0x19, 0x03a71011),
+ AZALIA_PIN_CFG(0, 0x18, 0x03a71011),

/* Pin Complex (NID 0x19) MIC2 PORTF - Disabled */
- AZALIA_PIN_CFG(0, 0x18, 0x411111f0),
+ AZALIA_PIN_CFG(0, 0x19, 0x411111f0),

/* Pin Complex (NID 0x1A) LINE1 PORTC - Disabled */
AZALIA_PIN_CFG(0, 0x1a, 0x411111f0),

/* Pin Complex (NID 0x1B) LINE2 PORTE - Disabled */
- AZALIA_PIN_CFG(0, 0x1a, 0x411111f0),
+ AZALIA_PIN_CFG(0, 0x1b, 0x411111f0),

/* Pin Complex (NID 0x1d) PCBeep */
// eapd low on ex-amp, laptop, custom enable
diff --git a/src/mainboard/google/beltino/variants/monroe/hda_verb.c b/src/mainboard/google/beltino/variants/monroe/hda_verb.c
index 9ca85e9..964687c 100644
--- a/src/mainboard/google/beltino/variants/monroe/hda_verb.c
+++ b/src/mainboard/google/beltino/variants/monroe/hda_verb.c
@@ -41,16 +41,16 @@
AZALIA_PIN_CFG(0, 0x17, 0x411111f0),

/* Pin Complex (NID 0x18) MIC1 PORTB - Disabled*/
- AZALIA_PIN_CFG(0, 0x19, 0x411111f0),
+ AZALIA_PIN_CFG(0, 0x18, 0x411111f0),

/* Pin Complex (NID 0x19) MIC2 PORTF - 3.5mm Jack*/
- AZALIA_PIN_CFG(0, 0x18, 0x03a11020),
+ AZALIA_PIN_CFG(0, 0x19, 0x03a11020),

/* Pin Complex (NID 0x1A) LINE1 PORTC - Disabled */
AZALIA_PIN_CFG(0, 0x1a, 0x411111f0),

/* Pin Complex (NID 0x1B) LINE2 PORTE - Disabled */
- AZALIA_PIN_CFG(0, 0x1a, 0x411111f0),
+ AZALIA_PIN_CFG(0, 0x1b, 0x411111f0),

/* Pin Complex (NID 0x1d) PCBeep */
// eapd low on ex-amp, laptop, custom enable
diff --git a/src/mainboard/google/beltino/variants/panther/hda_verb.c b/src/mainboard/google/beltino/variants/panther/hda_verb.c
index a60bee4..14f1410 100644
--- a/src/mainboard/google/beltino/variants/panther/hda_verb.c
+++ b/src/mainboard/google/beltino/variants/panther/hda_verb.c
@@ -45,16 +45,16 @@
// black, jack detect
// mic in, analog
// connector, left panel
- AZALIA_PIN_CFG(0, 0x19, 0x03a71011),
+ AZALIA_PIN_CFG(0, 0x18, 0x03a71011),

/* Pin Complex (NID 0x19) MIC2 PORTF - Disabled */
- AZALIA_PIN_CFG(0, 0x18, 0x411111f0),
+ AZALIA_PIN_CFG(0, 0x19, 0x411111f0),

/* Pin Complex (NID 0x1A) LINE1 PORTC - Disabled */
AZALIA_PIN_CFG(0, 0x1a, 0x411111f0),

/* Pin Complex (NID 0x1B) LINE2 PORTE - Disabled */
- AZALIA_PIN_CFG(0, 0x1a, 0x411111f0),
+ AZALIA_PIN_CFG(0, 0x1b, 0x411111f0),

/* Pin Complex (NID 0x1d) PCBeep */
// eapd low on ex-amp, laptop, custom enable
diff --git a/src/mainboard/google/beltino/variants/tricky/hda_verb.c b/src/mainboard/google/beltino/variants/tricky/hda_verb.c
index a60bee4..14f1410 100644
--- a/src/mainboard/google/beltino/variants/tricky/hda_verb.c
+++ b/src/mainboard/google/beltino/variants/tricky/hda_verb.c
@@ -45,16 +45,16 @@
// black, jack detect
// mic in, analog
// connector, left panel
- AZALIA_PIN_CFG(0, 0x19, 0x03a71011),
+ AZALIA_PIN_CFG(0, 0x18, 0x03a71011),

/* Pin Complex (NID 0x19) MIC2 PORTF - Disabled */
- AZALIA_PIN_CFG(0, 0x18, 0x411111f0),
+ AZALIA_PIN_CFG(0, 0x19, 0x411111f0),

/* Pin Complex (NID 0x1A) LINE1 PORTC - Disabled */
AZALIA_PIN_CFG(0, 0x1a, 0x411111f0),

/* Pin Complex (NID 0x1B) LINE2 PORTE - Disabled */
- AZALIA_PIN_CFG(0, 0x1a, 0x411111f0),
+ AZALIA_PIN_CFG(0, 0x1b, 0x411111f0),

/* Pin Complex (NID 0x1d) PCBeep */
// eapd low on ex-amp, laptop, custom enable
diff --git a/src/mainboard/google/beltino/variants/zako/hda_verb.c b/src/mainboard/google/beltino/variants/zako/hda_verb.c
index a60bee4..14f1410 100644
--- a/src/mainboard/google/beltino/variants/zako/hda_verb.c
+++ b/src/mainboard/google/beltino/variants/zako/hda_verb.c
@@ -45,16 +45,16 @@
// black, jack detect
// mic in, analog
// connector, left panel
- AZALIA_PIN_CFG(0, 0x19, 0x03a71011),
+ AZALIA_PIN_CFG(0, 0x18, 0x03a71011),

/* Pin Complex (NID 0x19) MIC2 PORTF - Disabled */
- AZALIA_PIN_CFG(0, 0x18, 0x411111f0),
+ AZALIA_PIN_CFG(0, 0x19, 0x411111f0),

/* Pin Complex (NID 0x1A) LINE1 PORTC - Disabled */
AZALIA_PIN_CFG(0, 0x1a, 0x411111f0),

/* Pin Complex (NID 0x1B) LINE2 PORTE - Disabled */
- AZALIA_PIN_CFG(0, 0x1a, 0x411111f0),
+ AZALIA_PIN_CFG(0, 0x1b, 0x411111f0),

/* Pin Complex (NID 0x1d) PCBeep */
// eapd low on ex-amp, laptop, custom enable

To view, visit change 37852. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I20cc4b282602f8557fa4f25489adf899b7460a09
Gerrit-Change-Number: 37852
Gerrit-PatchSet: 5
Gerrit-Owner: Angel Pons <th3fanbus@gmail.com>
Gerrit-Reviewer: Angel Pons <th3fanbus@gmail.com>
Gerrit-Reviewer: HAOUAS Elyes <ehaouas@noos.fr>
Gerrit-Reviewer: Matt DeVillier <matt.devillier@gmail.com>
Gerrit-Reviewer: Nico Huber <nico.h@gmx.de>
Gerrit-Reviewer: Patrick Georgi <pgeorgi@google.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org>
Gerrit-CC: Paul Menzel <paulepanter@users.sourceforge.net>
Gerrit-MessageType: merged