diff options
| author | Randall Spangler <rspangler@chromium.org> | 2013-08-05 17:01:03 -0700 |
|---|---|---|
| committer | Dave Parker <dparker@chromium.org> | 2013-08-14 09:34:54 -0700 |
| commit | d32c95f187fd6af77b25dada5e2e881e8d202266 (patch) | |
| tree | 190e5fcf849b91dd12c4284d4c76b73ece7f8911 | |
| parent | 015f47901095c9da21c141c2c69db5e4f89c827a (diff) | |
| download | chrome-ec-d32c95f187fd6af77b25dada5e2e881e8d202266.tar.gz | |
CHERRY-PICK:stm32f: Don't glitch signal when setting GPIO_PULL_UP
It looks like a line of code was accidentally left in during
refactoring gpio_set_flags(). That line is equivalent to
gpio_set_level(signal, 0).
It's so far been harmless, because it's immediately followed by
gpio_set_level(signal, 1) - but it does mean the signal may glitch for
a few clocks at this point.
BUG=chrome-os-partner:21678
BRANCH=none (or Spring, but it seems to work fine even with this line)
TEST=boot Spring
Original-Change-Id: Id7a48e2c9bd543f2aa6a0b710faa5dd2b482fd84
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/64719
Conflicts:
chip/stm32/gpio-stm32f.c
Change-Id: I5ea1ea0c1dca26b5fbe8b2d7c0f034d8254f81ef
Reviewed-on: https://gerrit.chromium.org/gerrit/65842
Reviewed-by: Dave Parker <dparker@chromium.org>
Tested-by: Dave Parker <dparker@chromium.org>
| -rw-r--r-- | chip/stm32/gpio-stm32f.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chip/stm32/gpio-stm32f.c b/chip/stm32/gpio-stm32f.c index 3cea027188..0917bd5349 100644 --- a/chip/stm32/gpio-stm32f.c +++ b/chip/stm32/gpio-stm32f.c @@ -79,7 +79,7 @@ void gpio_set_flags_by_mask(uint32_t port, uint32_t pmask, uint32_t flags) */ if (flags & GPIO_PULL_UP) { mask |= 0x88888888 & cnf; - STM32_GPIO_BSRR(g->port) |= g->mask; + STM32_GPIO_BSRR(port) = pmask; } else if (flags & GPIO_PULL_DOWN) { mask |= 0x88888888 & cnf; STM32_GPIO_BSRR(port) = pmask << 16; |