Angel Pons has uploaded this change for review.

View Change

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.

Change-Id: I20cc4b282602f8557fa4f25489adf899b7460a09
Signed-off-by: Angel Pons <th3fanbus@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, 25 insertions(+), 25 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/52/37852/1

diff --git a/src/mainboard/google/beltino/variants/mccloud/hda_verb.c b/src/mainboard/google/beltino/variants/mccloud/hda_verb.c
index 19c7c62..c6b12f8 100644
--- a/src/mainboard/google/beltino/variants/mccloud/hda_verb.c
+++ b/src/mainboard/google/beltino/variants/mccloud/hda_verb.c
@@ -39,8 +39,11 @@
 	/* Pin Complex (NID 0x17) MONO Out - Disabled */
 	AZALIA_PIN_CFG(0, 0x17, 0x411111f0),
 
+	/* Pin Complex (NID 0x18) MIC1 PORTB - Disabled */
+	AZALIA_PIN_CFG(0, 0x18, 0x411111f0),
+
 	/*
-	 * Pin Complex (NID 0x18) MIC1 PORTB
+	 * Pin Complex (NID 0x19) MIC2 PORTF
 	 *  group 1, cap 1
 	 *  black, jack detect
 	 *  mic in, analog
@@ -48,14 +51,11 @@
 	 */
 	AZALIA_PIN_CFG(0, 0x19, 0x03a71011),
 
-	/* Pin Complex (NID 0x19) MIC2 PORTF - Disabled */
-	AZALIA_PIN_CFG(0, 0x18, 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
diff --git a/src/mainboard/google/beltino/variants/monroe/hda_verb.c b/src/mainboard/google/beltino/variants/monroe/hda_verb.c
index 42729cc..a778dc7 100644
--- a/src/mainboard/google/beltino/variants/monroe/hda_verb.c
+++ b/src/mainboard/google/beltino/variants/monroe/hda_verb.c
@@ -39,17 +39,17 @@
 	/* Pin Complex (NID 0x17) MONO Out - Disabled */
 	AZALIA_PIN_CFG(0, 0x17, 0x411111f0),
 
-	/* Pin Complex (NID 0x18) MIC1 PORTB - Disabled*/
-	AZALIA_PIN_CFG(0, 0x19, 0x411111f0),
-
-	/* Pin Complex (NID 0x19) MIC2 PORTF - 3.5mm Jack*/
+	/* Pin Complex (NID 0x18) MIC1 PORTB - 3.5mm Jack*/
 	AZALIA_PIN_CFG(0, 0x18, 0x03a11020),
 
+	/* Pin Complex (NID 0x19) MIC2 PORTF - Disabled*/
+	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
diff --git a/src/mainboard/google/beltino/variants/panther/hda_verb.c b/src/mainboard/google/beltino/variants/panther/hda_verb.c
index 19c7c62..c6b12f8 100644
--- a/src/mainboard/google/beltino/variants/panther/hda_verb.c
+++ b/src/mainboard/google/beltino/variants/panther/hda_verb.c
@@ -39,8 +39,11 @@
 	/* Pin Complex (NID 0x17) MONO Out - Disabled */
 	AZALIA_PIN_CFG(0, 0x17, 0x411111f0),
 
+	/* Pin Complex (NID 0x18) MIC1 PORTB - Disabled */
+	AZALIA_PIN_CFG(0, 0x18, 0x411111f0),
+
 	/*
-	 * Pin Complex (NID 0x18) MIC1 PORTB
+	 * Pin Complex (NID 0x19) MIC2 PORTF
 	 *  group 1, cap 1
 	 *  black, jack detect
 	 *  mic in, analog
@@ -48,14 +51,11 @@
 	 */
 	AZALIA_PIN_CFG(0, 0x19, 0x03a71011),
 
-	/* Pin Complex (NID 0x19) MIC2 PORTF - Disabled */
-	AZALIA_PIN_CFG(0, 0x18, 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
diff --git a/src/mainboard/google/beltino/variants/tricky/hda_verb.c b/src/mainboard/google/beltino/variants/tricky/hda_verb.c
index 19c7c62..c6b12f8 100644
--- a/src/mainboard/google/beltino/variants/tricky/hda_verb.c
+++ b/src/mainboard/google/beltino/variants/tricky/hda_verb.c
@@ -39,8 +39,11 @@
 	/* Pin Complex (NID 0x17) MONO Out - Disabled */
 	AZALIA_PIN_CFG(0, 0x17, 0x411111f0),
 
+	/* Pin Complex (NID 0x18) MIC1 PORTB - Disabled */
+	AZALIA_PIN_CFG(0, 0x18, 0x411111f0),
+
 	/*
-	 * Pin Complex (NID 0x18) MIC1 PORTB
+	 * Pin Complex (NID 0x19) MIC2 PORTF
 	 *  group 1, cap 1
 	 *  black, jack detect
 	 *  mic in, analog
@@ -48,14 +51,11 @@
 	 */
 	AZALIA_PIN_CFG(0, 0x19, 0x03a71011),
 
-	/* Pin Complex (NID 0x19) MIC2 PORTF - Disabled */
-	AZALIA_PIN_CFG(0, 0x18, 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
diff --git a/src/mainboard/google/beltino/variants/zako/hda_verb.c b/src/mainboard/google/beltino/variants/zako/hda_verb.c
index 19c7c62..c6b12f8 100644
--- a/src/mainboard/google/beltino/variants/zako/hda_verb.c
+++ b/src/mainboard/google/beltino/variants/zako/hda_verb.c
@@ -39,8 +39,11 @@
 	/* Pin Complex (NID 0x17) MONO Out - Disabled */
 	AZALIA_PIN_CFG(0, 0x17, 0x411111f0),
 
+	/* Pin Complex (NID 0x18) MIC1 PORTB - Disabled */
+	AZALIA_PIN_CFG(0, 0x18, 0x411111f0),
+
 	/*
-	 * Pin Complex (NID 0x18) MIC1 PORTB
+	 * Pin Complex (NID 0x19) MIC2 PORTF
 	 *  group 1, cap 1
 	 *  black, jack detect
 	 *  mic in, analog
@@ -48,14 +51,11 @@
 	 */
 	AZALIA_PIN_CFG(0, 0x19, 0x03a71011),
 
-	/* Pin Complex (NID 0x19) MIC2 PORTF - Disabled */
-	AZALIA_PIN_CFG(0, 0x18, 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

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