Commit 749c1e14 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'iio-for-5.11a' of...

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

Jonathan writes:

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

Usual mixed bag of new drivers / device support + cleanups etc with the
addition of a fairly big set of yaml conversions.

Txt to yaml format conversions.
In some cases dropped separate binding and moved to trivial devices (drop).

Listed by manufacturer
  - dht11 temperature(drop)
  - adi,ad2s90 adi,ad5272 adi,ad5592r adi,ad5758 adi,ad5933 adi,ad7303
    adi,adis16480 adi,adf4350
  - ams,as3935
  - asahi-kasei,ak8974
  - atmel,sama5d2-adc
  - avago,apds9300 avago,apds9960
  - bosch,bma180 bosch,bmc150_magn bosch,bme680 bosch,bmg180
  - brcm,iproc-static-adc
  - capella,cm36651
  - domintech,dmard06(drop)
  - fsl,mag3110 fsl,mma8452 fsl,vf610-dac
  - hoperf,hp03
  - honeywell,hmc5843
  - kionix,kxcjk1013
  - maxim,ds1803(drop) maxim,ds4424 maxim,max30100 maxim,max30102
    maxim,max31856 maxim,max31855k maxim,max44009
    maxim,max5481 maxim,max5821
  - meas,htu21(drop) meas,ms5367(drop) meas,ms5611 meas,tsys01(drop)
  - mediatek,mt2701-auxadc
  - melexis,mlx90614 melexis,mlx90632
  - memsic,mmc35240(drop)
  - microchip,mcp41010 microchip,mcp4131 microchip,mcp4725
  - murata,zap2326
  - nxp,fxas21002c nxp,lpc1850-dac
  - pni,rm3100
  - qcom,pm8018-adc qcom,spmi-iadc
  - renesas,isl29501 renesas,rcar-gyroadc
  - samsung,sensorhub-rinato
  - sensiron,sgp30
  - sentech,sx9500
  - sharp,gp2ap020a00f
  - st,hts221 st,lsm6dsx st,st-sensors(many!) st,uvis25 st,vcl53l0x st,vl6180
  - ti,adc084s021 ti,ads124s08
    ti,dac5571 ti,dac7311 ti,dac7512 ti,dac7612
    ti,hdc1000(drop) ti,palmas-gpadc ti,opt3001 ti,tmp07
  - upisemi,us51882
  - vishay,vcnl4035
  - x-powers,axp209

New device support
* adi,ad5685
  - Add support for AD5338R dual output 10-bit DAC
  - Add DT-binding doc.
* mediatek,mt6360
  - New driver for this SoC ADC with bindings and using new channel label
    support in the IIO core.
* st,lsm6dsx
  - Add support for LSM6DST

Core:
* Add "label" to device channels, provided via a new core callback. Including
  DT docs for when that is the source, and ABI docs.
* Add devm_iio_triggered_buffer_setup_ext to take extra attributes.
* dmaengine, unwrap use of iio_buffer_set_attrs()
* Drop iio_buffer_set_attrs()
* Centralize ioctl call handling. Later fix to ensure -EINVAL returned if
  no handler has run.
* Fix an issue with IIO_VAL_FRACTIONAL and negative values - doesn't affect
  any known existing drivers, but will impact a future one.
* kernel-doc fix in trigger.h
* file-ops ordering cleanup

Features
* semtech,sx9310
  - Add control of hardware gain, proximity thresholds, hysteresis and
    debounce.
  - Increase what information on hardware configuration can be provided
    via DT.

Cleanup and minor features
* adi,ad5685
  - Add of_match_table
* adi,ad7292
  - Drop pointless spi_set_drvdata() call
* adi,ad7298
  - Drop platform data and tidy up external reference config.
* adi,ad7303
  - Drop platform data handling as unused.
* adi,ad7768
  - Add new label attribute for channels provided from dt.
* adi,ad7887
  - devm_ usage in probe simplifying remove and error handling.
* adi,adis16201
  - Drop pointless spi_set_drvdata() call
* adi,adis16209
  - Drop pointless spi_set_drvdata() call
* adi,adis16240
  - White space fixup
* adi,adxl372
  - use new devm_iio_triggered-buffer_setup_ext()
* amlogic,meson-saradc
  - Drop pointless semicolon.
* amstaos,tsl2563
  - Put back i2c_device_id table as needed for greybus probing.
* atmel,at91_adc
  - Use of_device_get_match_data() instead of open coding it.
  - Constify some driver data
  - Add KCONFIG dep on CONFIG_OF and drop of_match_ptr()
  - Drop platform data as mostly dead code.
  - Tidy up reference voltage logic
* atmel-sama5d2
  - Drop a pointless semicolon
  - Merge buffer and trigger init into a separate function
  - Use new devm_iio_triggered_buff_setup_ext()
* avago,apds9960
  - Drop a pointless semicolon
* bosch,bmc150
  - Drop a pointless semicolon
  - Use new iio_triggered_buffer_setup_ext()
* bosch,bmp280
  - Drop a pointless semicolon
* fsl,mma8452
  - Constification
* (google),cros_ec
  - Use new devm_iio_triggered_buffer_setup_ext()
* hid-sensors
  - Use new iio_triggered_buffer_setup_ext()
* ingenic,adc
  - Drop a pointless semicolon
* invensense,icm426xx
  - Fix MAINTAINERS entry missing :
* mediatek,mt6577_audxac
  - Add binding doc for mt8516 compatible with mt8173
* motorola,cpcap-adc
  - Fix an implicit fallthrough marking that clang needs to avoid warning.
* samsung,exynos-adc
  - Stop relying on users counter form input device in ISR.
* st,lsm6dsx
  - add vdd and vddio regulator control (including binding update)
* st,stm32-adc
  - Tidy up code for dma transfers.
  - Adapt clock duty cycle for proper functioning. Note no known problems
    with existing boards.
* st,vl53l0x-i2c
  - Put back i2c_device_id table as needed for greybus probing.
* vishay,vcnl4035
  - Put back i2c_device_id table as needed for greybus probing.

* tag 'iio-for-5.11a' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio: (126 commits)
  dt-bindings:iio:adc:x-powers,axp209-adc: txt to yaml conversion
  dt-bindings:iio:adc:renesas,rcar-gyroadc: txt to yaml conversion.
  dt-bindings:iio:adc:atmel,sama5d2-adc: txt to yaml conversion
  dt-bindings:iio:magnetometer:pni,rm3100: txt to yaml conversion.
  dt-bindings:iio:magnetometer:honeywell,hmc5843: txt to yaml format conversion
  dt-bindings:iio:magnetometer:bosch,bmc150_magn: txt to yaml conversion.
  dt-bindings:iio:magnetometer:asahi-kasei,ak8974: txt to yaml format conversion
  dt-bindings:iio:magnetometer:fsl,mag3110: txt to yaml conversion
  dt-bindings:iio:light:st,vl6180: txt to yaml format conversion.
  dt-bindings:iio:light:vishay,vcnl4035: txt to yaml conversion
  dt-bindings:iio:light:st,uvis25: txt to yaml conversion for this UV sensor
  dt-bindings:iio:light:upisemi,us51882: txt to yaml conversion.
  dt-bindings:iio:light:ti,opt3001: txt to yaml conversion
  dt-bindings:iio:light:maxim,max44009: txt to yaml conversion.
  dt-bindings:iio:light:sharp,gp2ap020a00f: txt to yaml conversion.
  dt-bindings:iio:light:capella,cm36651: txt to yaml conversion.
  dt-bindings:iio:light:avago,apds9960: txt to yaml conversion
  dt-bindings:iio:light:avago,apds9300: txt to yaml conversion.
  dt-bindings:iio:imu:st,lsm6dsx: txt to yaml conversion
  dt-bindings:iio:imu:adi,adis16480: txt to yaml conversion
  ...
parents f65b243d 16be06aa
Loading
Loading
Loading
Loading
+10 −0
Original line number Diff line number Diff line
@@ -1743,6 +1743,16 @@ Description:

		Raw counter device counters direction for channel Y.

What:		/sys/bus/iio/devices/iio:deviceX/in_voltageY_label
What:		/sys/bus/iio/devices/iio:deviceX/out_voltageY_label
KernelVersion:	5.8
Contact:	linux-iio@vger.kernel.org
Description:
		Optional symbolic label to a device channel.
		If a label is defined for this channel add that to the channel
		specific attributes. This is useful for userspace to be able to
		better identify an individual channel.

What:		/sys/bus/iio/devices/iio:deviceX/in_phaseY_raw
KernelVersion:	4.18
Contact:	linux-iio@vger.kernel.org
+78 −0
Original line number Diff line number Diff line
What:		/sys/bus/iio/devices/iio:deviceX/in_voltage0_raw
KernelVersion:	5.8.0
Contact:	gene_chen@richtek.com
Description:
		Indicated MT6360 USBID ADC which connected to connector ID pin.
		Calculating with scale and offset returns voltage in uV

What:		/sys/bus/iio/devices/iio:deviceX/in_voltage1_raw
KernelVersion:	5.8.0
Contact:	gene_chen@richtek.com
Description:
		Indicated MT6360 VBUS ADC with lower accuracy(+-75mA)
		higher measure range(1~22mV)
		Calculating with scale and offset returns voltage in uV

What:		/sys/bus/iio/devices/iio:deviceX/in_voltage2_raw
KernelVersion:	5.8.0
Contact:	gene_chen@richtek.com
Description:
		Indicated MT6360 VBUS ADC with higher accuracy(+-30mA)
		lower measure range(1~9.76V)
		Calculating with scale and offset returns voltage in uV

What:		/sys/bus/iio/devices/iio:deviceX/in_voltage3_raw
KernelVersion:	5.8.0
Contact:	gene_chen@richtek.com
Description:
		Indicated MT6360 VSYS ADC
		Calculating with scale and offset returns voltage in uV

What:		/sys/bus/iio/devices/iio:deviceX/in_voltage4_raw
KernelVersion:	5.8.0
Contact:	gene_chen@richtek.com
Description:
		Indicated MT6360 VBAT ADC
		Calculating with scale and offset returns voltage in uV

What:		/sys/bus/iio/devices/iio:deviceX/in_current5_raw
KernelVersion:	5.8.0
Contact:	gene_chen@richtek.com
Description:
		Indicated MT6360 IBUS ADC
		Calculating with scale and offset returns voltage in uA

What:		/sys/bus/iio/devices/iio:deviceX/in_current6_raw
KernelVersion:	5.8.0
Contact:	gene_chen@richtek.com
Description:
		Indicated MT6360 IBAT ADC
		Calculating with scale and offset returns voltage in uA

What:		/sys/bus/iio/devices/iio:deviceX/in_current7_raw
KernelVersion:	5.8.0
Contact:	gene_chen@richtek.com
Description:
		Indicated MT6360 CHG_VDDP ADC
		Calculating with scale and offset returns voltage in uV

What:		/sys/bus/iio/devices/iio:deviceX/in_temp8_raw
KernelVersion:	5.8.0
Contact:	gene_chen@richtek.com
Description:
		Indicated MT6360 IC junction temperature
		Calculating with scale and offset returns temperature in degree

What:		/sys/bus/iio/devices/iio:deviceX/in_voltage9_raw
KernelVersion:	5.8.0
Contact:	gene_chen@richtek.com
Description:
		Indicated MT6360 VREF_TS ADC
		Calculating with scale and offset returns voltage in uV

What:		/sys/bus/iio/devices/iio:deviceX/in_voltage10_raw
KernelVersion:	5.8.0
Contact:	gene_chen@richtek.com
Description:
		Indicated MT6360 TS ADC
		Calculating with scale and offset returns voltage in uV
+0 −19
Original line number Diff line number Diff line
Device tree bindings for Domintech DMARD05, DMARD06, DMARD07 accelerometers

Required properties:
 - compatible		: Should be "domintech,dmard05"
				 or "domintech,dmard06"
				 or "domintech,dmard07"
 - reg			: I2C address of the chip. Should be 0x1c

Example:
	&i2c1 {
		/* ... */

		accelerometer@1c {
			compatible = "domintech,dmard06";
			reg = <0x1c>;
		};

		/* ... */
	};
+6 −0
Original line number Diff line number Diff line
@@ -5,18 +5,24 @@ Optional properties for child nodes:
- diff-channels : Differential channels muxed for this ADC. The first value
		specifies the positive input pin, the second value the negative
		input pin.
- reg: The channel number.
- label: Unique name to identify which channel this is.

Example:
	adc@0 {
		compatible = "some,adc";
		...
		channel@0 {
			reg = <0>;
			label = "channel_0_name";
			bipolar;
			diff-channels = <0 1>;
			...
		};

		channel@1 {
			reg = <1>;
			label = "channel_1_name";
			diff-channels = <2 3>;
			...
		};
+32 −0
Original line number Diff line number Diff line
@@ -29,6 +29,12 @@ properties:
  interrupts:
    maxItems: 1

  '#address-cells':
    const: 1

  '#size-cells':
    const: 0

  vref-supply:
    description:
      ADC reference voltage supply
@@ -62,6 +68,24 @@ required:
  - spi-cpha
  - adi,sync-in-gpios

patternProperties:
  "^channel@([0-9]|1[0-5])$":
    type: object
    description: |
      Represents the external channels which are connected to the device.

    properties:
      reg:
        description: |
          The channel number.

      label:
        description: |
          Unique name to identify which channel this is.
    required:
      - reg
    additionalProperties: false

additionalProperties: false

examples:
@@ -85,6 +109,14 @@ examples:
            reset-gpios = <&gpio 27 GPIO_ACTIVE_LOW>;
            clocks = <&ad7768_mclk>;
            clock-names = "mclk";

            #address-cells = <1>;
            #size-cells = <0>;

            channel@0 {
                reg = <0>;
                label = "channel_0";
            };
        };
    };
...
Loading