Skip to content

Commit fc3e44e

Browse files
committed
Merge tag 'iio-for-6.18a' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/jic23/iio into char-misc-next
Jonathan writes: IIO: New device support, features and cleanup for 6.18 New device support ================== ad,ade9000 - New driver for this complex energy and power monitoring ADC. infineon,tlv493d - New driver for this 3D magnetic sensor. intel,dollar - New driver for this TI PMIC (part number unknown) marvel,88pm886 - Driver for this PMIC ADC. microchip,mcp9600 - Add explicit support for the mcp9601 which has some additional features over the mcp9600. rohm,bd79112 - New driver for this ADC / GPIO Chip. Features ======== Core - New helper to multiply data expressed in IIO types. - Add KUnit tests. - New IIO_ALTCURRENT type, similar to existing IIO_ALTVOLTAGE - Add some channel modifiers related to energy and power, such as reactive. adi,ad7124 - Support external clocks sources and output of the internal clocks. - Filter control. adi,ad7173 - Add filter support. Some fiddly interactions with other parameters on this device. adi,ad7779 - Add backend support which required control of the number of lanes used. liteon,ltr390 - Add runtime PM support. microchip,mcp9600 - Add support for different thermocouple types. Cleanup and minor fixes ======================= core - Switch info_mask fields to be unsigned. Not clear why they were ever signed. - Fix handling of negative channel scale in iio_convert_raw_to_processed() - Fix offset handling for channels without a scale attribute. - Improve the precision of scaling slightly. - Drop apparent handling of IIO_CHAN_INFO_PROCESSED for devices that don't have any such channels. various - Drop many pm_runtime_mark_last_busy() calls now pm_runtime_put_autosuspend() calls it internally. - Drop dev_err_probe() calls where the error code is hard coded as -ENOMEM as they don't do anything. - Drop dev_err() calls where the error code is -ENOMEM. This will reduce error prints, but memory failures generate a lot of messages anyway so unlikely we need these prints. current-sense-amplifier - Add #io-channels property this channel to be used by a consumer driver. adi,ad7124 - Fix incorrect clocks dt-binding property. - Make the mclk clock optional in DT - this is internal to the ADC so should never have been in he binding. - Fix up sample rate to comply with ABI. - Use read_avail() callback rather than opencoding similar. - Deploy guard() to clean up some lock handling. adi,ad7768 - Use devm_regulator_get_enable_read_voltage() to replace similar code. adi,ad7816 - Drop an unnecessary dev_set_drvdata() call as nothing uses the data. ad,adxl345 - Fix missing blank line before bullet list in documentation. arm,scmi - Use devm_kcalloc() for an array allocation rather than devm_kzalloc(). bosch,bmi270 - Match an ACPI ID seen in the wild. It is not spec compliant but we can't do much about that. bosch,bmp280 - Drop overly noisy dev_info() - Allow for sleeping gpio controllers. gogle,cros-ec - Drop unused location attribute that has been replaced by label. invense,icm42600 - Simplify the power management. - Use guard() to simplify some locking. maxim,max1238 - Add io-channel-cells property to dt-binding as there is an in tree consumer. microchip,mcp9600 - Specify a default value in dt-binding for the thermocouple type - General whitespace cleanup. samsung,exynos - Drop support for the S3C2410 including bindings, and touchscreen support as nothing else uses that. - Drop platform ID based binding as not used. st,vl53l0x - Fix returning the wrong variable in an error path. ti,pac1934 - Replace open coded devm_mutex_init(). xilinx,ams - Update maintainers entry. * tag 'iio-for-6.18a' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/jic23/iio: (178 commits) MAINTAINERS: Support ROHM BD79112 ADC iio: adc: Support ROHM BD79112 ADC/GPIO dt-bindings: iio: adc: ROHM BD79112 ADC/GPIO iio: pressure: bmp280: Use gpiod_set_value_cansleep() iio: pressure: bmp280: Remove noisy dev_info() iio: ABI: add filter types for ad7173 iio: adc: ad7173: support changing filter type iio: adc: ad7173: rename odr field iio: adc: ad7173: rename ad7173_chan_spec_ext_info iio: adc: Add driver for Marvell 88PM886 PMIC ADC dt-bindings: mfd: 88pm886: Add #io-channel-cells iio: ABI: document "sinc4+rej60" filter_type iio: adc: ad7124: add filter support iio: adc: ad7124: support fractional sampling_frequency iio: adc: ad7124: use guard(mutex) to simplify return paths iio: adc: ad7124: use read_avail() for scale_available iio: adc: ad7124: use clamp() iio: adc: ad7124: fix sample rate for multi-channel use Documentation: ABI: iio: add sinc4+lp docs: iio: add documentation for ade9000 driver ...
2 parents cbcd30a + 561285d commit fc3e44e

File tree

243 files changed

+9187
-1859
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

243 files changed

+9187
-1859
lines changed

Documentation/ABI/testing/sysfs-bus-iio

Lines changed: 46 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,18 @@ Description:
167167
is required is a consistent labeling. Units after application
168168
of scale and offset are millivolts.
169169

170+
What: /sys/bus/iio/devices/iio:deviceX/in_altvoltageY_rms_raw
171+
KernelVersion: 6.18
172+
173+
Description:
174+
Raw (unscaled) Root Mean Square (RMS) voltage measurement from
175+
channel Y. Units after application of scale and offset are
176+
millivolts.
177+
170178
What: /sys/bus/iio/devices/iio:deviceX/in_powerY_raw
179+
What: /sys/bus/iio/devices/iio:deviceX/in_powerY_active_raw
180+
What: /sys/bus/iio/devices/iio:deviceX/in_powerY_reactive_raw
181+
What: /sys/bus/iio/devices/iio:deviceX/in_powerY_apparent_raw
171182
KernelVersion: 4.5
172183
173184
Description:
@@ -176,6 +187,13 @@ Description:
176187
unique to allow association with event codes. Units after
177188
application of scale and offset are milliwatts.
178189

190+
What: /sys/bus/iio/devices/iio:deviceX/in_powerY_powerfactor
191+
KernelVersion: 6.18
192+
193+
Description:
194+
Power factor measurement from channel Y. Power factor is the
195+
ratio of active power to apparent power. The value is unitless.
196+
179197
What: /sys/bus/iio/devices/iio:deviceX/in_capacitanceY_raw
180198
KernelVersion: 3.2
181199
@@ -1569,6 +1587,9 @@ Description:
15691587

15701588
What: /sys/.../iio:deviceX/in_energy_input
15711589
What: /sys/.../iio:deviceX/in_energy_raw
1590+
What: /sys/.../iio:deviceX/in_energyY_active_raw
1591+
What: /sys/.../iio:deviceX/in_energyY_reactive_raw
1592+
What: /sys/.../iio:deviceX/in_energyY_apparent_raw
15721593
KernelVersion: 4.0
15731594
15741595
Description:
@@ -1707,6 +1728,14 @@ Description:
17071728
component of the signal while the 'q' channel contains the quadrature
17081729
component.
17091730

1731+
What: /sys/bus/iio/devices/iio:deviceX/in_altcurrentY_rms_raw
1732+
KernelVersion: 6.18
1733+
1734+
Description:
1735+
Raw (unscaled no bias removal etc.) Root Mean Square (RMS) current
1736+
measurement from channel Y. Units after application of scale and
1737+
offset are milliamps.
1738+
17101739
What: /sys/.../iio:deviceX/in_energy_en
17111740
What: /sys/.../iio:deviceX/in_distance_en
17121741
What: /sys/.../iio:deviceX/in_velocity_sqrt(x^2+y^2+z^2)_en
@@ -2281,21 +2310,28 @@ Description:
22812310
conversion time. Poor noise performance.
22822311
* "sinc3" - The digital sinc3 filter. Moderate 1st
22832312
conversion time. Good noise performance.
2284-
* "sinc4" - Sinc 4. Excellent noise performance. Long
2285-
1st conversion time.
2286-
* "sinc5" - The digital sinc5 filter. Excellent noise
2287-
performance
2288-
* "sinc4+sinc1" - Sinc4 + averaging by 8. Low 1st conversion
2289-
time.
2290-
* "sinc3+rej60" - Sinc3 + 60Hz rejection.
2291-
* "sinc3+sinc1" - Sinc3 + averaging by 8. Low 1st conversion
2292-
time.
22932313
* "sinc3+pf1" - Sinc3 + device specific Post Filter 1.
22942314
* "sinc3+pf2" - Sinc3 + device specific Post Filter 2.
22952315
* "sinc3+pf3" - Sinc3 + device specific Post Filter 3.
22962316
* "sinc3+pf4" - Sinc3 + device specific Post Filter 4.
2297-
* "sinc5+pf1" - Sinc5 + device specific Post Filter 1.
2317+
* "sinc3+rej60" - Sinc3 + 60Hz rejection.
2318+
* "sinc3+sinc1" - Sinc3 + averaging by 8. Low 1st conversion
2319+
time.
2320+
* "sinc4" - Sinc 4. Excellent noise performance. Long
2321+
1st conversion time.
2322+
* "sinc4+lp" - Sinc4 + Low Pass Filter.
2323+
* "sinc4+sinc1" - Sinc4 + averaging by 8. Low 1st conversion
2324+
time.
2325+
* "sinc4+rej60" - Sinc4 + 60Hz rejection.
2326+
* "sinc5" - The digital sinc5 filter. Excellent noise
2327+
performance
22982328
* "sinc5+avg" - Sinc5 + averaging by 4.
2329+
* "sinc5+pf1" - Sinc5 + device specific Post Filter 1.
2330+
* "sinc5+sinc1" - Sinc5 + Sinc1.
2331+
* "sinc5+sinc1+pf1" - Sinc5 + Sinc1 + device specific Post Filter 1.
2332+
* "sinc5+sinc1+pf2" - Sinc5 + Sinc1 + device specific Post Filter 2.
2333+
* "sinc5+sinc1+pf3" - Sinc5 + Sinc1 + device specific Post Filter 3.
2334+
* "sinc5+sinc1+pf4" - Sinc5 + Sinc1 + device specific Post Filter 4.
22992335
* "wideband" - filter with wideband low ripple passband
23002336
and sharp transition band.
23012337

Documentation/ABI/testing/sysfs-bus-iio-cros-ec

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,6 @@ Description:
77
corresponding calibration offsets can be read from `*_calibbias`
88
entries.
99

10-
What: /sys/bus/iio/devices/iio:deviceX/location
11-
Date: July 2015
12-
KernelVersion: 4.7
13-
14-
Description:
15-
This attribute returns a string with the physical location where
16-
the motion sensor is placed. For example, in a laptop a motion
17-
sensor can be located on the base or on the lid. Current valid
18-
values are 'base' and 'lid'.
19-
2010
What: /sys/bus/iio/devices/iio:deviceX/id
2111
Date: September 2017
2212
KernelVersion: 4.14

Documentation/devicetree/bindings/iio/accel/adi,adis16240.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: ADIS16240 Programmable Impact Sensor and Recorder driver
88

99
maintainers:
10-
- Alexandru Tachici <[email protected]>
10+
- Marcelo Schmitt <[email protected]>
11+
- Nuno Sá <[email protected]>
1112

1213
description: |
1314
ADIS16240 Programmable Impact Sensor and Recorder driver that supports
@@ -37,7 +38,6 @@ unevaluatedProperties: false
3738

3839
examples:
3940
- |
40-
#include <dt-bindings/gpio/gpio.h>
4141
#include <dt-bindings/interrupt-controller/irq.h>
4242
spi {
4343
#address-cells = <1>;

Documentation/devicetree/bindings/iio/accel/adi,adxl313.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ unevaluatedProperties: false
5757

5858
examples:
5959
- |
60-
#include <dt-bindings/gpio/gpio.h>
6160
#include <dt-bindings/interrupt-controller/irq.h>
6261
i2c {
6362
#address-cells = <1>;
@@ -73,7 +72,6 @@ examples:
7372
};
7473
};
7574
- |
76-
#include <dt-bindings/gpio/gpio.h>
7775
#include <dt-bindings/interrupt-controller/irq.h>
7876
spi {
7977
#address-cells = <1>;

Documentation/devicetree/bindings/iio/accel/adi,adxl345.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ unevaluatedProperties: false
5656

5757
examples:
5858
- |
59-
#include <dt-bindings/gpio/gpio.h>
6059
#include <dt-bindings/interrupt-controller/irq.h>
6160
i2c {
6261
#address-cells = <1>;
@@ -72,7 +71,6 @@ examples:
7271
};
7372
};
7473
- |
75-
#include <dt-bindings/gpio/gpio.h>
7674
#include <dt-bindings/interrupt-controller/irq.h>
7775
spi {
7876
#address-cells = <1>;

Documentation/devicetree/bindings/iio/accel/adi,adxl355.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ unevaluatedProperties: false
5858

5959
examples:
6060
- |
61-
#include <dt-bindings/gpio/gpio.h>
6261
#include <dt-bindings/interrupt-controller/irq.h>
6362
i2c {
6463
#address-cells = <1>;
@@ -74,7 +73,6 @@ examples:
7473
};
7574
};
7675
- |
77-
#include <dt-bindings/gpio/gpio.h>
7876
#include <dt-bindings/interrupt-controller/irq.h>
7977
spi {
8078
#address-cells = <1>;

Documentation/devicetree/bindings/iio/accel/adi,adxl372.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Analog Devices ADXL372 3-Axis, +/-(200g) Digital Accelerometer
88

99
maintainers:
10-
- Stefan Popa <[email protected]>
10+
- Marcelo Schmitt <[email protected]>
11+
- Nuno Sá <[email protected]>
1112

1213
description: |
1314
Analog Devices ADXL372 3-Axis, +/-(200g) Digital Accelerometer that supports
@@ -37,7 +38,6 @@ unevaluatedProperties: false
3738

3839
examples:
3940
- |
40-
#include <dt-bindings/gpio/gpio.h>
4141
#include <dt-bindings/interrupt-controller/irq.h>
4242
i2c {
4343
#address-cells = <1>;
@@ -52,7 +52,6 @@ examples:
5252
};
5353
};
5454
- |
55-
#include <dt-bindings/gpio/gpio.h>
5655
#include <dt-bindings/interrupt-controller/irq.h>
5756
spi {
5857
#address-cells = <1>;

Documentation/devicetree/bindings/iio/accel/bosch,bma255.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ examples:
107107
};
108108
};
109109
- |
110-
# include <dt-bindings/interrupt-controller/irq.h>
111110
spi {
112111
#address-cells = <1>;
113112
#size-cells = <0>;

Documentation/devicetree/bindings/iio/accel/bosch,bma400.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ additionalProperties: false
4040

4141
examples:
4242
- |
43-
#include <dt-bindings/gpio/gpio.h>
4443
#include <dt-bindings/interrupt-controller/irq.h>
4544
i2c {
4645
#address-cells = <1>;

Documentation/devicetree/bindings/iio/accel/kionix,kxsd9.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ examples:
5757
};
5858
};
5959
- |
60-
# include <dt-bindings/interrupt-controller/irq.h>
6160
spi {
6261
#address-cells = <1>;
6362
#size-cells = <0>;

0 commit comments

Comments
 (0)