aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2012-11-20 08:36:00 -0500
committerJonathan Cameron <jic23@kernel.org>2012-11-20 16:26:38 -0500
commitc4f0c6936762ecd6b453275611a785dfdee0d417 (patch)
treedda78d1d4c27ca0144185cc2316556ca1551ed74
parent484a0bf091c93c379e6524a17bb037c33c898e01 (diff)
iio: Add pressure channel type
This patch adds support for a new IIO channel type for pressure measurements. This can for example be used for barometric pressure sensors. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
-rw-r--r--Documentation/ABI/testing/sysfs-bus-iio24
-rw-r--r--drivers/iio/industrialio-core.c1
-rw-r--r--include/linux/iio/types.h1
3 files changed, 26 insertions, 0 deletions
diff --git a/Documentation/ABI/testing/sysfs-bus-iio b/Documentation/ABI/testing/sysfs-bus-iio
index 2f06d40fe07d..2e33dc6b2346 100644
--- a/Documentation/ABI/testing/sysfs-bus-iio
+++ b/Documentation/ABI/testing/sysfs-bus-iio
@@ -189,6 +189,14 @@ Description:
189 A computed peak value based on the sum squared magnitude of 189 A computed peak value based on the sum squared magnitude of
190 the underlying value in the specified directions. 190 the underlying value in the specified directions.
191 191
192What: /sys/bus/iio/devices/iio:deviceX/in_pressureY_raw
193What: /sys/bus/iio/devices/iio:deviceX/in_pressure_raw
194KernelVersion: 3.8
195Contact: linux-iio@vger.kernel.org
196Description:
197 Raw pressure measurement from channel Y. Units after
198 application of scale and offset are kilopascal.
199
192What: /sys/bus/iio/devices/iio:deviceX/in_accel_offset 200What: /sys/bus/iio/devices/iio:deviceX/in_accel_offset
193What: /sys/bus/iio/devices/iio:deviceX/in_accel_x_offset 201What: /sys/bus/iio/devices/iio:deviceX/in_accel_x_offset
194What: /sys/bus/iio/devices/iio:deviceX/in_accel_y_offset 202What: /sys/bus/iio/devices/iio:deviceX/in_accel_y_offset
@@ -197,6 +205,8 @@ What: /sys/bus/iio/devices/iio:deviceX/in_voltageY_offset
197What: /sys/bus/iio/devices/iio:deviceX/in_voltage_offset 205What: /sys/bus/iio/devices/iio:deviceX/in_voltage_offset
198What: /sys/bus/iio/devices/iio:deviceX/in_tempY_offset 206What: /sys/bus/iio/devices/iio:deviceX/in_tempY_offset
199What: /sys/bus/iio/devices/iio:deviceX/in_temp_offset 207What: /sys/bus/iio/devices/iio:deviceX/in_temp_offset
208What: /sys/bus/iio/devices/iio:deviceX/in_pressureY_offset
209What: /sys/bus/iio/devices/iio:deviceX/in_pressure_offset
200KernelVersion: 2.6.35 210KernelVersion: 2.6.35
201Contact: linux-iio@vger.kernel.org 211Contact: linux-iio@vger.kernel.org
202Description: 212Description:
@@ -226,6 +236,8 @@ What: /sys/bus/iio/devices/iio:deviceX/in_magn_scale
226What: /sys/bus/iio/devices/iio:deviceX/in_magn_x_scale 236What: /sys/bus/iio/devices/iio:deviceX/in_magn_x_scale
227What: /sys/bus/iio/devices/iio:deviceX/in_magn_y_scale 237What: /sys/bus/iio/devices/iio:deviceX/in_magn_y_scale
228What: /sys/bus/iio/devices/iio:deviceX/in_magn_z_scale 238What: /sys/bus/iio/devices/iio:deviceX/in_magn_z_scale
239What: /sys/bus/iio/devices/iio:deviceX/in_pressureY_scale
240What: /sys/bus/iio/devices/iio:deviceX/in_pressure_scale
229KernelVersion: 2.6.35 241KernelVersion: 2.6.35
230Contact: linux-iio@vger.kernel.org 242Contact: linux-iio@vger.kernel.org
231Description: 243Description:
@@ -245,6 +257,8 @@ What: /sys/bus/iio/devices/iio:deviceX/in_anglvel_y_calibbias
245What: /sys/bus/iio/devices/iio:deviceX/in_anglvel_z_calibbias 257What: /sys/bus/iio/devices/iio:deviceX/in_anglvel_z_calibbias
246What: /sys/bus/iio/devices/iio:deviceX/in_illuminance0_calibbias 258What: /sys/bus/iio/devices/iio:deviceX/in_illuminance0_calibbias
247What: /sys/bus/iio/devices/iio:deviceX/in_proximity0_calibbias 259What: /sys/bus/iio/devices/iio:deviceX/in_proximity0_calibbias
260What: /sys/bus/iio/devices/iio:deviceX/in_pressureY_calibbias
261What: /sys/bus/iio/devices/iio:deviceX/in_pressure_calibbias
248KernelVersion: 2.6.35 262KernelVersion: 2.6.35
249Contact: linux-iio@vger.kernel.org 263Contact: linux-iio@vger.kernel.org
250Description: 264Description:
@@ -262,6 +276,8 @@ What /sys/bus/iio/devices/iio:deviceX/in_anglvel_y_calibscale
262What /sys/bus/iio/devices/iio:deviceX/in_anglvel_z_calibscale 276What /sys/bus/iio/devices/iio:deviceX/in_anglvel_z_calibscale
263what /sys/bus/iio/devices/iio:deviceX/in_illuminance0_calibscale 277what /sys/bus/iio/devices/iio:deviceX/in_illuminance0_calibscale
264what /sys/bus/iio/devices/iio:deviceX/in_proximity0_calibscale 278what /sys/bus/iio/devices/iio:deviceX/in_proximity0_calibscale
279What: /sys/bus/iio/devices/iio:deviceX/in_pressureY_calibscale
280What: /sys/bus/iio/devices/iio:deviceX/in_pressure_calibscale
265KernelVersion: 2.6.35 281KernelVersion: 2.6.35
266Contact: linux-iio@vger.kernel.org 282Contact: linux-iio@vger.kernel.org
267Description: 283Description:
@@ -275,6 +291,8 @@ What: /sys/.../iio:deviceX/in_voltage-voltage_scale_available
275What: /sys/.../iio:deviceX/out_voltageX_scale_available 291What: /sys/.../iio:deviceX/out_voltageX_scale_available
276What: /sys/.../iio:deviceX/out_altvoltageX_scale_available 292What: /sys/.../iio:deviceX/out_altvoltageX_scale_available
277What: /sys/.../iio:deviceX/in_capacitance_scale_available 293What: /sys/.../iio:deviceX/in_capacitance_scale_available
294What: /sys/.../iio:deviceX/in_pressure_scale_available
295What: /sys/.../iio:deviceX/in_pressureY_scale_available
278KernelVersion: 2.6.35 296KernelVersion: 2.6.35
279Contact: linux-iio@vger.kernel.org 297Contact: linux-iio@vger.kernel.org
280Description: 298Description:
@@ -694,6 +712,8 @@ What: /sys/.../buffer/scan_elements/in_voltageY_en
694What: /sys/.../buffer/scan_elements/in_voltageY-voltageZ_en 712What: /sys/.../buffer/scan_elements/in_voltageY-voltageZ_en
695What: /sys/.../buffer/scan_elements/in_incli_x_en 713What: /sys/.../buffer/scan_elements/in_incli_x_en
696What: /sys/.../buffer/scan_elements/in_incli_y_en 714What: /sys/.../buffer/scan_elements/in_incli_y_en
715What: /sys/.../buffer/scan_elements/in_pressureY_en
716What: /sys/.../buffer/scan_elements/in_pressure_en
697KernelVersion: 2.6.37 717KernelVersion: 2.6.37
698Contact: linux-iio@vger.kernel.org 718Contact: linux-iio@vger.kernel.org
699Description: 719Description:
@@ -707,6 +727,8 @@ What: /sys/.../buffer/scan_elements/in_voltageY_type
707What: /sys/.../buffer/scan_elements/in_voltage_type 727What: /sys/.../buffer/scan_elements/in_voltage_type
708What: /sys/.../buffer/scan_elements/in_voltageY_supply_type 728What: /sys/.../buffer/scan_elements/in_voltageY_supply_type
709What: /sys/.../buffer/scan_elements/in_timestamp_type 729What: /sys/.../buffer/scan_elements/in_timestamp_type
730What: /sys/.../buffer/scan_elements/in_pressureY_type
731What: /sys/.../buffer/scan_elements/in_pressure_type
710KernelVersion: 2.6.37 732KernelVersion: 2.6.37
711Contact: linux-iio@vger.kernel.org 733Contact: linux-iio@vger.kernel.org
712Description: 734Description:
@@ -751,6 +773,8 @@ What: /sys/.../buffer/scan_elements/in_magn_z_index
751What: /sys/.../buffer/scan_elements/in_incli_x_index 773What: /sys/.../buffer/scan_elements/in_incli_x_index
752What: /sys/.../buffer/scan_elements/in_incli_y_index 774What: /sys/.../buffer/scan_elements/in_incli_y_index
753What: /sys/.../buffer/scan_elements/in_timestamp_index 775What: /sys/.../buffer/scan_elements/in_timestamp_index
776What: /sys/.../buffer/scan_elements/in_pressureY_index
777What: /sys/.../buffer/scan_elements/in_pressure_index
754KernelVersion: 2.6.37 778KernelVersion: 2.6.37
755Contact: linux-iio@vger.kernel.org 779Contact: linux-iio@vger.kernel.org
756Description: 780Description:
diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
index 060a4045be85..3dccd6c3a889 100644
--- a/drivers/iio/industrialio-core.c
+++ b/drivers/iio/industrialio-core.c
@@ -65,6 +65,7 @@ static const char * const iio_chan_type_name_spec[] = {
65 [IIO_CAPACITANCE] = "capacitance", 65 [IIO_CAPACITANCE] = "capacitance",
66 [IIO_ALTVOLTAGE] = "altvoltage", 66 [IIO_ALTVOLTAGE] = "altvoltage",
67 [IIO_CCT] = "cct", 67 [IIO_CCT] = "cct",
68 [IIO_PRESSURE] = "pressure",
68}; 69};
69 70
70static const char * const iio_modifier_names[] = { 71static const char * const iio_modifier_names[] = {
diff --git a/include/linux/iio/types.h b/include/linux/iio/types.h
index 87b196a2d698..88bf0f0d27b4 100644
--- a/include/linux/iio/types.h
+++ b/include/linux/iio/types.h
@@ -28,6 +28,7 @@ enum iio_chan_type {
28 IIO_CAPACITANCE, 28 IIO_CAPACITANCE,
29 IIO_ALTVOLTAGE, 29 IIO_ALTVOLTAGE,
30 IIO_CCT, 30 IIO_CCT,
31 IIO_PRESSURE,
31}; 32};
32 33
33enum iio_modifier { 34enum iio_modifier {