diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-05-23 10:40:06 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-05-23 10:40:06 +0200 |
commit | a3975dea1696b7c81319dc4b66e3c378dd47ccfb (patch) | |
tree | 32fa87e3c784959906568529ef227e3e0f8c705f /Documentation | |
parent | 1dfb74b1ea6d8e5977a9bdc0915f22934b33d8ea (diff) | |
parent | 13e945631c2ffb946c0af342812a3cd39227de6e (diff) | |
download | linux-stable-a3975dea1696b7c81319dc4b66e3c378dd47ccfb.tar.gz linux-stable-a3975dea1696b7c81319dc4b66e3c378dd47ccfb.tar.bz2 linux-stable-a3975dea1696b7c81319dc4b66e3c378dd47ccfb.zip |
Merge tag 'iio-for-5.8c' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next
Jonathan writes:
Third set of IIO new device support, cleanups etc for the 5.8 cycle.
A rather late final set to pick up a couple of new drivers, a bunch
of cleanup and some fixes that can wait for the merge window.
In particularly I'd like to highlight the great core and driver
cleanup work that the Alex and the team at Analog devices are currently
doing. Should see lots more of that in the next cycle give what is
currently under review.
This pull also has the first few fixes squashing a class of alignment
and small kernel data leak bugs that Lars-Peter Clausen picked up
on in a review. Quite a few more of those to come. They've been
there a long time so we aren't rushing the reviews.
New device support
* atlas ezo
- new driver supporting this range of chemical and similar sensors
with the odd interface of ascii strings over i2c.
* bma180
- bma023, bma150 and smb380 support. Note these are currently also
supported by a driver in input which we will hopefully remove
(eventually). There are Kconfig protections to avoid a clash
in the meantime.
* vcnl3020
- new driver for this proximity sensor.
Core change
* during buffer updates, change the current state variable before
we actually call pre and post enable callbacks so drivers can know
where we are going. Note this is a precursor to only exposing
one enable callback to drivers. The (false) logic behind having two
such callbacks has long been fixed, but only now is the mess getting
cleaned up.
Features
* exynos adc.
- add reporting of channels scale values.
Cleanups and minor fixes.
* core
- drop now unused attrcount_orig variable.
* ad5360, ad5446, ad5449, ad5755, ad5761, ad5764, ad5380, ad5421,
ad5592, ad5686 and vf610_dac
- remove direct use of iio_dev->mlock from all these drivers.
Its semantics used to be poorly defined, but now it is for core
use only. Removing it's use in drivers has been a long process
of which this is the latest step!
* exynos_adc
- drop a pointless check on the phy as the driver doesn't access it.
* ping
- avoid a dance from iio_priv and iio_priv_to_dev back again by
just passing the iio_dev into the functions.
* pms7003
- alignment and potential data leak fix.
* sps30
- alignment bug fix.
* tag 'iio-for-5.8c' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio: (31 commits)
iio:chemical:pms7003: Fix timestamp alignment and prevent data leak.
iio:chemical:sps30: Fix timestamp alignment
iio: adc: stm32-adc: fix a wrong error message when probing interrupts
iio: light: gp2ap002: Take runtime PM reference on light read
iio: proximity: ping: pass reference to IIO device as param to ping_read()
iio: dac: ad5592r-base: Replace indio_dev->mlock with own device lock
iio: proximity: Add driver support for vcnl3020 proximity sensor
dt-bindings: proximity: provide vcnl3020 device tree binding document
iio: buffer: remove attrcount_orig var from sysfs creation
iio: chemical: add atlas-ezo-sensor initial support
dt-bindings: iio: chemical: add CO2 EZO module documentation
iio: adc: exynos: Simplify Exynos7-specific init
iio: adc: Add scaling support to exynos adc driver
iio: __iio_update_buffers: Update mode before preenable/after postdisable
iio: dac: vf610_dac: Replace indio_dev->mlock with own device lock
iio: dac: ad5686: Replace indio_dev->mlock with own device lock
iio: dac: ad5421: Replace indio_dev->mlock with own device lock
iio: dac: ad5380: Replace indio_dev->mlock with own device lock
iio: dac: ad5764: Replace indio_dev->mlock with own device lock
iio: dac: ad5761: Replace indio_dev->mlock with own device lock
...
Diffstat (limited to 'Documentation')
3 files changed, 73 insertions, 3 deletions
diff --git a/Documentation/devicetree/bindings/iio/accel/bma180.txt b/Documentation/devicetree/bindings/iio/accel/bma180.txt index f53237270b32..33da4a6fdb39 100644 --- a/Documentation/devicetree/bindings/iio/accel/bma180.txt +++ b/Documentation/devicetree/bindings/iio/accel/bma180.txt @@ -1,15 +1,21 @@ -* Bosch BMA180 / BMA25x triaxial acceleration sensor +* Bosch BMA023 / BMA150/ BMA180 / BMA25x / SMB380 triaxial acceleration sensor +https://media.digikey.com/pdf/Data%20Sheets/Bosch/BMA150.pdf http://omapworld.com/BMA180_111_1002839.pdf http://ae-bst.resource.bosch.com/media/products/dokumente/bma250/bst-bma250-ds002-05.pdf Required properties: - compatible : should be one of: + "bosch,bma023" + "bosch,bma150" "bosch,bma180" "bosch,bma250" "bosch,bma254" + "bosch,smb380" - reg : the I2C address of the sensor + - vdd-supply : regulator phandle connected to the VDD pin + - vddio-supply : regulator phandle connected to the VDDIO pin Optional properties: diff --git a/Documentation/devicetree/bindings/iio/chemical/atlas,sensor.yaml b/Documentation/devicetree/bindings/iio/chemical/atlas,sensor.yaml index 0e510a52920d..69e8931e0ae8 100644 --- a/Documentation/devicetree/bindings/iio/chemical/atlas,sensor.yaml +++ b/Documentation/devicetree/bindings/iio/chemical/atlas,sensor.yaml @@ -4,13 +4,13 @@ $id: http://devicetree.org/schemas/iio/chemical/atlas,sensor.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# -title: Atlas Scientific OEM sensors +title: Atlas Scientific OEM + EZO sensors maintainers: - Matt Ranostay <matt.ranostay@konsulko.com> description: | - Atlas Scientific OEM sensors connected via I2C + Atlas Scientific OEM + EZO sensors connected via I2C Datasheets: http://www.atlas-scientific.com/_files/_datasheets/_oem/DO_oem_datasheet.pdf @@ -18,6 +18,7 @@ description: | http://www.atlas-scientific.com/_files/_datasheets/_oem/ORP_oem_datasheet.pdf http://www.atlas-scientific.com/_files/_datasheets/_oem/pH_oem_datasheet.pdf http://www.atlas-scientific.com/_files/_datasheets/_oem/RTD_oem_datasheet.pdf + http://www.atlas-scientific.com/_files/_datasheets/_probe/EZO_CO2_Datasheet.pdf properties: compatible: @@ -27,6 +28,7 @@ properties: - atlas,orp-sm - atlas,ph-sm - atlas,rtd-sm + - atlas,co2-ezo reg: maxItems: 1 diff --git a/Documentation/devicetree/bindings/iio/proximity/vishay,vcnl3020.yaml b/Documentation/devicetree/bindings/iio/proximity/vishay,vcnl3020.yaml new file mode 100644 index 000000000000..4190253336ec --- /dev/null +++ b/Documentation/devicetree/bindings/iio/proximity/vishay,vcnl3020.yaml @@ -0,0 +1,62 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/iio/proximity/vishay,vcnl3020.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Integrated Proximity Sensor With Infrared Emitter + +maintainers: + - Ivan Mikhaylov <i.mikhaylov@yadro.com> + +description: | + The VCNL3020 is a fully integrated proximity sensor. Fully integrated means + that the infrared emitter is included in the package. It has 16-bit + resolution. It includes a signal processing IC and features standard I2C + communication interface. It features an interrupt function. + + Specifications about the devices can be found at: + https://www.vishay.com/docs/84150/vcnl3020.pdf + +properties: + compatible: + enum: + - vishay,vcnl3020 + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + vdd-supply: + description: Regulator that provides power to the sensor + + vddio-supply: + description: Regulator that provides power to the bus + + vishay,led-current-microamp: + description: + The driver current for the LED used in proximity sensing. + enum: [0, 10000, 20000, 30000, 40000, 50000, 60000, 70000, 80000, 90000, + 100000, 110000, 120000, 130000, 140000, 150000, 160000, 170000, + 180000, 190000, 200000] + default: 20000 + +required: + - compatible + - reg + +examples: + - | + i2c { + + #address-cells = <1>; + #size-cells = <0>; + + proximity@13 { + compatible = "vishay,vcnl3020"; + reg = <0x13>; + vishay,led-current-microamp = <200000>; + }; + }; |