From d79c1c3983823f8a6b245b273b9421c6d4c501e5 Mon Sep 17 00:00:00 2001
From: Alex Stewart <Alexander.Stewart@consensuscorp.com>
Date: Fri, 21 Aug 2015 09:54:20 -0700
Subject: [PATCH] rename GPIO_CONF_DRIVER_ENABLE back to GPIO_CONF_PUSH_PULL

---
 core/include/esp/gpio.h      | 2 +-
 core/include/esp/gpio_regs.h | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/include/esp/gpio.h b/core/include/esp/gpio.h
index ab4b241..1f1ce14 100644
--- a/core/include/esp/gpio.h
+++ b/core/include/esp/gpio.h
@@ -36,7 +36,7 @@ INLINED void gpio_enable(const uint8_t gpio_num, const gpio_direction_t directio
         break;
     case GPIO_OUTPUT:
         iomux_flags = IOMUX_PIN_OUTPUT_ENABLE;
-        ctrl_val = GPIO_CONF_DRIVER_ENABLE;
+        ctrl_val = GPIO_CONF_PUSH_PULL;
         break;
     case GPIO_OUT_OPEN_DRAIN:
         iomux_flags = IOMUX_PIN_OUTPUT_ENABLE;
diff --git a/core/include/esp/gpio_regs.h b/core/include/esp/gpio_regs.h
index d2b0770..21e2c29 100644
--- a/core/include/esp/gpio_regs.h
+++ b/core/include/esp/gpio_regs.h
@@ -76,7 +76,7 @@ _Static_assert(sizeof(struct GPIO_REGS) == 0x74, "GPIO_REGS is the wrong size");
  *     Under what conditions this GPIO input should generate an interrupt.
  *     (see gpio_inttype_t enum below for values)
  *
- * GPIO_CONF_DRIVER_ENABLE (boolean)
+ * GPIO_CONF_PUSH_PULL (boolean)
  *     When set, a high output state will pull the pin up to +Vcc (3.3V).  When
  *     cleared, output functions in "open drain" mode (low state will pull down
  *     to ground, but high state allows output to "float").
@@ -91,9 +91,9 @@ _Static_assert(sizeof(struct GPIO_REGS) == 0x74, "GPIO_REGS is the wrong size");
 #define GPIO_CONF_CONFIG_M       0x00000003
 #define GPIO_CONF_CONFIG_S       11
 #define GPIO_CONF_WAKEUP_ENABLE  BIT(10)
-#define GPIO_CONF_INTTYPE_M     0x00000007
-#define GPIO_CONF_INTTYPE_S     7
-#define GPIO_CONF_DRIVER_ENABLE  BIT(2)
+#define GPIO_CONF_INTTYPE_M      0x00000007
+#define GPIO_CONF_INTTYPE_S      7
+#define GPIO_CONF_PUSH_PULL      BIT(2)
 #define GPIO_CONF_SOURCE_PWM     BIT(0)
 
 /* Valid values for the GPIO_CONF_INTTYPE field */