Merge pull request #8 from ndyer/maxtouch-v3.14

Merge upstream changes into maxtouch-v3.14
atmel-maxtouch · Jul 30, 2015 · 7137626 · 7137626
2 parents d263fc3 + 12936a0
commit 7137626
Show file tree

Hide file tree

Showing 3 changed files with 394 additions and 275 deletions.
diff --git a/Documentation/devicetree/bindings/input/atmel,maxtouch.txt b/Documentation/devicetree/bindings/input/atmel,maxtouch.txt
@@ -24,7 +24,7 @@ Optional properties for main touchpad device:
 
 - atmel,suspend-mode: Select method used to suspend:
     MXT_SUSPEND_DEEP_SLEEP - use T7 to suspend the device into deep sleep
-    MXT_SUSPEND_TOUCH_CTRL - use T9.CTRL to turn off touch processing
+    MXT_SUSPEND_T9_CTRL - use T9.CTRL to turn off touch processing
     Definitions are in <dt-bindings/input/atmel_mxt_ts.h>.
 
 - atmel,reset-gpio: Configure RESET GPIO. Required for regulator support.