summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Roth <martinroth@google.com>2017-10-10 10:34:48 -0600
committerMartin Roth <martinroth@google.com>2017-10-11 17:53:09 +0000
commit6754e4ea2008f67c0630fdac976456649a5ac95a (patch)
tree3be8ac23a26309982dd4aba96128130264a4aee6
parent0c8237aa0de9bd2c4a062b11f1f5dea414c2a845 (diff)
mainboard/google/kahlee: Add EC_IN_RW flag
Depthcharge was complaining that the GPIO for this flag wasn't set. The GPIO also needs to be an input, not an output. BUG=b:67614692 TEST=Depthcharge no longer complains that there is no GPIO set for flag5. The system boots again. Change-Id: Ib854e97b0a3aa42a95ceb8a42a9776f0345ff8b1 Signed-off-by: Martin Roth <martinroth@google.com> Reviewed-on: https://review.coreboot.org/21936 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Aaron Durbin <adurbin@chromium.org> Reviewed-by: Marc Jones <marc@marcjonesconsulting.com>
-rw-r--r--src/mainboard/google/kahlee/chromeos.c4
-rw-r--r--src/mainboard/google/kahlee/gpio.c3
2 files changed, 5 insertions, 2 deletions
diff --git a/src/mainboard/google/kahlee/chromeos.c b/src/mainboard/google/kahlee/chromeos.c
index 4c152ba0e5..55130741d7 100644
--- a/src/mainboard/google/kahlee/chromeos.c
+++ b/src/mainboard/google/kahlee/chromeos.c
@@ -22,6 +22,7 @@
/* SPI Write protect */
#define CROS_WP_GPIO GPIO_142
+#define GPIO_EC_IN_RW GPIO_15
void fill_lb_gpios(struct lb_gpios *gpios)
{
@@ -30,6 +31,9 @@ void fill_lb_gpios(struct lb_gpios *gpios)
{-1, ACTIVE_HIGH, get_recovery_mode_switch(), "recovery"},
{-1, ACTIVE_HIGH, get_lid_switch(), "lid"},
{-1, ACTIVE_HIGH, 0, "power"},
+ {GPIO_EC_IN_RW, ACTIVE_HIGH, gpio_get(GPIO_EC_IN_RW),
+ "EC in RW"},
+
};
lb_add_gpios(gpios, chromeos_gpios, ARRAY_SIZE(chromeos_gpios));
}
diff --git a/src/mainboard/google/kahlee/gpio.c b/src/mainboard/google/kahlee/gpio.c
index b815ac3d6b..f586c355f1 100644
--- a/src/mainboard/google/kahlee/gpio.c
+++ b/src/mainboard/google/kahlee/gpio.c
@@ -37,8 +37,7 @@ const GPIO_CONTROL oem_kahlee_gpio[] = {
| FCH_GPIO_OUTPUT_ENABLE},
/* EC_IN_RW */
- {15, Function1, FCH_GPIO_PULL_UP_ENABLE | FCH_GPIO_OUTPUT_VALUE
- | FCH_GPIO_OUTPUT_ENABLE},
+ {15, Function1, FCH_GPIO_PULL_UP_ENABLE },
/* APU_I2C_3_SCL */
{19, Function1, FCH_GPIO_PULL_UP_ENABLE },