summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlec Berg <alecaberg@chromium.org>2014-07-24 15:47:38 -0700
committerchrome-internal-fetch <chrome-internal-fetch@google.com>2014-07-29 19:17:43 +0000
commitab8a50b84eb4240b64784cf881d2e83bf8487665 (patch)
tree533da213043cb97ca5a1a81a7c0cd834f5d74692
parentb466ab4c67b8582fc53c13388316829bbc0e4035 (diff)
downloadchrome-ec-ab8a50b84eb4240b64784cf881d2e83bf8487665.tar.gz
zinger: change behavior of pin PA0 for wakeup functionality
Zinger EVT units will have hardware change for PA0 to be able to wake up from standby. Part of the change is that we have to output high on PA0 in order for the comparator to compare against 0.65V, which is inverted from the previous version. BUG=chrome-os-partner:28335 BRANCH=none TEST=reworked a p2 zinger with PA0 changes, plugged into samus, and verified we still charge. Change-Id: I7344f1d1decddc4e6600e41c313e1e7a5a5de067 Signed-off-by: Alec Berg <alecaberg@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/209832 Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
-rw-r--r--board/zinger/hardware.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/board/zinger/hardware.c b/board/zinger/hardware.c
index cf0921c990..25b9b59569 100644
--- a/board/zinger/hardware.c
+++ b/board/zinger/hardware.c
@@ -65,7 +65,7 @@ static void power_init(void)
static void pins_init(void)
{
/* Pin usage:
- * PA0 (OUT - OD GPIO) : Wakeup on Vnc / Threshold
+ * PA0 (OUT - GPIO) : Wakeup on Vnc / Threshold
* PA1 (ANALOG - ADC_IN1) : CC sense
* PA2 (ANALOG - ADC_IN2) : Current sense
* PA3 (ANALOG - ADC_IN3) : Voltage sense
@@ -81,10 +81,10 @@ static void pins_init(void)
* PF0 (OUT - GPIO) : LM5050 FET driver off
* PF1 (OUT - GPIO) : discharge FET
*/
- STM32_GPIO_ODR(GPIO_A) = /* HIGH(0) | */ HIGH(4);
+ STM32_GPIO_ODR(GPIO_A) = HIGH(0) | HIGH(4);
STM32_GPIO_AFRL(GPIO_A) = AFx(7, 1);
STM32_GPIO_AFRH(GPIO_A) = AFx(9, 1) | AFx(10, 1);
- STM32_GPIO_OTYPER(GPIO_A) = ODR(0) | ODR(4);
+ STM32_GPIO_OTYPER(GPIO_A) = ODR(4);
STM32_GPIO_OSPEEDR(GPIO_A) = HISPEED(5) | HISPEED(6) | HISPEED(7);
STM32_GPIO_MODER(GPIO_A) = OUT(0) | ANALOG(1) | ANALOG(2) | ANALOG(3)
| OUT(4) | AF(5) /*| AF(6)*/ | AF(7) | AF(9)