2 files changed, 10 insertions, 1 deletions

diff --git a/drivers/mfd/stmpe.c b/drivers/mfd/stmpe.c
index 4a91f6771fb8..9fa2dd6d38bd 100644
--- a/drivers/mfd/stmpe.c
+++ b/drivers/mfd/stmpe.c
@@ -605,9 +605,18 @@ static int stmpe1601_enable(struct stmpe *stmpe, unsigned int blocks,
 
         if (blocks & STMPE_BLOCK_GPIO)
                 mask |= STMPE1601_SYS_CTRL_ENABLE_GPIO;
+        else
+                mask &= ~STMPE1601_SYS_CTRL_ENABLE_GPIO;
 
         if (blocks & STMPE_BLOCK_KEYPAD)
                 mask |= STMPE1601_SYS_CTRL_ENABLE_KPC;
+        else
+                mask &= ~STMPE1601_SYS_CTRL_ENABLE_KPC;
+
+        if (blocks & STMPE_BLOCK_PWM)
+                mask |= STMPE1601_SYS_CTRL_ENABLE_SPWM;
+        else
+                mask &= ~STMPE1601_SYS_CTRL_ENABLE_SPWM;
 
         return __stmpe_set_bits(stmpe, STMPE1601_REG_SYS_CTRL, mask,
                                 enable ? mask : 0);
diff --git a/drivers/mfd/stmpe.h b/drivers/mfd/stmpe.h
index 6639f1b0fef5..9e4d21d37a11 100644
--- a/drivers/mfd/stmpe.h
+++ b/drivers/mfd/stmpe.h
@@ -192,7 +192,7 @@ int stmpe_remove(struct stmpe *stmpe);
 
 #define STMPE1601_SYS_CTRL_ENABLE_GPIO          (1 << 3)
 #define STMPE1601_SYS_CTRL_ENABLE_KPC           (1 << 1)
-#define STMPE1601_SYSCON_ENABLE_SPWM            (1 << 0)
+#define STMPE1601_SYS_CTRL_ENABLE_SPWM          (1 << 0)
 
 /* The 1601/2403 share the same masks */
 #define STMPE1601_AUTOSLEEP_TIMEOUT_MASK        (0x7)