Merge remote-tracking branch 'percpu/for-next'

[karo-tx-linux.git] / Documentation / devicetree / bindings / input / ads7846.txt

diff --git a/Documentation/devicetree/bindings/input/ads7846.txt b/Documentation/devicetree/bindings/input/ads7846.txt
index df8b1279491d1ffd34e41cc41088f918511400de..33a1638b61d6bb950b45f0b14ceccaf7ff58eb19 100644 (file)
--- a/Documentation/devicetree/bindings/input/ads7846.txt
+++ b/Documentation/devicetree/bindings/input/ads7846.txt
@@ -65,6 +65,7 @@ Optional properties:
        pendown-gpio                    GPIO handle describing the pin the !PENIRQ
                                        line is connected to.
        wakeup-source                   use any event on touchscreen as wakeup event.
+                                       (Legacy property support: "linux,wakeup")
 
 
 Example for a TSC2046 chip connected to an McSPI controller of an OMAP SoC::
@@ -86,6 +87,6 @@ Example for a TSC2046 chip connected to an McSPI controller of an OMAP SoC::
                        ti,x-plate-ohms = /bits/ 16 <40>;
                        ti,pressure-max = /bits/ 16 <255>;
 
-                       linux,wakeup;
+                       wakeup-source;
                };
        };