summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Kuo <tedkuo@ami.com.tw>2015-04-01 20:11:46 +0800
committerChromeOS Commit Bot <chromeos-commit-bot@chromium.org>2015-04-03 01:22:04 +0000
commit271bce5b76052be378faf2b913b7bcb9b152cfb8 (patch)
tree37f9a343b572166e25c852ba284c4b6505c12932
parentd0fa2e9644148d249d0bbe6a977af46f557c94c8 (diff)
downloadchrome-ec-271bce5b76052be378faf2b913b7bcb9b152cfb8.tar.gz
Ninja, Sumo: Implement recovery button
Enable recovery button function. BUG=chrome-os-partner:38707 TEST=make -j buildall, make -j tests BRANCH=None Signed-off-by: Ted Kuo <tedkuo@ami.com.tw> Change-Id: I0518f26722d3af0932d82c23c30d906799ab7348 Reviewed-on: https://chromium-review.googlesource.com/263384 Tested-by: Ted Kuo <tedkuo@ami.com.tw> Reviewed-by: Mohammed Habibulla <moch@chromium.org> Commit-Queue: Ted Kuo <tedkuo@ami.com.tw>
-rw-r--r--board/ninja/board.c2
-rw-r--r--board/ninja/board.h2
-rw-r--r--board/sumo/board.c2
-rw-r--r--board/sumo/board.h2
4 files changed, 8 insertions, 0 deletions
diff --git a/board/ninja/board.c b/board/ninja/board.c
index f0370e0490..8fa5ee0c61 100644
--- a/board/ninja/board.c
+++ b/board/ninja/board.c
@@ -57,6 +57,8 @@ const struct gpio_info gpio_list[] = {
power_signal_interrupt},
{"VCORE_PGOOD", LM4_GPIO_C, (1<<6), GPIO_INT_BOTH,
power_signal_interrupt},
+ {"RECOVERY_L", LM4_GPIO_A, (1<<5), GPIO_PULL_UP|GPIO_INT_BOTH,
+ switch_interrupt},
{"WP_L", LM4_GPIO_A, (1<<4), GPIO_INT_BOTH,
switch_interrupt},
{"JTAG_TCK", LM4_GPIO_C, (1<<0), GPIO_DEFAULT,
diff --git a/board/ninja/board.h b/board/ninja/board.h
index 02bbade16b..49afdf998d 100644
--- a/board/ninja/board.h
+++ b/board/ninja/board.h
@@ -29,6 +29,7 @@
#define CONFIG_PWM
#define CONFIG_PWM_DSLEEP
#define CONFIG_SCI_GPIO GPIO_PCH_SCI_L
+#define CONFIG_SWITCH_DEDICATED_RECOVERY
#define CONFIG_TEMP_SENSOR
#define CONFIG_TEMP_SENSOR_TMP432
#define CONFIG_USB_PORT_POWER_IN_S3
@@ -73,6 +74,7 @@ enum gpio_signal {
GPIO_PP5000_PGOOD, /* Power good on 5V */
GPIO_S5_PGOOD, /* Power good on S5 supplies */
GPIO_VCORE_PGOOD, /* Power good on core VR */
+ GPIO_RECOVERY_L, /* Recovery signal from servo */
GPIO_WP_L, /* Write protect input */
GPIO_JTAG_TCK, /* JTAG clock input */
GPIO_UART0_RX, /* UART0 RX input */
diff --git a/board/sumo/board.c b/board/sumo/board.c
index 5496f50c9d..455f5c1fa3 100644
--- a/board/sumo/board.c
+++ b/board/sumo/board.c
@@ -57,6 +57,8 @@ const struct gpio_info gpio_list[] = {
power_signal_interrupt},
{"VCORE_PGOOD", LM4_GPIO_C, (1<<6), GPIO_INT_BOTH,
power_signal_interrupt},
+ {"RECOVERY_L", LM4_GPIO_A, (1<<5), GPIO_PULL_UP|GPIO_INT_BOTH,
+ switch_interrupt},
{"WP_L", LM4_GPIO_A, (1<<4), GPIO_INT_BOTH,
switch_interrupt},
{"JTAG_TCK", LM4_GPIO_C, (1<<0), GPIO_DEFAULT,
diff --git a/board/sumo/board.h b/board/sumo/board.h
index bed57f0a3f..9071991087 100644
--- a/board/sumo/board.h
+++ b/board/sumo/board.h
@@ -29,6 +29,7 @@
#define CONFIG_PWM
#define CONFIG_PWM_DSLEEP
#define CONFIG_SCI_GPIO GPIO_PCH_SCI_L
+#define CONFIG_SWITCH_DEDICATED_RECOVERY
#define CONFIG_TEMP_SENSOR
#define CONFIG_TEMP_SENSOR_TMP432
#define CONFIG_USB_PORT_POWER_IN_S3
@@ -73,6 +74,7 @@ enum gpio_signal {
GPIO_PP5000_PGOOD, /* Power good on 5V */
GPIO_S5_PGOOD, /* Power good on S5 supplies */
GPIO_VCORE_PGOOD, /* Power good on core VR */
+ GPIO_RECOVERY_L, /* Recovery signal from servo */
GPIO_WP_L, /* Write protect input */
GPIO_JTAG_TCK, /* JTAG clock input */
GPIO_UART0_RX, /* UART0 RX input */