commit 70b3044e4565de6885d09c7c3050aebe3411303d
author henryc.chen <henryc.chen@mediatek.com> Wed Dec 23 11:45:29 2015 +0800
committer Patrick Georgi <pgeorgi@google.com> Sat Mar 12 09:08:45 2016 +0100
tree 9652dfbbaea9d4b35e6d4c56c492a34a11f6368f
parent 0443ecc5b2816e9a45ecd3403b88dc02a09c0556

google/oak: da9212 gpio configuration for rev5

BRANCH=none
BUG=none
TEST=none

Change-Id: Ib44a9e8ca94727809e47831228f4742c25a53977
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: da9185c22264440da822aa252c0c5d2aef78b455
Original-Change-Id: I98c2ad757d0cd0e3234e49392091784b43a106e7
Original-Signed-off-by: henryc.chen <henryc.chen@mediatek.com>
Original-Reviewed-on: https://chromium-review.googlesource.com/320028
Original-Commit-Ready: Yidi Lin <yidi.lin@mediatek.com>
Original-Tested-by: Yidi Lin <yidi.lin@mediatek.com>
Original-Reviewed-by: Julius Werner <jwerner@chromium.org>
Reviewed-on: https://review.coreboot.org/13972
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>

src/mainboard/google/oak/mainboard.c

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 @@
 		},
 		.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 @@
 			.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 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;
 	}
 }