summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Boichat <drinkcat@google.com>2017-01-14 17:54:29 +0800
committerchrome-bot <chrome-bot@chromium.org>2017-01-20 00:05:06 -0800
commit78b9a4877932540bc0ab56456eaf121d5b0a6b37 (patch)
tree53da280e636c8c8dc6e3d893369f25bf24d0bebe
parent90ae18655c01e880563add1c761193316a633034 (diff)
downloadchrome-ec-78b9a4877932540bc0ab56456eaf121d5b0a6b37.tar.gz
poppy: Add support for recovery mode
poppy enters recovery mode by pressing volume up+down keys BRANCH=none BUG=chrome-os-partner:61930 TEST=Press Power+Volume Up+Volume Down, poppy enters recovery Change-Id: I052277a3107b2133bdec46b1219cfc6ff6c54680 Reviewed-on: https://chromium-review.googlesource.com/428531 Commit-Ready: Nicolas Boichat <drinkcat@chromium.org> Tested-by: Nicolas Boichat <drinkcat@chromium.org> Reviewed-by: Shawn N <shawnn@chromium.org>
-rw-r--r--board/poppy/board.c8
-rw-r--r--board/poppy/board.h7
2 files changed, 11 insertions, 4 deletions
diff --git a/board/poppy/board.c b/board/poppy/board.c
index 70219d8e10..3cb71e8af8 100644
--- a/board/poppy/board.c
+++ b/board/poppy/board.c
@@ -283,10 +283,10 @@ struct als_t als[] = {
BUILD_ASSERT(ARRAY_SIZE(als) == ALS_COUNT);
const struct button_config buttons[CONFIG_BUTTON_COUNT] = {
- {"Volume Down", KEYBOARD_BUTTON_VOLUME_DOWN, GPIO_VOLUME_DOWN_L,
- 30 * MSEC, 0},
- {"Volume Up", KEYBOARD_BUTTON_VOLUME_UP, GPIO_VOLUME_UP_L,
- 30 * MSEC, 0},
+ [BUTTON_VOLUME_DOWN] = {"Volume Down", KEYBOARD_BUTTON_VOLUME_DOWN,
+ GPIO_VOLUME_DOWN_L, 30 * MSEC, 0},
+ [BUTTON_VOLUME_UP] = {"Volume Up", KEYBOARD_BUTTON_VOLUME_UP,
+ GPIO_VOLUME_UP_L, 30 * MSEC, 0},
};
static void board_pmic_init(void)
diff --git a/board/poppy/board.h b/board/poppy/board.h
index 599695d6b4..7388e0ec53 100644
--- a/board/poppy/board.h
+++ b/board/poppy/board.h
@@ -18,6 +18,7 @@
#define CONFIG_ADC
#define CONFIG_BOARD_VERSION
#define CONFIG_BUTTON_COUNT 2
+#define CONFIG_BUTTON_RECOVERY
#define CONFIG_CASE_CLOSED_DEBUG_EXTERNAL
#define CONFIG_DPTF
#define CONFIG_FLASH_SIZE 0x80000
@@ -215,6 +216,12 @@ enum adc_channel {
ADC_CH_COUNT
};
+enum button {
+ BUTTON_VOLUME_DOWN = 0,
+ BUTTON_VOLUME_UP = 1,
+ BUTTON_COUNT
+};
+
/* start as a sink in case we have no other power supply/battery */
#define PD_DEFAULT_STATE PD_STATE_SNK_DISCONNECTED