diff options
| author | Duncan Laurie <dlaurie@chromium.org> | 2014-09-06 06:51:20 -0700 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2014-09-08 23:07:54 +0000 |
| commit | 3e8a7187c81686c47b627eccc2c905b68b9589c3 (patch) | |
| tree | 50e88a9cd4ee795a15ffe06bd8cec98eb4d3a3e2 | |
| parent | b550e7cbb406da519348e483291e31bfddbf5ba7 (diff) | |
| download | chrome-ec-3e8a7187c81686c47b627eccc2c905b68b9589c3.tar.gz | |
samus: RECOVERY_L pin is changed to PD_IN_RW
This GPIO was reassigned and needs to be reflected properly. Since
it no longer exists we must also disable CONFIG_SWITCH_DEDICATED_RECOVERY
so it is not sampled to determine recovery state.
BUG=chrome-os-partner:31833
BRANCH=None
TEST=boot on samus EVT in non-recovery mode
Change-Id: I6e3b19956e4c8075a3f5cd4ec7e16bea934b1e98
Signed-off-by: Duncan Laurie <dlaurie@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/216940
Reviewed-by: Alec Berg <alecaberg@chromium.org>
| -rw-r--r-- | board/samus/board.h | 1 | ||||
| -rw-r--r-- | board/samus/gpio.inc | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/board/samus/board.h b/board/samus/board.h index 74d3003ab9..2be11c4186 100644 --- a/board/samus/board.h +++ b/board/samus/board.h @@ -50,7 +50,6 @@ #define CONFIG_PECI_TJMAX 100 #define CONFIG_PWM #define CONFIG_PWM_KBLIGHT -#define CONFIG_SWITCH_DEDICATED_RECOVERY #define CONFIG_TEMP_SENSOR #define CONFIG_TEMP_SENSOR_TMP006 #define CONFIG_TEMP_SENSOR_POWER_GPIO GPIO_PP3300_DSW_GATED_EN diff --git a/board/samus/gpio.inc b/board/samus/gpio.inc index d090943f30..28bbb436c4 100644 --- a/board/samus/gpio.inc +++ b/board/samus/gpio.inc @@ -18,7 +18,6 @@ GPIO(PP1050_PGOOD, H, 4, GPIO_INT_BOTH, power_signal_int GPIO(PP1200_PGOOD, H, 6, GPIO_INT_BOTH, power_signal_interrupt) /* Power good on 1.2V (DRAM) */ GPIO(PP1800_PGOOD, L, 7, GPIO_INT_BOTH, power_signal_interrupt) /* Power good on 1.8V (DRAM) */ GPIO(VCORE_PGOOD, C, 6, GPIO_INT_BOTH, power_signal_interrupt) /* Power good on core VR */ -GPIO(RECOVERY_L, A, 5, GPIO_PULL_UP | GPIO_INT_BOTH, switch_interrupt) /* Recovery signal from servo */ GPIO(WP_L, A, 4, GPIO_INT_BOTH, switch_interrupt) /* Write protect input */ GPIO(PCH_BL_EN, M, 3, GPIO_INT_RISING, backlight_interrupt) /* PCH backlight input */ GPIO(JTAG_TCK, C, 0, GPIO_DEFAULT, jtag_interrupt) /* JTAG clock input */ @@ -46,6 +45,7 @@ GPIO(USB1_OC_L, E, 7, GPIO_INPUT, NULL) /* USB port overcurrent warning */ GPIO(USB1_STATUS_L, E, 6, GPIO_INPUT, NULL) /* USB charger port 1 status output */ GPIO(USB2_OC_L, E, 0, GPIO_INPUT, NULL) /* USB port overcurrent warning */ GPIO(USB2_STATUS_L, D, 7, GPIO_INPUT, NULL) /* USB charger port 2 status output */ +GPIO(PD_IN_RW, A, 5, GPIO_INPUT, NULL) /* PD is in RW */ /* Outputs; all unasserted by default except for reset signals */ GPIO(CPU_PROCHOT, B, 1, GPIO_OUT_LOW, NULL) /* Force CPU to think it's overheated */ |