Commit 9dc86c23 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'iio-for-5.5a-take3' of... 

Merge tag 'iio-for-5.5a-take3' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next

Jonathan writes:

First set of IIO new device support, cleanups and features for the 5.5 cycle

Third version with the adis rework set dropped as better to just have
a fresh version of that at some future date.

The usual mixed backs of new device support being added to drivers,
long term reworks continuing and little per driver cleanups and
features.

Also a few trivial counter subsystem tidy ups on behalf of William.

Core new feature
* Device label support.  A long requested feature no one got around to
  implementing before.  Allows DT based provision of a 'label' that
  identifies a device uniquely within a system.  This differs from existing
  'name' which is meant to be the part number.
New device support
* ingenic-adc
  - Support for the JZ4770 SoC ADC including bindings.
* inv_mpu6050
  - Add support for magnetometer in MPU925x parts.
    Fiddly to do as this is actually a separate device sitting inside the
    package, but with the master device being able to schedule reads etc.
    Will only run if the auxiliary bus is not in use for any other devices.

Features
* ad7192
  - Userspace calibration controls to do zero and full scale.
* st_lsm6dsx
  - Enable latched interrupts by default for sensors events with related clear.
  - Motion events and related wakeup source.  This needed quite a bit of
    refactoring as well.

Cleanups and minor features
* ad7192
  - sysfs ABI docs
* ad7949
  - Remove code to readback configuration word as driver never actually enabled
    it.
  - Fix incorrect xfer length.  Not actually known to cause problems other
    than wasted bus usage.
* adis16080
  - Replace core mlock usage with local lock with more appropriate scope.
* adis16130
  - Remove pointless mlock usage.
* adis16240
  - Remove include of gpio.h as no gpio usage.
* atlas-ph-sensor
  - Improve logical ordering of buffer predisable / postenable functions.
    This is part of a longer term rework Alexandru is driving towards.
* bh1750
  - Fix up a static compiler warning and make the code more readable.
  - yaml conversion of binding + MAINTAINERS entry.
* bmp280
  - Drop a stray newline.
* cm36651
  - Drop a redundant assignment
* itg3200
  - Alignment cleanup.
* max31856
  - Add missing of_node and parent references, useful to identify the device.
* sc27xx_adc
  - Use devm_hwspin_lock_request_specific rather than local rolled version.
* stm32-lptimer counter
  - kernel-doc warning.
* stm32-timer counter
  - kernel-doc warning.
  - Alignment cleanup.
* sx9500
  - Improve logical ordering of buffer predisable / postenable functions.
    This is part of a longer term rework Alexandru is driving towards.
* tcs3414
  - Improve logical ordering of buffer predisable / postenable functions.
    This is part of a longer term rework Alexandru is driving towards.

* tag 'iio-for-5.5a-take3' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio: (41 commits)
  iio: pressure: bmp280: remove stray newline
  iio: adc: sc27xx: Use devm_hwspin_lock_request_specific() to simplify code
  iio: chemical: atlas-ph-sensor: fix iio_triggered_buffer_predisable() position
  iio: gyro: clean up indentation issue
  counter: stm32: clean up indentation issue
  iio: proximity: sx9500: fix iio_triggered_buffer_{predisable,postenable} positions
  iio: core: Add optional symbolic label to device attributes
  dt-binding: iio: Add optional label property
  iio: gyro: adis16080: replace mlock with own lock
  counter: stm32-lptimer-cnt: fix a kernel-doc warning
  counter: stm32-timer-cnt: fix a kernel-doc warning
  iio: gyro: adis16130: remove mlock usage
  MAINTAINERS: add entry for ROHM BH1750 driver
  dt-bindings: iio: light: bh1750: convert bindings to yaml
  iio: imu: st_lsm6dsx: add motion report function and call from interrupt
  iio: imu: st_lsm6dsx: always enter interrupt thread
  iio: imu: st_lsm6dsx: add wakeup-source option
  iio: imu: st_lsm6dsx: add motion events
  iio: imu: st_lsm6dsx: move interrupt thread to core
  iio: imu: inv_mpu6050: add fifo support for magnetometer data
  ...
parents c86673e8 a521d52d

Documentation/ABI/testing/sysfs-bus-iio-adc-ad7192

0 → 100644
+39 −0
Original line number Diff line number Diff line 
What:		/sys/bus/iio/devices/iio:deviceX/ac_excitation_en

KernelVersion:

Contact:	linux-iio@vger.kernel.org

Description:

		Reading gives the state of AC excitation.

		Writing '1' enables AC excitation.



What:		/sys/bus/iio/devices/iio:deviceX/bridge_switch_en

KernelVersion:

Contact:	linux-iio@vger.kernel.org

Description:

		This bridge switch is used to disconnect it when there is a

		need to minimize the system current consumption.

		Reading gives the state of the bridge switch.

		Writing '1' enables the bridge switch.



What:		/sys/bus/iio/devices/iio:deviceX/in_voltagex_sys_calibration

KernelVersion:

Contact:	linux-iio@vger.kernel.org

Description:

		Initiates the system calibration procedure. This is done on a

		single channel at a time. Write '1' to start the calibration.



What:		/sys/bus/iio/devices/iio:deviceX/in_voltagex_sys_calibration_mode_available

KernelVersion:

Contact:	linux-iio@vger.kernel.org

Description:

		Reading returns a list with the possible calibration modes.

		There are two available options:

		"zero_scale" - calibrate to zero scale

		"full_scale" - calibrate to full scale



What:		/sys/bus/iio/devices/iio:deviceX/in_voltagex_sys_calibration_mode

KernelVersion:

Contact:	linux-iio@vger.kernel.org

Description:

		Sets up the calibration mode used in the system calibration

		procedure. Reading returns the current calibration mode.

		Writing sets the system calibration mode.

Documentation/devicetree/bindings/iio/adc/ingenic,adc.txt

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ Required properties: 
- compatible: Should be one of:

  * ingenic,jz4725b-adc

  * ingenic,jz4740-adc

  * ingenic,jz4770-adc

- reg: ADC controller registers location and length.

- clocks: phandle to the SoC's ADC clock.

- clock-names: Must be set to "adc".

Documentation/devicetree/bindings/iio/iio-bindings.txt

+5 −0
Original line number Diff line number Diff line
@@ -18,12 +18,17 @@ Required properties: 
		   with a single IIO output and 1 for nodes with multiple

		   IIO outputs.



Optional properties:

label:		   A symbolic name for the device.





Example for a simple configuration with no trigger:



	adc: voltage-sensor@35 {

		compatible = "maxim,max1139";

		reg = <0x35>;

		#io-channel-cells = <1>;

		label = "voltage_feedback_group1";

	};



Example for a configuration with trigger:

Documentation/devicetree/bindings/iio/light/bh1750.txt

deleted100644 → 0
+0 −18
Original line number Diff line number Diff line 
ROHM BH1750 - ALS, Ambient light sensor



Required properties:



- compatible: Must be one of:

    "rohm,bh1710"

    "rohm,bh1715"

    "rohm,bh1721"

    "rohm,bh1750"

    "rohm,bh1751"

- reg: the I2C address of the sensor



Example:



light-sensor@23 {

	compatible = "rohm,bh1750";

	reg = <0x23>;

};

Documentation/devicetree/bindings/iio/light/bh1750.yaml

0 → 100644
+43 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

%YAML 1.2

---

$id: http://devicetree.org/schemas/iio/light/bh1750.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: ROHM BH1750 ambient light sensor



maintainers:

  - Tomasz Duszynski <tduszyns@gmail.com>



description: |

  Ambient light sensor with an i2c interface.



properties:

  compatible:

    enum:

      - rohm,bh1710

      - rohm,bh1715

      - rohm,bh1721

      - rohm,bh1750

      - rohm,bh1751



  reg:

    maxItems: 1



required:

  - compatible

  - reg



examples:

  - |

    i2c {

      #address-cells = <1>;

      #size-cells = <0>;



      light-sensor@23 {

        compatible = "rohm,bh1750";

        reg = <0x23>;

      };

    };



...

CRA Git | Maintained and supported by SUSTech CRA and CCSE