diff --git a/drivers/input/stmpe811_gpio.c b/drivers/input/stmpe811_gpio.c
index 907c250deb..c4a18095c7 100644
--- a/drivers/input/stmpe811_gpio.c
+++ b/drivers/input/stmpe811_gpio.c
@@ -172,22 +172,29 @@ int stmpe811_gpioconfig(STMPE811_HANDLE handle, uint8_t pinconfig)
     {
       /* The pin is an output */
 
-      regval  = stmpe811_getreg8(priv, STMPE811_GPIO_DIR);
-      regval &= ~pinmask;
-      stmpe811_putreg8(priv, STMPE811_GPIO_DIR, regval);
+      regval  = stmpe811_getreg8(priv, STMPE811_GPIO_DIR_REG);
+      regval |= pinmask;
+      stmpe811_putreg8(priv, STMPE811_GPIO_DIR_REG, regval);
 
       /* Set its initial output value */
-
-      stmpe811_gpiowrite(handle, pinconfig,
-                        (pinconfig & STMPE811_GPIO_VALUE) != STMPE811_GPIO_ZERO);
+      if ((pinconfig & STMPE811_GPIO_VALUE) != STMPE811_GPIO_ZERO)
+        {
+          /* Set the output valu(s)e by writing to the SET register */
+          stmpe811_putreg8(priv, STMPE811_GPIO_SETPIN, (1 << pin));
+        }
+      else
+        {
+          /* Clear the output value(s) by writing to the CLR register */
+          stmpe811_putreg8(priv, STMPE811_GPIO_CLRPIN, (1 << pin));
+        }
     }
   else
     {
       /* It is an input */
 
-      regval  = stmpe811_getreg8(priv, STMPE811_GPIO_DIR);
-      regval |= pinmask;
-      stmpe811_putreg8(priv, STMPE811_GPIO_DIR, regval);
+      regval  = stmpe811_getreg8(priv, STMPE811_GPIO_DIR_REG);
+      regval &= ~pinmask;
+      stmpe811_putreg8(priv, STMPE811_GPIO_DIR_REG, regval);
 
       /* Set up the falling edge detection */
 
diff --git a/include/nuttx/input/stmpe811.h b/include/nuttx/input/stmpe811.h
index 861377e81e..9e0b98ada7 100644
--- a/include/nuttx/input/stmpe811.h
+++ b/include/nuttx/input/stmpe811.h
@@ -190,7 +190,7 @@
 #define STMPE811_GPIO_SETPIN         0x10  /* GPIO set pin register */
 #define STMPE811_GPIO_CLRPIN         0x11  /* GPIO clear pin register */
 #define STMPE811_GPIO_MPSTA          0x12  /* GPIO monitor pin state register */
-#define STMPE811_GPIO_DIR            0x13  /* GPIO direction register */
+#define STMPE811_GPIO_DIR_REG        0x13  /* GPIO direction register */
 #define STMPE811_GPIO_ED             0x14  /* GPIO edge detect register */
 #define STMPE811_GPIO_RE             0x15  /* GPIO rising edge register */
 #define STMPE811_GPIO_FE             0x16  /* GPIO falling edge register */