Merge remote-tracking branch 'jc_docs/docs-next'

[karo-tx-linux.git] / Documentation / input / event-codes.txt

diff --git a/Documentation/input/event-codes.txt b/Documentation/input/event-codes.txt
index d92eae36b43ab5d904ea9907ee3c6b6cd1606546..3f0f5ce3338b63a8153410c9b08edba739989e22 100644 (file)
--- a/Documentation/input/event-codes.txt
+++ b/Documentation/input/event-codes.txt
@@ -294,6 +294,12 @@ accordingly. This property does not affect kernel behavior.
 The kernel does not provide button emulation for such devices but treats
 them as any other INPUT_PROP_BUTTONPAD device.
 
+INPUT_PROP_ACCELEROMETER
+-------------------------
+Directional axes on this device (absolute and/or relative x, y, z) represent
+accelerometer data. All other axes retain their meaning. A device must not mix
+regular directional axes and accelerometer axes on the same event node.
+
 Guidelines:
 ==========
 The guidelines below ensure proper single-touch and multi-finger functionality.