[coreboot-gerrit] New patch to review for coreboot: google/oak: da9212 gpio configuration for rev5

[Patrick Georgi (pgeorgi@google.com)]

Patrick Georgi (pgeorgi at google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/13972

-gerrit

commit f805baf6403fea561658c21690bbbaeb8f1d65be
Author: henryc.chen <henryc.chen at mediatek.com>
Date:   Wed Dec 23 11:45:29 2015 +0800

    google/oak: da9212 gpio configuration for rev5
    
    BRANCH=none
    BUG=none
    TEST=none
    
    Change-Id: Ib44a9e8ca94727809e47831228f4742c25a53977
    Signed-off-by: Patrick Georgi <pgeorgi at chromium.org>
    Original-Commit-Id: da9185c22264440da822aa252c0c5d2aef78b455
    Original-Change-Id: I98c2ad757d0cd0e3234e49392091784b43a106e7
    Original-Signed-off-by: henryc.chen <henryc.chen at mediatek.com>
    Original-Reviewed-on: https://chromium-review.googlesource.com/320028
    Original-Commit-Ready: Yidi Lin <yidi.lin at mediatek.com>
    Original-Tested-by: Yidi Lin <yidi.lin at mediatek.com>
    Original-Reviewed-by: Julius Werner <jwerner at chromium.org>
---
 src/mainboard/google/oak/mainboard.c | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/mainboard/google/oak/mainboard.c b/src/mainboard/google/oak/mainboard.c
index c330fac..b09703e 100644
--- a/src/mainboard/google/oak/mainboard.c
+++ b/src/mainboard/google/oak/mainboard.c
@@ -40,9 +40,9 @@ static void register_da9212_to_bl31(void)
 		},
 		.i2c_bus = 1,
 		.ic_en = {
-			.type = PARAM_GPIO_SOC,
+			.type = PARAM_GPIO_MT6391,
 			.polarity = PARAM_GPIO_ACTIVE_HIGH,
-			.index = PAD_UCTS2,
+			.index = MT6391_KP_ROW3,
 		},
 		.en_a = {
 			.type = PARAM_GPIO_MT6391,
@@ -53,6 +53,10 @@ static void register_da9212_to_bl31(void)
 			.type = PARAM_GPIO_NONE,
 		},
 	};
+	if (board_id() == 2) {
+		param_da9212.ic_en.type = PARAM_GPIO_SOC;
+		param_da9212.ic_en.index = PAD_UCTS2;
+	}
 	register_bl31_param(&param_da9212.h);
 
 	/* Init i2c bus Timing register for da9212 */
@@ -79,13 +83,16 @@ static void register_mt6311_to_bl31(void)
 static void configure_bl31(void)
 {
 	switch (board_id()) {
-	case 2:
-		register_da9212_to_bl31();
-		break;
-	default:
+	case 3:
+	case 4:
 		/* rev-3 and rev-4 use mt6311 as external buck */
 		register_mt6311_to_bl31();
 		break;
+	case 2:
+	default:
+		/* rev-2 and rev-5 use da9212 as external buck */
+		register_da9212_to_bl31();
+		break;
 	}
 }