diff options
author | Jiri Kosina <jkosina@suse.cz> | 2015-04-13 21:43:34 (GMT) |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2015-04-13 21:43:34 (GMT) |
commit | 2e455c27bddbf8cf6d1039daea40de8e6865c453 (patch) | |
tree | 3fd892aeae61b105e3c5c979550aabf54109a656 /drivers/hid/Kconfig | |
parent | 05f6d02521d4c7a656c5135d6d81c345ce531ac0 (diff) | |
parent | b2eafd7282fdfd148fc09032540b0ff42bfedfbf (diff) | |
download | linux-2e455c27bddbf8cf6d1039daea40de8e6865c453.tar.xz |
Merge branch 'for-4.1/sensor-hub' into for-linus
Conflicts:
drivers/iio/common/hid-sensors/hid-sensor-trigger.c
include/linux/hid-sensor-hub.h
Diffstat (limited to 'drivers/hid/Kconfig')
-rw-r--r-- | drivers/hid/Kconfig | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index 1590106..15338af 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -878,6 +878,21 @@ config HID_SENSOR_HUB for events and handle data streams. Each sensor driver can format data and present to user mode using input or IIO interface. +config HID_SENSOR_CUSTOM_SENSOR + tristate "HID Sensors hub custom sensor support" + depends on HID_SENSOR_HUB + default n + ---help--- + HID Sensor hub specification allows definition of some custom and + generic sensors. Unlike other HID sensors, they can't be exported + via Linux IIO because of custom fields. This is up to the manufacturer + to decide how to interpret these special sensor ids and process in + the user space. Currently some manufacturers are using these ids for + sensor calibration and debugging other sensors. Manufacturers + should't use these special custom sensor ids to export any of the + standard sensors. + Select this config option for custom/generic sensor support. + endmenu endif # HID |