summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mainboard/google/glados/acpi/chromeos.asl10
-rw-r--r--src/mainboard/google/glados/chromeos.c28
2 files changed, 31 insertions, 7 deletions
diff --git a/src/mainboard/google/glados/acpi/chromeos.asl b/src/mainboard/google/glados/acpi/chromeos.asl
index 8edbff3509..09f7ed1de4 100644
--- a/src/mainboard/google/glados/acpi/chromeos.asl
+++ b/src/mainboard/google/glados/acpi/chromeos.asl
@@ -17,7 +17,11 @@
* Foundation, Inc.
*/
-Name (OIPG, Package() {
- Package () { 0x0001, 0, 0xFFFFFFFF, "INT344B:00" }, // no recovery button
- Package () { 0x0003, 1, 71, "INT344B:00" }, // firmware write protect
+#include <soc/gpio.h>
+
+Name (OIPG, Package () {
+ /* No physical recovery GPIO. */
+ Package () { 0x0001, 0, 0xFFFFFFFF, "INT344B:00" },
+ /* Firmware write protect GPIO. */
+ Package () { 0x0003, 1, GPP_C23, "INT344B:00" },
})
diff --git a/src/mainboard/google/glados/chromeos.c b/src/mainboard/google/glados/chromeos.c
index 70d78e0743..f7a8770dbd 100644
--- a/src/mainboard/google/glados/chromeos.c
+++ b/src/mainboard/google/glados/chromeos.c
@@ -23,10 +23,14 @@
#include <device/device.h>
#include <device/pci.h>
#include <rules.h>
+#include <gpio.h>
#include <soc/gpio.h>
#include <string.h>
+#include <ec/google/chromeec/ec.h>
#include <vendorcode/google/chromeos/chromeos.h>
+#include "ec.h"
+
#if ENV_RAMSTAGE
#include <boot/coreboot_tables.h>
@@ -55,20 +59,36 @@ void fill_lb_gpios(struct lb_gpios *gpios)
int get_lid_switch(void)
{
- return 1;
+ /* Read lid switch state from the EC. */
+ return !!(google_chromeec_get_switches() & EC_SWITCH_LID_OPEN);
}
-/* The dev-switch is virtual */
+
int get_developer_mode_switch(void)
{
+ /* No physical developer mode switch. */
return 0;
}
int get_recovery_mode_switch(void)
{
- return 0;
+ /* Check for dedicated recovery switch first. */
+ if (google_chromeec_get_switches() & EC_SWITCH_DEDICATED_RECOVERY)
+ return 1;
+
+ /* Otherwise check if the EC has posted the keyboard recovery event. */
+ return !!(google_chromeec_get_events_b() &
+ EC_HOST_EVENT_MASK(EC_HOST_EVENT_KEYBOARD_RECOVERY));
+}
+
+int clear_recovery_mode_switch(void)
+{
+ /* Clear keyboard recovery event. */
+ return google_chromeec_clear_events_b(
+ EC_HOST_EVENT_MASK(EC_HOST_EVENT_KEYBOARD_RECOVERY));
}
int get_write_protect_state(void)
{
- return 0;
+ /* Read PCH_WP GPIO. */
+ return gpio_get(GPP_C23);
}