You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ac...@apache.org on 2020/09/29 12:07:50 UTC
[incubator-nuttx] branch master updated: Revert
"arch/xtensa/src/esp32/esp32_gpio.c: Enable input mode only when"
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new 70c1170 Revert "arch/xtensa/src/esp32/esp32_gpio.c: Enable input mode only when"
70c1170 is described below
commit 70c1170c2e844635a1aad86745aab7f398e98791
Author: Abdelatif Guettouche <ab...@espressif.com>
AuthorDate: Tue Sep 29 09:12:11 2020 +0100
Revert "arch/xtensa/src/esp32/esp32_gpio.c: Enable input mode only when"
This reverts commit b5d3ba64e01aace8a64006b3393a69eaabffcb00.
---
arch/xtensa/src/esp32/esp32_gpio.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/xtensa/src/esp32/esp32_gpio.c b/arch/xtensa/src/esp32/esp32_gpio.c
index 14b7454..cb994cc 100644
--- a/arch/xtensa/src/esp32/esp32_gpio.c
+++ b/arch/xtensa/src/esp32/esp32_gpio.c
@@ -172,10 +172,6 @@ int esp32_configgpio(int pin, gpio_pinattr_t attr)
if ((attr & INPUT) != 0)
{
- /* Enable input mode in the IO_MUX. */
-
- func |= FUN_IE;
-
if (pin < 32)
{
putreg32((1ul << pin), GPIO_ENABLE_W1TC_REG);
@@ -213,6 +209,10 @@ int esp32_configgpio(int pin, gpio_pinattr_t attr)
func |= (uint32_t)(2ul << FUN_DRV_S);
+ /* Input enable... Required for output as well? */
+
+ func |= FUN_IE;
+
pinmode = (attr & PINMODE_MASK);
if (pinmode == INPUT || pinmode == OUTPUT)
{