Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 800f3eef authored May 02, 2017 by Jiri Kosina

Merge branch 'for-4.12/sony' into for-linus

parents 18fc2163 040fc001

Documentation/input/event-codes.txt

+4 −1

Original line number	Diff line number	Diff line
		@@ -301,7 +301,10 @@ 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
		accelerometer data. Some devices also report gyroscope data, which devices
		can report through the rotational axes (absolute and/or relative rx, ry, rz).

		All other axes retain their meaning. A device must not mix
		regular directional axes and accelerometer axes on the same event node.

		Guidelines:

drivers/hid/hid-sony.c

+864 −810

File changed.

Preview size limit exceeded, changes collapsed.

include/uapi/linux/input.h

+8 −3

Original line number	Diff line number	Diff line
		@@ -61,9 +61,14 @@ struct input_id {
		* Note that input core does not clamp reported values to the
		* [minimum, maximum] limits, such task is left to userspace.
		*
		* Resolution for main axes (ABS_X, ABS_Y, ABS_Z) is reported in
		* units per millimeter (units/mm), resolution for rotational axes
		* (ABS_RX, ABS_RY, ABS_RZ) is reported in units per radian.
		* The default resolution for main axes (ABS_X, ABS_Y, ABS_Z)
		* is reported in units per millimeter (units/mm), resolution
		* for rotational axes (ABS_RX, ABS_RY, ABS_RZ) is reported
		* in units per radian.
		* When INPUT_PROP_ACCELEROMETER is set the resolution changes.
		* The main axes (ABS_X, ABS_Y, ABS_Z) are then reported in
		* in units per g (units/g) and in units per degree per second
		* (units/deg/s) for rotational axes (ABS_RX, ABS_RY, ABS_RZ).
		*/
		struct input_absinfo {
		__s32 value;