Commit 332037d4 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'iio-for-5.11b-take2' of... 

Merge tag 'iio-for-5.11b-take2' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next

Jonathan writes:

2nd set of IIO device support, features, cleanups and yaml conversions for 5.11

v2: Fix some missing Sign offs from me that Greg found in v1.

Includes low priority/late breaking/long standing bug fixes.

Note this includes the last few patches that were listed in the description
for the previous pull request but weren't actually in the PULL.

New devices support
* bosch,bmc150-accel
  - Support for BMA222, including adding binding doc that was previously
    missing.
* st,lsm6dsx
  - Support LSM6DSOP accelerometer + gyroscope sensor.

yaml-conversions by manufacturer
* core
  - adc
  - iio-binding (drop as now in dt-schema)
  - temperature (drop as not clear it is generic)
* generic (no specific manufacturer)
  - dpot-dac
  - current-sense-amplifier
  - current-sense-shunt
  - envelope-detector
  - voltage-divider
* adi,ad5592r adi,ad7124 adi,ad7292 adi,adf4350
* atmel,sama9260-adc
* bosch,bma180 bosch,bmg180
* brcm,iproc-static-adc
* capella,cm3605
* fsl,mma8452
* kionix,kxcjk1013
* maxim,max1027 (from trivial)
* mediatek,mt2701-auxdac
* microchip,mcp4531 (from trivial)
* qcom,pm8018-adc qcom,spi-iadc
* st,st-sensors
* ti,ads124s08 ti,afe4403 ti,afe4404 ti,lmp91000 ti,palmas-gpadc

Features
* bosch,bmc150
  - Handle unusual ACPI binding where two devices are provided in a single
    ACPI device (BOSC0200).
  - ACPI based mount matrix handling
* st,hts221
  - regulator control
* st,lsm6dsx
  - regulator control

Cleanup + minor fixes
* core
  - Reduce duplication in iio_format_avail_{list,range}() and iio_format_list()
  - Fix an issue in the demux update code that could lead to misaligned data.
    Possible no existing driver hits this. Been there a very long time with
    no bug reports.
  - Improve iio_map_array_register() error handling.
  - Avoid polling driver again if try_reenable() callback returns non 0.
    Only users of this were bugs so also drop the return value.
* core/cb_buffer
  - Return an error if no callback provided (include adding a dummy for one
    unusual case where no callback is valid).
* trigger/hrtimer-trig, sysfs-trig
  - Fix an issue seen with PREEMPT_RT by marking irq_work as expiring in hard
    interrupt context.
* adi,ad_sigma_delta library
  - Avoid putting SPI transfer buffers on stack for DMA safety reasons
* adi,ad5272
  - Fix discrepancy in polarity of reset line between binding documentation
    (which was right) and driver.
* adi,ad7298
  - Use devm for all of probe
* atmel,at91_adc
  - Drop at91_adc_ids as only support DT probe
  - Simplify resolution selection and bindings
  - Drop binding for triggers and move into driver based on compatible.
  - Merge at91_adc_probe_dt() into main at91_adc_probe()
* bosch,bmc150
  - Drop unused structure member.
* bosch,bmi160
  - Fix overly long buffer due to wrong channel count.
  - Fix potential buffer alignment into iio_push_to_buffers_with_timestamp()
* fsl,mag3110
  - Fix potential buffer alignment into iio_push_to_buffers_with_timestamp()
* fsl,mpl3115
  - Fix potential buffer alignment into iio_push_to_buffers_with_timestamp()
* invn,mpu3050
  - Use 64 bit local variable and FIELD_GET to simplify code that extracts
    values from OTP.
* qcom,spmi-vadc
  - Drop wrong use of io-channel-ranges in binding doc.
* rockchip,saradc
  - Fix a missing clk_disable_unprepare() in an error path.
* rohm,rpr0521
  - Fix potential buffer alignment into iio_push_to_buffers_with_timestamp()
* samsung,exynos-adc
  - Drop wrong use of io-channel-ranges in binding doc.
* st,lsm6dsx
  - Reduce duplication in the chip model specific tables.
  - Fix an issue with missed edge-interrupts that can occur when using
    the FIFO.
* st,uvis21
  - Fix potential buffer alignment into iio_push_to_buffers_with_timestamp()
* ti,adc084s021
  - Tidy up endian types to clear a warning.
* ti,ads124s08
  - Fix too long a buffer.
  - Fix potential buffer alignment into iio_push_to_buffers_with_timestamp()

Counter
* microchip,tcb-counter
  - Add Kamel Bouhara to MAINTAINERS
  - Fix CMR value check

* tag 'iio-for-5.11b-take2' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio: (80 commits)
  iio: adc: rockchip_saradc: fix missing clk_disable_unprepare() on error in rockchip_saradc_resume
  iio: imu: st_lsm6dsx: fix edge-trigger interrupts
  counter: microchip-tcb-capture: Fix CMR value check
  iio: sysfs-trigger: Mark irq_work to expire in hardirq context
  iio: hrtimer-trigger: Mark hrtimer to expire in hard interrupt context
  iio: accel: bmc150: Get mount-matrix from ACPI
  iio: accel: bmc150: Check for a second ACPI device for BOSC0200
  iio: accel: bmc150: Removed unused bmc150_accel_dat irq member
  iio:gyro:mpu3050 Treat otp value as a __le64 and use FIELD_GET() to break up
  iio:adc:ti-ads124s08: Fix alignment and data leak issues.
  iio:adc:ti-ads124s08: Fix buffer being too long.
  iio:pressure:mpl3115: Force alignment of buffer
  iio:imu:bmi160: Fix alignment and data leak issues
  iio:imu:bmi160: Fix too large a buffer.
  iio:magnetometer:mag3110: Fix alignment and data leak issues.
  iio:light:st_uvis25: Fix timestamp alignment and prevent data leak.
  iio:light:rpr0521: Fix timestamp alignment and prevent data leak.
  iio:adc:ti-adc084s021 Tidy up endian types
  iio:trigger: rename try_reenable() to reenable() plus return void
  iio: Fix: Do not poll the driver again if try_reenable() callback returns non 0.
  ...
parents 1de16e38 560c6b91

Documentation/devicetree/bindings/iio/accel/bma180.txt

deleted100644 → 0
+0 −35
Original line number Diff line number Diff line 
* 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:



  - interrupts : interrupt mapping for GPIO IRQ, it should by configured with

		flags IRQ_TYPE_LEVEL_HIGH | IRQ_TYPE_EDGE_RISING

		For the bma250 the first interrupt listed must be the one

		connected to the INT1 pin, the second (optional) interrupt

		listed must be the one connected to the INT2 pin.



Example:



bma180@40 {

	compatible = "bosch,bma180";

	reg = <0x40>;

	interrupt-parent = <&gpio6>;

	interrupts = <18 (IRQ_TYPE_LEVEL_HIGH | IRQ_TYPE_EDGE_RISING)>;

};

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

0 → 100644
+62 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/iio/accel/bosch,bma180.yaml#

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



title: Bosch BMA023 / BMA150/ BMA180 / BMA25x / SMB380 triaxial accelerometers



maintainers:

  - Jonathan Cameron <jic23@kernel.org>



description: |

  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



properties:

  compatible:

    enum:

      - bosch,bma023

      - bosch,bma150

      - bosch,bma180

      - bosch,bma250

      - bosch,bma254

      - bosch,smb380



  reg:

    maxItems: 1



  vdd-supply: true



  vddio-supply: true



  interrupts:

    minItems: 1

    maxItems: 2

    description: |

      Type should be either IRQ_TYPE_LEVEL_HIGH or IRQ_TYPE_EDGE_RISING.

      For the bma250 the first interrupt listed must be the one

      connected to the INT1 pin, the second (optional) interrupt

      listed must be the one connected to the INT2 pin.



required:

  - compatible

  - reg



additionalProperties: false



examples:

  - |

    #include <dt-bindings/interrupt-controller/irq.h>

    i2c {

        #address-cells = <1>;

        #size-cells = <0>;

        accel@40 {

            compatible = "bosch,bma180";

            reg = <0x40>;

            interrupt-parent = <&gpio6>;

            interrupts = <18 (IRQ_TYPE_LEVEL_HIGH | IRQ_TYPE_EDGE_RISING)>;

        };

    };

...

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

0 → 100644
+73 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/iio/accel/bosch,bma255.yaml#

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



title: Bosch BMA255 and Similar Accelerometers



maintainers:

  - Linus Walleij <linus.walleij@linaro.org>



description:

  3 axis accelerometers with varying range and I2C or SPI

  4-wire interface.



properties:

  compatible:

    enum:

      - bosch,bmc150

      - bosch,bmi055

      - bosch,bma255

      - bosch,bma250e

      - bosch,bma222

      - bosch,bma222e

      - bosch,bma280



  reg:

    maxItems: 1



  vdd-supply: true

  vddio-supply: true



  interrupts:

    maxItems: 1



  mount-matrix:

    description: an optional 3x3 mounting rotation matrix.



  spi-max-frequency:

    maximum: 10000000



required:

  - compatible

  - reg



additionalProperties: false



examples:

  - |

    #include <dt-bindings/interrupt-controller/irq.h>

    i2c {

        #address-cells = <1>;

        #size-cells = <0>;

        accelerometer@8 {

            compatible = "bosch,bma222";

            reg = <0x08>;

            vddio-supply = <&vddio>;

            vdd-supply = <&vdd>;

            interrupts = <57 IRQ_TYPE_EDGE_FALLING>;

        };

    };

  - |

    # include <dt-bindings/interrupt-controller/irq.h>

    spi {

        #address-cells = <1>;

        #size-cells = <0>;

        accel@0 {

            compatible = "bosch,bma222";

            reg = <0>;

            spi-max-frequency = <10000000>;

        };

    };

...

Documentation/devicetree/bindings/iio/accel/fsl,mma8452.yaml

0 → 100644
+65 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/iio/accel/fsl,mma8452.yaml#

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



title:

  Freescale MMA8451Q, MMA8452Q, MMA8453Q, MMA8652FC, MMA8653FC or FXLS8471Q

  triaxial accelerometer



maintainers:

  - Martin Kepplinger <martin.kepplinger@theobroma-systems.com>



properties:

  compatible:

    enum:

      - fsl,mma8451

      - fsl,mma8452

      - fsl,mma8453

      - fsl,mma8652

      - fsl,mma8653

      - fsl,fxls8471



  reg:

    maxItems: 1



  interrupts:

    description:

      2 highly configurable interrupt lines exist.

    minItems: 1

    maxItems: 2



  interrupt-names:

    description: Specify which interrupt line is in use.

    items:

      enum:

        - INT1

        - INT2

    minItems: 1

    maxItems: 2



  vdd-supply: true

  vddio-supply: true



required:

  - compatible

  - reg



additionalProperties: false



examples:

  - |

    i2c {

        #address-cells = <1>;

        #size-cells = <0>;



        accel@1d {

            compatible = "fsl,mma8453";

            reg = <0x1d>;

            interrupt-parent = <&gpio1>;

            interrupts = <5 0>;

            interrupt-names = "INT2";

        };

    };

...

Documentation/devicetree/bindings/iio/accel/kionix,kxcjk1013.txt

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
Kionix KXCJK-1013 Accelerometer device tree bindings



Required properties:



- compatible: Must be one of:

    "kionix,kxcjk1013"

    "kionix,kxcj91008"

    "kionix,kxtj21009"

    "kionix,kxtf9"

 - reg: i2c slave address



Optional properties:



  - mount-matrix: an optional 3x3 mounting rotation matrix



Example:



kxtf9@f {

	compatible = "kionix,kxtf9";

	reg = <0x0F>;

	mount-matrix =	"0", "1", "0",

			"1", "0", "0",

			"0", "0", "1";

};