summaryrefslogtreecommitdiff
path: root/src/mainboard
diff options
context:
space:
mode:
authorJimmy Zhang <jimmzhang@nvidia.com>2014-12-04 17:24:43 -0800
committerPatrick Georgi <pgeorgi@google.com>2015-04-13 16:43:41 +0200
commitc355826e21b87651d27c4359c9b26a2c48f663ea (patch)
tree5fd9777b4c3e432d1e955e0c4d44ef139b25d9e7 /src/mainboard
parent36fd82dfc4523adc08cce5d553b8ae8575e77ab5 (diff)
downloadcoreboot-c355826e21b87651d27c4359c9b26a2c48f663ea.tar.xz
rush: Add gpio config for PWR button and LID open switch
Due to CL https://chromium-review.googlesource.com/231250, depthcharge now detects gpio state based on gpio configurations done by coreboot instead of redoing configuration at depthcharge. However, PWR button and LID open pins have not been configured in coreboot. So, add the missing code here. Otherwise, TOT coreboot/depthcharge rush build can not load in kernel. BUG=chrome-os-partner:34336 BRANCH=none TEST=build rush and test with pwr button press and lid switch Change-Id: I7acc5e021fa769f68d4cbfd7202df325d4ea73c2 Signed-off-by: Stefan Reinauer <reinauer@chromium.org> Original-Commit-Id: a25dff24a2dcd33fcd15eb766432414af215c3ab Original-Change-Id: I6c322cd987967920f236aae653294db079678408 Original-Signed-off-by: Jimmy Zhang <jimmzhang@nvidia.com> Original-Reviewed-on: https://chromium-review.googlesource.com/233322 Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org> Reviewed-on: http://review.coreboot.org/9575 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'src/mainboard')
-rw-r--r--src/mainboard/google/rush/bootblock.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/mainboard/google/rush/bootblock.c b/src/mainboard/google/rush/bootblock.c
index eb61cddf8c..6680cbaaab 100644
--- a/src/mainboard/google/rush/bootblock.c
+++ b/src/mainboard/google/rush/bootblock.c
@@ -50,6 +50,12 @@ static const struct pad_config padcfgs[] = {
PAD_CFG_GPIO_INPUT(GPIO_X1_AUD, PINMUX_PULL_NONE),
PAD_CFG_GPIO_INPUT(KB_ROW17, PINMUX_PULL_NONE),
PAD_CFG_GPIO_INPUT(KB_COL3, PINMUX_PULL_NONE),
+
+ /* Power Button */
+ PAD_CFG_GPIO_INPUT(KB_COL0, PINMUX_PULL_NONE),
+
+ /* Lid Open Switch */
+ PAD_CFG_GPIO_INPUT(KB_ROW4, PINMUX_PULL_UP),
};
static const struct pad_config i2cpad[] = {