First round of new device support, cleanups and fixes for IIO in the 5.2 cycle.
Jonathan Cameron
maintainerThe following changes since commit cbebe5d05dd7fe2fdd13cff7c4a62f22109f1f95:
staging: erofs: match alignment with open parentheses (2019-02-19 15:18:49 +0100)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git tags/iio-for-5.2a
for you to fetch changes up to 5e79cef581ffcf277c8d10c6373ec7a1be79c5c9:
iio: ad_sigma_delta: Properly handle SPI bus locking vs CS assertion (2019-03-31 12:07:17 +0100)
----------------------------------------------------------------
First set of new device support, features and fixes for IIO in the 5.2 cycle.
Note includes, an immutable branch from MFD to bring in the stmpe code to which some fixes were later made.
Staging graduations
* ad7780
- Move this ADC driver out of staging. Included adding some new features along the way (see below). Also added DT bindings.
New device support
* adis16480
- Support the ADIS16495 and ADIS16497 IMU devices making
heavy use of refactoring of various aspects of the driver in precursor patches.
* lsm6dsx
- Support for the ASM330LHH 6-axis (accelerometer + gyro) sensor.
- Support for the LSM6DS0X
* matbotix mb1232
- New driver for this ultrasound ranging device family. Including bindings.
- Supports mb1202, mb1212, mb1222, mb1232, mb1242, mb7040 and mb7137.
* max31856
- New driver for this thermocouple temperature sensor.
* meson saradc
- Support the Meson-G12A (ID addition only).
* stmpe-adc
- New driver supporting generic ADC alongside touchscreen support which previously existed. Includes DT bindings.
* vcnl4000
- Support for the vcln4040 proximity and light sensor, including adding DT bindings for this and parts previously supported.
Features
* core
- Allow reading of mount matrices from ACPI in addition to DT.
- Common binding for theromcouple types.
* ad5933
- Add ABI docs as there are a few 'unsual' elements about this device - perhaps because it's our only impedance analyser.
* ad7780
- Add gain and filter gpio support + readback of current gain and filter.
* adis16480
- Allow selection fo the dataready pin to be used.
- Device tree ID table and binding documentation.
- Support external clock modes, including new bindings.
* bma180
- Mount matrix support.
* bmc150
- Mount matrix support.
* bmg160
- Mount matrix support.
- DT id table and bindings doc.
* bmp280
- Put calibration data into the entropy pool.
* hmc5843
- Mount matrix support.
* itg3200
- Mount matrix support.
* kxcjk1013
- Device tree id table, and binding docs.
* lpc32xx
- Add scale when regulator specified including DT docs for regulator.
* pms7003
- Add device IDs for all supported parts to driver and binding.
* stm32-dfsdm
- Enable hw consumer support, scan mode control and a complex set of triggered buffer modes.
- Power management.
* stm32-lptimer-counter
- power management.
- Document the pinctrl sleep state binding.
* ti-ads7950
- GPIO pin support.
Cleanups, minor fixes
* core
- Use bitmap_zalloc to make it explicit that is what we are doing.
- Tidy up all the Kconfig files (which had slowly gotten messy)
- Fix a forwards definition missing issue in iio/driver.h
* ad sigma delta core
- Improve handling of SPI bus locking vs CS assertion. This has been wrong a long time so not rushing this in.
* ad5064
- Mlock to local lock.
* ad5933 (staging cleanup)
- Multiline comment fixes.
- Include ordering.
- SPDX.
- Tidy up Kconfig help which was a bit missleading.
- Change some non standard attributes to ABI defined ones.
* ad7124
- White space fix.
* ad7192
- White space.
- Use DT clock binding.
- Improve error reporting.
- Platform data to DT conversion.
- Use read_avail callback, mostly to avoid the endless series of patches from new contributors trying to falsely put spaces around the negative sign.
* ad7280a
- Add brackets to macros to avoid potential precedence isseus.
- Add temp vars for event codes to reduce indent and improved readability.
- Clean out som CamelCase notation.
- White space.
* ad7606
- Fix broken file naming in MAINTAINERS.
* ad7766
- White space fixes.
* ad7780
- Missing switch defaults to supress warnings and harden the code slightly.
- Set pattern masks more directly.
- Add ID values and masks for all supported chips.
- SPDX + add Renato as a copyright holder as he has done a lot of work on this driver.
- Add brackets to macros to avoid potential precedence issues.
* ad7923
- White space fixes.
- Use BIT macro to improve readability.
- Add brackets to macros to avoid potential precedence issues.
- Tidy up a null comparisom.
* ad9523
- Fix a typo in naming of variables.
* adis16400
- Combine trigger file into main code as no advantage in separate files. Rename core file to just adis16400.
- Squash the header into the c file now there is only one file.
- Generalize burst mode to support new variants.
* ak8975
- Local variable to improve readability around mount matrix support.
* as3935
- Avoid potential race by ensuring remove does exact opposite of probe rather than a slightly different order.
* cross_ec
- Drop some unnecessary includes.
- Fix some warning and the slightly 'unusual' code.
- Add some docs for non obvious function.
- SPDX
* hmc5843
- Potential unhandled error case.
* iio trigger core
- Print an error if there is no available irq due to max consumers per trigger being set to low.
* iio loop trigger
- Drop an unlikely on IS_ERR as IS_ERR already has the annotation.
* ingenic-adc
- Drop a redundant dev_err call as devm_ioremap_resource reports the same internally.
* lmp91000
- Drop some unncessary parentheses and white space tidy up.
- Invert and if statement to improve readability.
- Fix a wrong error message.
* lpc32xx
- Header sorting + drop some unused ones.
* mma8542
- Mark a switch fallthrough.
* mpu6050
- Add a local variable to improve code readability around mount matrix support.
* mxs-lradc-adc
- Handle devm_iio_trigger_alloc failure.
* sps30
- Fix up a kernel version in the ABI docs.
* srf04
- DT binding doc converted to yaml.
* ssp_sensors
- Supress a clang build warning due to lack of visibility of conditional within a iio_push_to_buffers_with_timestamp. (reasonable false warning!)
* st_accel
- Drop pointless less than 0 comparisom of unsigned int.
* stm32-dfsdm
- Improve accuracy of spi_master_frequency calculation.
- Improve calculation fo sampling frequency.
- Rework various internals to simplify adding triggered buffer support.
- Claim direct mode to avoid racing around read_raw and being in buffered mode.
* stmpe
- Some tidy ups from the mfd tree (immutable branch)
- Fix a clang false positive warning.
* ti-ads7950
- Use local lock rather than using the core mlock when not locking around the device mode.
* vcnl4000
- Use word writes instead of byte writes. It seems byte writes are fine for some parts (undocument) but not others that the driver will shortly support.
Other
* mailmap
- Add email address change for Sean Nyekjaer. Update in relevant drivers
----------------------------------------------------------------
Alexandru Ardelean (5):
iio: imu: adis16400: move trigger handler into adis16400_core
iio: imu: adis: generalize burst mode support
iio: imu: adis16400: move burst logic to ADIS lib
iio: imu: adis16400: rename adis16400_core.c -> adi16400.c
iio: imu: adis16400: move adis16400.h into adis16400.c
Anderson Reis (3):
iio:potentiostat:lmp91000: reduce line width and remove blank line iio:potentiostat:lmp91000: invert if statement iio:potentiostat:lmp91000: change dev_err message
Andreas Klinger (5):
dt-bindings: Add vendor prefix for MaxBotix
dt-bindings: maxbotix,mb1232: Add MaxBotix i2c ultrasonic rangers mb1232.c: add distance iio sensor with i2c
MAINTAINERS: add maintainer for maxbotix ultrasonic driver devantech-srf04.yaml: transform DT binding to YAML
Andy Shevchenko (3):
iio: Allow to read mount matrix from ACPI
iio: buffer: Switch to bitmap_zalloc()
iio: Make possible to include driver.h first
Angus Ainslie (Purism) (5):
iio: light: vcnl4000 use word writes instead of byte writes
iio: light: vcnl4000 add devicetree hooks
dt-bindings: iio: light: add vcnl4000 devicetree bindings
iio: light: vcnl4000 add support for the VCNL4040 proximity and light sensor
dt-bindings: iio: light: add vcnl4040 devicetree bindings
Bárbara Fernandes (4):
iio:adc:ad7923: Align broken line to parenthesis iio:adc:ad7923: Use BIT macro instead of bitshift iio:adc:ad7923: Put macro argument between ()'s iio:adc:ad7923: Rewrite comparison to NULL
Camylla Gonçalves Cantanheide (1):
iio: adc: ad7766: Change alignment to match paranthesis
Chengguang Xu (1):
iio: remove redundant unlikely annotation
Colin Ian King (2):
iio: st_accel: remove redundant unsigned less than zero check
iio: adc: ad7124 fix indentation issue, remove extra tab
Cristian Sicilia (4):
staging: iio: adc: ad7280a: Avoid precedence issues in macro
staging: iio: adc: ad7280a: Adding temp var to improve readability
staging: iio: adc: ad7280a: Remove CamelCase notation
staging: iio: adc: ad7280a: Tab alignment
Enric Balletbo i Serra (1):
iio: cros_ec: Switch to SPDX identifier.
Enrico Weigelt, metux IT consult (1):
drivers: iio: Kconfig: pedantic cleanup
Fabrice Gasnier (12):
dt-bindings: iio: stm32-lptimer-counter: document pinctrl sleep state
iio: counter: stm32-lptimer: Add power management support
iio: adc: stm32-dfsdm: make spi_master_freq more accurate
iio: adc: stm32-dfsdm: continuous mode depends on current mode
iio: adc: stm32-dfsdm: move dma enable from start_conv() to start_dma()
iio: adc: stm32-dfsdm: move dma slave config to start routine
iio: adc: stm32-dfsdm: enable hw consumer
iio: adc: stm32-dfsdm: add support for scan mode
iio: adc: stm32-dfsdm: add support for buffer modes
iio: adc: stm32-dfsdm: claim direct mode for raw read and settings
iio: adc: stm32-dfsdm: improve sampling frequency accuracy
iio: adc: stm32-dfsdm: add PM support
Gregory CLEMENT (4):
iio: adc: lpc32xx: Sort headers
iio: adc: lpc32xx: Cleanup headers
iio: adc: lpc32xx: Add scale feature
dt-bindings: iio: adc: lpc32xx-adc: Document vref-supply
Guenter Roeck (1):
iio: cros_ec: Drop unnecessary include files
Gustavo A. R. Silva (2):
iio: mma8452: mark expected switch fall-through
iio: cros_ec_accel_legacy: Refactor code in cros_ec_accel_legacy_probe
Gwendal Grignou (1):
iio: cros_ec: Add kernel-doc for cros_ec_sensors_read_lpc
H. Nikolaus Schaller (10):
iio: accel: bmc150: add mount matrix support
iio: accel: bma180: add mount matrix support
iio: gyro: bmg160: add mount matrix support
iio: gyro: itg3200: add mount matrix support
iio: magnetometer: bmc150: add mount matrix support
iio: magnetometer: hmc5843: add mount matrix support
iio: mpu6050: improve code readability
iio: ak8975: improve code readability
iio: gyro: bmg160: add device tree compatibility table
dt-bindings: iio: add Bosch BMG160 gyroscope sensor
Jonathan Cameron (1):
iio:dac:ad5064 mlock cleanup - move to a local lock.
Justin Chen (2):
iio: adc: ti-ads7950: Fix improper use of mlock
iio: adc: ti-ads7950: add GPIO support
Kangjie Lu (2):
iio: adc: fix a potential NULL pointer dereference
iio: hmc5843: fix potential NULL pointer dereferences
Lars-Peter Clausen (2):
iio: frequency: ad9523: Fix typo in ad9523_platform_data
iio: ad_sigma_delta: Properly handle SPI bus locking vs CS assertion
Linus Walleij (1):
iio: pressure: bmp280: BMP280 calibration to entropy
Lorenzo Bianconi (4):
iio: imu: st_lsm6dsx: add support to ASM330LHH
dt-bindings: iio: imu: st_lsm6dsx: add asm330lhh device bindings
iio: imu: st_lsm6dsx: add support to LSM6DSOX
dt-bindings: iio: imu: st_lsm6dsx: add lsm6dsox device bindings
Lucas Oshiro (1):
iio:potentiostat:lmp91000: remove unnecessary parentheses
Marcelo Schmitt (6):
staging: iio: ad5933: change multi-line comment style
staging: iio: ad5933: organize includes
staging: iio: ad5933: add SPDX identifier
staging: iio: ad5933: change help rule message
staging: iio: ad5933: add ABI documentation
staging: iio: ad5933: change attributes to match ABI
Mathieu Othacehe (1):
iio: trigger: Print an error if there is no available irq
Mircea Caprioru (5):
staging: iio: adc: ad7192: Fix identation
staging: iio: adc: ad7192: Use DT clock binding
staging: iio: adc: ad7192: Report error directly in ad7192_setup
staging: iio: adc: ad7192: Convert platform data to DT properties
staging: iio: adc: ad7192: Use read_avail for available attributes
Nathan Chancellor (2):
iio: common: ssp_sensors: Initialize calculated_time in ssp_common_process_data
iio: adc: stmpe-adc: Shuffle an if statement around in stmpe_adc_isr
Neil Armstrong (2):
dt-bindings: iio: adc: document the Meson G12A support
iio: adc: meson-saradc: add support for Meson G12A
Paresh Chaudhary (2):
iio:temperature:max31856:Add device tree bind info iio:temperature: Add MAX31856 thermocouple support
Patrick Havelange (1):
dt-bindings: iio/temperature: Add thermocouple types (and doc)
Philippe Schenker (3):
dt-bindings: stmpe: Reformatting parameter list and use tabs only
mfd: stmpe: Move ADC related defines to MFD header
Input: stmpe-ts: preparations for STMPE ADC driver
Renato Lui Geh (11):
staging: iio: ad7780: add gain & filter gpio support
staging: iio: ad7780: add missing switch default case
staging: iio: ad7780: add gain reading to ad778x
staging: iio: ad7780: add filter reading to ad778x
staging: iio: ad7780: set pattern values and masks directly staging:iio:ad7780: add chip ID values and mask
staging: iio: ad7780: move regulator to after GPIO init
staging: iio: ad7780: add SPDX identifier
staging: iio: ad7780: add new copyright holder
staging: iio: ad7780: moving ad7780 out of staging
staging: iio: ad7780: add device tree binding
Robert Yang (3):
dt-bindings: Add vendor prefix for Kionix, Inc.
dt-bindings: iio: accel: kxcjk1013: Add device tree binding documentation
iio: accel: kxcjk1013: Add device tree support
Sean Nyekjaer (3):
mailmap: Update email for Sean Nyekjaer
iio: adc: ti-ads8688: Update the module author email address
iio: dac: ti-dac5571: Update the module author email address
Stefan Agner (3):
mfd: stmpe: Preparations for STMPE ADC driver
iio: adc: add STMPE ADC driver using IIO framework
iio: adc: add STMPE ADC devicetree bindings
Stefan Popa (10):
iio: imu: adis16480: Add support for configurable drdy indicator
iio: imu: adis16480: Add OF device ID table
iio: imu: adis16480: Treat temperature scale in a generic way
iio: imu: adis16480: Calculate the sampling frequency in a generic way
iio: imu: adis16480: Deal with filter freq in a generic way
iio: imu: adis16480: Add support for ADIS1649x family of devices
iio: imu: adis16480: Add docs for ADIS16480 IMU
iio: imu: adis16480: Add support for external clock
dt-bindings: iio: imu: adis16480: Document external clock
MAINTAINERS: Fix the link to ad7606 dt-bindings
Sven Van Asbroeck (1):
iio: proximity: as3935: fix use-after-free on device remove
Tomasz Duszynski (3):
iio: chemical: pms7003: extend supported sensors list
dt-bindings: iio: chemical: pms7003: extend supported sensors list
iio: chemical: sps30: fix attribute kernel version
Vladimir Petrigo (1):
iio: adc: ad7780: Add parentheses to macros
Wei Yongjun (1):
iio: adc: ingenic: remove redundant dev_err call in ingenic_adc_probe()
.mailmap | 1 +
.../sysfs-bus-iio-impedance-analyzer-ad5933 | 19 +-
Documentation/ABI/testing/sysfs-bus-iio-sps30 | 2 +-
.../ABI/testing/sysfs-bus-iio-temperature-max31856 | 24 +
.../bindings/iio/accel/kionix,kxcjk1013.txt | 17 +
.../devicetree/bindings/iio/adc/adi,ad7780.txt | 48 ++
.../bindings/iio/adc/amlogic,meson-saradc.txt | 1 +
.../devicetree/bindings/iio/adc/lpc32xx-adc.txt | 5 +
.../devicetree/bindings/iio/adc/stmpe-adc.txt | 21 +
.../bindings/iio/chemical/plantower,pms7003.txt | 8 +-
.../bindings/iio/counter/stm32-lptimer-cnt.txt | 8 +-
.../devicetree/bindings/iio/gyroscope/bmg160.txt | 20 +
.../devicetree/bindings/iio/imu/adi,adis16480.txt | 85 +++
.../devicetree/bindings/iio/imu/st_lsm6dsx.txt | 2 +
.../devicetree/bindings/iio/light/vcnl4000.txt | 24 +
.../bindings/iio/proximity/devantech-srf04.txt | 28 -
.../bindings/iio/proximity/devantech-srf04.yaml | 59 ++
.../bindings/iio/proximity/maxbotix,mb1232.txt | 29 +
.../bindings/iio/temperature/max31856.txt | 24 +
.../iio/temperature/temperature-bindings.txt | 7 +
.../bindings/input/touchscreen/stmpe.txt | 116 +++-
Documentation/devicetree/bindings/mfd/stmpe.txt | 28 +-
.../devicetree/bindings/vendor-prefixes.txt | 2 +
MAINTAINERS | 10 +-
drivers/iio/Kconfig | 24 +-
drivers/iio/accel/Kconfig | 48 +-
drivers/iio/accel/bma180.c | 18 +-
drivers/iio/accel/bmc150-accel-core.c | 21 +
drivers/iio/accel/cros_ec_accel_legacy.c | 40 +-
drivers/iio/accel/kxcjk-1013.c | 10 +
drivers/iio/accel/kxsd9.c | 4 +-
drivers/iio/accel/mma8452.c | 2 +-
drivers/iio/accel/st_accel_core.c | 2 +-
drivers/iio/adc/Kconfig | 39 +-
drivers/iio/adc/Makefile | 2 +
drivers/iio/adc/ad7124.c | 2 +-
drivers/iio/adc/ad7766.c | 22 +-
drivers/{staging => }/iio/adc/ad7780.c | 179 ++++--
drivers/iio/adc/ad7923.c | 24 +-
drivers/iio/adc/ad_sigma_delta.c | 16 +-
drivers/iio/adc/ingenic-adc.c | 4 +-
drivers/iio/adc/lpc32xx_adc.c | 60 +-
drivers/iio/adc/meson_saradc.c | 8 +
drivers/iio/adc/mxs-lradc-adc.c | 2 +
drivers/iio/adc/stm32-dfsdm-adc.c | 628 ++++++++++++++++-----
drivers/iio/adc/stm32-dfsdm-core.c | 180 +++++-
drivers/iio/adc/stmpe-adc.c | 362 ++++++++++++
drivers/iio/adc/ti-ads7950.c | 219 ++++++-
drivers/iio/adc/ti-ads8688.c | 2 +-
drivers/iio/buffer/industrialio-buffer-cb.c | 10 +-
drivers/iio/chemical/Kconfig | 12 +-
drivers/iio/chemical/pms7003.c | 5 +
.../iio/common/cros_ec_sensors/cros_ec_sensors.c | 12 +-
.../common/cros_ec_sensors/cros_ec_sensors_core.c | 22 +-
drivers/iio/common/ms_sensors/Kconfig | 2 +-
drivers/iio/common/ssp_sensors/ssp_iio.c | 2 +-
drivers/iio/counter/stm32-lptimer-cnt.c | 55 ++
drivers/iio/dac/ad5064.c | 15 +-
drivers/iio/dac/ti-dac5571.c | 2 +-
drivers/iio/frequency/ad9523.c | 16 +-
drivers/iio/gyro/bmg160_core.c | 21 +
drivers/iio/gyro/bmg160_i2c.c | 9 +
drivers/iio/gyro/itg3200_core.c | 20 +
drivers/iio/gyro/mpu3050-core.c | 3 +-
drivers/iio/humidity/Kconfig | 20 +-
drivers/iio/imu/Makefile | 2 -
drivers/iio/imu/{adis16400_core.c => adis16400.c} | 232 +++++++-
drivers/iio/imu/adis16400.h | 215 -------
drivers/iio/imu/adis16400_buffer.c | 101 ----
drivers/iio/imu/adis16480.c | 435 +++++++++++++-
drivers/iio/imu/adis_buffer.c | 40 ++
drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 10 +-
drivers/iio/imu/st_lsm6dsx/Kconfig | 2 +-
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 4 +
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c | 8 +-
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 42 +-
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c | 10 +
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c | 10 +
drivers/iio/industrialio-buffer.c | 24 +-
drivers/iio/industrialio-core.c | 46 +-
drivers/iio/industrialio-trigger.c | 5 +-
drivers/iio/light/Kconfig | 274 ++++-----
drivers/iio/light/cros_ec_light_prox.c | 12 +-
drivers/iio/light/vcnl4000.c | 77 ++-
drivers/iio/magnetometer/ak8974.c | 5 +-
drivers/iio/magnetometer/ak8975.c | 13 +-
drivers/iio/magnetometer/bmc150_magn.c | 21 +
drivers/iio/magnetometer/hmc5843.h | 1 +
drivers/iio/magnetometer/hmc5843_core.c | 20 +-
drivers/iio/magnetometer/hmc5843_i2c.c | 7 +-
drivers/iio/magnetometer/hmc5843_spi.c | 7 +-
drivers/iio/potentiometer/Kconfig | 34 +-
drivers/iio/potentiostat/lmp91000.c | 14 +-
drivers/iio/pressure/bmp280-core.c | 6 +
drivers/iio/pressure/cros_ec_baro.c | 11 +-
drivers/iio/proximity/Kconfig | 12 +
drivers/iio/proximity/Makefile | 1 +
drivers/iio/proximity/as3935.c | 50 +-
drivers/iio/proximity/mb1232.c | 272 +++++++++
drivers/iio/temperature/Kconfig | 24 +-
drivers/iio/temperature/Makefile | 1 +
drivers/iio/temperature/max31856.c | 353 ++++++++++++
drivers/iio/trigger/iio-trig-loop.c | 2 +-
drivers/input/touchscreen/stmpe-ts.c | 66 +--
drivers/mfd/Kconfig | 3 +-
drivers/mfd/stmpe.c | 68 +++
drivers/staging/iio/adc/Kconfig | 13 -
drivers/staging/iio/adc/Makefile | 1 -
drivers/staging/iio/adc/ad7192.c | 233 +++++---
drivers/staging/iio/adc/ad7192.h | 9 -
drivers/staging/iio/adc/ad7280a.c | 109 ++--
drivers/staging/iio/impedance-analyzer/Kconfig | 2 +-
drivers/staging/iio/impedance-analyzer/ad5933.c | 54 +-
include/dt-bindings/iio/temperature/thermocouple.h | 16 +
include/linux/iio/adc/ad_sigma_delta.h | 1 +
include/linux/iio/driver.h | 1 +
include/linux/iio/frequency/ad9523.h | 8 +-
include/linux/iio/gyro/itg3200.h | 1 +
include/linux/iio/iio.h | 4 +-
include/linux/iio/imu/adis.h | 14 +
include/linux/mfd/stmpe.h | 21 +
121 files changed, 4397 insertions(+), 1362 deletions(-)
rename {drivers/staging/iio/Documentation => Documentation/ABI/testing}/sysfs-bus-iio-impedance-analyzer-ad5933 (56%)
create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-temperature-max31856
create mode 100644 Documentation/devicetree/bindings/iio/accel/kionix,kxcjk1013.txt
create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,ad7780.txt
create mode 100644 Documentation/devicetree/bindings/iio/adc/stmpe-adc.txt
create mode 100644 Documentation/devicetree/bindings/iio/gyroscope/bmg160.txt
create mode 100644 Documentation/devicetree/bindings/iio/imu/adi,adis16480.txt
create mode 100644 Documentation/devicetree/bindings/iio/light/vcnl4000.txt
delete mode 100644 Documentation/devicetree/bindings/iio/proximity/devantech-srf04.txt
create mode 100644 Documentation/devicetree/bindings/iio/proximity/devantech-srf04.yaml
create mode 100644 Documentation/devicetree/bindings/iio/proximity/maxbotix,mb1232.txt
create mode 100644 Documentation/devicetree/bindings/iio/temperature/max31856.txt
create mode 100644 Documentation/devicetree/bindings/iio/temperature/temperature-bindings.txt
rename drivers/{staging => }/iio/adc/ad7780.c (63%)
create mode 100644 drivers/iio/adc/stmpe-adc.c
rename drivers/iio/imu/{adis16400_core.c => adis16400.c} (77%)
delete mode 100644 drivers/iio/imu/adis16400.h
delete mode 100644 drivers/iio/imu/adis16400_buffer.c
create mode 100644 drivers/iio/proximity/mb1232.c
create mode 100644 drivers/iio/temperature/max31856.c
create mode 100644 include/dt-bindings/iio/temperature/thermocouple.hHi Greg,
There is a merge conflict in here against the previous fixes branch in industrialio-buffer.c. The resolution I would suggest is to take the cleanup from Andy that is in this branch that moves the code over to bitmap_kzalloc avoiding the issue that was fixed in the other branch. I'd not noticed this one sneaking in until I did a test merge a few minutes ago. Sorry about that.
Thanks for your help (for this and in general!)
Jonathan
Quoted 568 lines · On Mon, 1 Apr 2019 21:59:36 +0100 Jonathan Cameron <[email protected]> wrote:
The following changes since commit
cbebe5d05dd7fe2fdd13cff7c4a62f22109f1f95:staging: erofs: match alignment with open parentheses (2019-02-19 15:18:49 +0100)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.gittags/iio-for-5.2afor you to fetch changes up to
5e79cef581ffcf277c8d10c6373ec7a1be79c5c9:iio:
ad_sigma_delta: Properly handle SPI bus locking vs CS assertion (2019-03-31 12:07:17 +0100)----------------------------------------------------------------
First set of new device support, features and fixes for IIO in the 5.2 cycle.Note includes, an immutable branch from MFD to bring in the stmpe code to which some fixes were later made.
Staging graduations
* ad7780
- Move this ADC driver out of staging. Included adding some new features along the way (see below). Also added DT bindings.New device support
* adis16480
- Support the ADIS16495 and ADIS16497 IMU devices making
heavy use of refactoring of various aspects of the driver in precursor patches.
* lsm6dsx
- Support for the ASM330LHH 6-axis (accelerometer + gyro) sensor.
- Support for the LSM6DS0X
* matbotix mb1232
- New driver for this ultrasound ranging device family. Including bindings.
- Supports mb1202, mb1212, mb1222, mb1232, mb1242, mb7040 and mb7137.
* max31856
- New driver for this thermocouple temperature sensor.
* meson saradc
- Support the Meson-G12A (ID addition only).
* stmpe-adc
- New driver supporting generic ADC alongside touchscreen support which previously existed. Includes DT bindings.
* vcnl4000
- Support for the vcln4040 proximity and light sensor, including adding DT bindings for this and parts previously supported.Features
* core
- Allow reading of mount matrices from ACPI in addition to DT.
- Common binding for theromcouple types.
* ad5933
- Add ABI docs as there are a few 'unsual' elements about this device - perhaps because it's our only impedance analyser.
* ad7780
- Add gain and filter gpio support + readback of current gain and filter.
* adis16480
- Allow selection fo the dataready pin to be used.
- Device tree ID table and binding documentation.
- Support external clock modes, including new bindings.
* bma180
- Mount matrix support.
* bmc150
- Mount matrix support.
* bmg160
- Mount matrix support.
- DT id table and bindings doc.
* bmp280
- Put calibration data into the entropy pool.
* hmc5843
- Mount matrix support.
* itg3200
- Mount matrix support.
* kxcjk1013
- Device tree id table, and binding docs.
* lpc32xx
- Add scale when regulator specified including DT docs for regulator.
* pms7003
- Add device IDs for all supported parts to driver and binding.
* stm32-dfsdm
- Enable hw consumer support, scan mode control and a complex set of triggered buffer modes.
- Power management.
* stm32-lptimer-counter
- power management.
- Document the pinctrl sleep state binding.
* ti-ads7950
- GPIO pin support.Cleanups, minor fixes
* core
- Usebitmap_zallocto make it explicit that is what we are doing.
- Tidy up all theKconfigfiles (which had slowly gotten messy)
- Fix a forwards definition missing issue iniio/driver.h
* ad sigma delta core
- Improve handling of SPI bus locking vs CS assertion. This has been wrong a long time so not rushing this in.
* ad5064
- Mlock to local lock.
* ad5933 (staging cleanup)
- Multiline comment fixes.
- Include ordering.
- SPDX.
- Tidy upKconfighelp which was a bit missleading.
- Change some non standard attributes to ABI defined ones.
* ad7124
- White space fix.
* ad7192
- White space.
- Use DT clock binding.
- Improve error reporting.
- Platform data to DT conversion.
- Useread_availcallback, mostly to avoid the endless series of patches from new contributors trying to falsely put spaces around the negative sign.
* ad7280a
- Add brackets to macros to avoid potential precedence isseus.
- Add temp vars for event codes to reduce indent and improved readability.
- Clean out som CamelCase notation.
- White space.
* ad7606
- Fix broken file naming inMAINTAINERS.
* ad7766
- White space fixes.
* ad7780
- Missing switch defaults to supress warnings and harden the code slightly.
- Set pattern masks more directly.
- Add ID values and masks for all supported chips.
- SPDX + add Renato as a copyright holder as he has done a lot of work on this driver.
- Add brackets to macros to avoid potential precedence issues.
* ad7923
- White space fixes.
- Use BIT macro to improve readability.
- Add brackets to macros to avoid potential precedence issues.
- Tidy up a null comparisom.
* ad9523
- Fix a typo in naming of variables.
* adis16400
- Combine trigger file into main code as no advantage in separate files. Rename core file to just adis16400.
- Squash the header into the c file now there is only one file.
- Generalize burst mode to support new variants.
* ak8975
- Local variable to improve readability around mount matrix support.
* as3935
- Avoid potential race by ensuring remove does exact opposite of probe rather than a slightly different order.
*cross_ec
- Drop some unnecessary includes.
- Fix some warning and the slightly 'unusual' code.
- Add some docs for non obvious function.
- SPDX
* hmc5843
- Potential unhandled error case.
* iio trigger core
- Print an error if there is no available irq due to max consumers per trigger being set to low.
* iio loop trigger
- Drop an unlikely onIS_ERRasIS_ERRalready has the annotation.
* ingenic-adc
- Drop a redundantdev_errcall asdevm_ioremap_resourcereports the same internally.
* lmp91000
- Drop some unncessary parentheses and white space tidy up.
- Invert and if statement to improve readability.
- Fix a wrong error message.
* lpc32xx
- Header sorting + drop some unused ones.
* mma8542
- Mark a switch fallthrough.
* mpu6050
- Add a local variable to improve code readability around mount matrix support.
* mxs-lradc-adc
- Handledevm_iio_trigger_allocfailure.
* sps30
- Fix up a kernel version in the ABI docs.
* srf04
- DT binding doc converted to yaml.
*ssp_sensors
- Supress a clang build warning due to lack of visibility of conditional within aiio_push_to_buffers_with_timestamp. (reasonable false warning!)
*st_accel
- Drop pointless less than 0 comparisom of unsigned int.
* stm32-dfsdm
- Improve accuracy ofspi_master_frequencycalculation.
- Improve calculation fo sampling frequency.
- Rework various internals to simplify adding triggered buffer support.
- Claim direct mode to avoid racing aroundread_rawand being in buffered mode.
* stmpe
- Some tidy ups from the mfd tree (immutable branch)
- Fix a clang false positive warning.
* ti-ads7950
- Use local lock rather than using the core mlock when not locking around the device mode.
* vcnl4000
- Use word writes instead of byte writes. It seems byte writes are fine for some parts (undocument) but not others that the driver will shortly support.Other
* mailmap
- Add email address change for Sean Nyekjaer. Update in relevant drivers----------------------------------------------------------------
Alexandru Ardelean (5):
iio: imu: adis16400: move trigger handler intoadis16400_core
iio: imu: adis: generalize burst mode support
iio: imu: adis16400: move burst logic to ADIS lib
iio: imu: adis16400: renameadis16400_core.c->adi16400.c
iio: imu: adis16400: moveadis16400.hintoadis16400.cAnderson Reis (3):
iio:potentiostat:lmp91000: reduce line width and remove blank line iio:potentiostat:lmp91000: invert if statement iio:potentiostat:lmp91000: changedev_errmessageAndreas Klinger (5):
dt-bindings: Add vendor prefix for MaxBotix
dt-bindings: maxbotix,mb1232: Add MaxBotix i2c ultrasonic rangersmb1232.c: add distance iio sensor with i2c
MAINTAINERS: add maintainer for maxbotix ultrasonic driverdevantech-srf04.yaml: transform DT binding to YAMLAndy Shevchenko (3):
iio: Allow to read mount matrix from ACPI
iio: buffer: Switch tobitmap_zalloc()
iio: Make possible to includedriver.hfirstAngus Ainslie (Purism) (5):
iio: light: vcnl4000 use word writes instead of byte writes
iio: light: vcnl4000 add devicetree hooks
dt-bindings: iio: light: add vcnl4000 devicetree bindings
iio: light: vcnl4000 add support for the VCNL4040 proximity and light sensor
dt-bindings: iio: light: add vcnl4040 devicetree bindingsBárbara Fernandes (4):
iio:adc:ad7923: Align broken line to parenthesis iio:adc:ad7923: Use BIT macro instead of bitshift iio:adc:ad7923: Put macro argument between ()'s iio:adc:ad7923: Rewrite comparison to NULLCamylla Gonçalves Cantanheide (1):
iio: adc: ad7766: Change alignment to match paranthesisChengguang Xu (1):
iio: remove redundant unlikely annotationColin Ian King (2):
iio:st_accel: remove redundant unsigned less than zero check
iio: adc: ad7124 fix indentation issue, remove extra tabCristian Sicilia (4):
staging: iio: adc: ad7280a: Avoid precedence issues in macro
staging: iio: adc: ad7280a: Adding temp var to improve readability
staging: iio: adc: ad7280a: Remove CamelCase notation
staging: iio: adc: ad7280a: Tab alignmentEnric Balletbo i Serra (1):
iio:cros_ec: Switch to SPDX identifier.Enrico Weigelt, metux IT consult (1):
drivers: iio:Kconfig: pedantic cleanupFabrice Gasnier (12):
dt-bindings: iio: stm32-lptimer-counter: document pinctrl sleep state
iio: counter: stm32-lptimer: Add power management support
iio: adc: stm32-dfsdm: makespi_master_freqmore accurate
iio: adc: stm32-dfsdm: continuous mode depends on current mode
iio: adc: stm32-dfsdm: move dma enable fromstart_conv()tostart_dma()
iio: adc: stm32-dfsdm: move dma slave config to start routine
iio: adc: stm32-dfsdm: enable hw consumer
iio: adc: stm32-dfsdm: add support for scan mode
iio: adc: stm32-dfsdm: add support for buffer modes
iio: adc: stm32-dfsdm: claim direct mode for raw read and settings
iio: adc: stm32-dfsdm: improve sampling frequency accuracy
iio: adc: stm32-dfsdm: add PM supportGregory CLEMENT (4):
iio: adc: lpc32xx: Sort headers
iio: adc: lpc32xx: Cleanup headers
iio: adc: lpc32xx: Add scale feature
dt-bindings: iio: adc: lpc32xx-adc: Document vref-supplyGuenter Roeck (1):
iio:cros_ec: Drop unnecessary include filesGustavo A. R. Silva (2):
iio: mma8452: mark expected switch fall-through
iio:cros_ec_accel_legacy: Refactor code incros_ec_accel_legacy_probeGwendal Grignou (1):
iio:cros_ec: Add kernel-doc forcros_ec_sensors_read_lpcH. Nikolaus Schaller (10):
iio: accel: bmc150: add mount matrix support
iio: accel: bma180: add mount matrix support
iio: gyro: bmg160: add mount matrix support
iio: gyro: itg3200: add mount matrix support
iio: magnetometer: bmc150: add mount matrix support
iio: magnetometer: hmc5843: add mount matrix support
iio: mpu6050: improve code readability
iio: ak8975: improve code readability
iio: gyro: bmg160: add device tree compatibility table
dt-bindings: iio: add Bosch BMG160 gyroscope sensorJonathan Cameron (1):
iio:dac:ad5064 mlock cleanup - move to a local lock.Justin Chen (2):
iio: adc: ti-ads7950: Fix improper use of mlock
iio: adc: ti-ads7950: add GPIO supportKangjie Lu (2):
iio: adc: fix a potential NULL pointer dereference
iio: hmc5843: fix potential NULL pointer dereferencesLars-Peter Clausen (2):
iio: frequency: ad9523: Fix typo inad9523_platform_data
iio:ad_sigma_delta: Properly handle SPI bus locking vs CS assertionLinus Walleij (1):
iio: pressure: bmp280: BMP280 calibration to entropyLorenzo Bianconi (4):
iio: imu:st_lsm6dsx: add support to ASM330LHH
dt-bindings: iio: imu:st_lsm6dsx: add asm330lhh device bindings
iio: imu:st_lsm6dsx: add support to LSM6DSOX
dt-bindings: iio: imu:st_lsm6dsx: add lsm6dsox device bindingsLucas Oshiro (1):
iio:potentiostat:lmp91000: remove unnecessary parenthesesMarcelo Schmitt (6):
staging: iio: ad5933: change multi-line comment style
staging: iio: ad5933: organize includes
staging: iio: ad5933: add SPDX identifier
staging: iio: ad5933: change help rule message
staging: iio: ad5933: add ABI documentation
staging: iio: ad5933: change attributes to match ABIMathieu Othacehe (1):
iio: trigger: Print an error if there is no available irqMircea Caprioru (5):
staging: iio: adc: ad7192: Fix identation
staging: iio: adc: ad7192: Use DT clock binding
staging: iio: adc: ad7192: Report error directly inad7192_setup
staging: iio: adc: ad7192: Convert platform data to DT properties
staging: iio: adc: ad7192: Useread_availfor available attributesNathan Chancellor (2):
iio: common:ssp_sensors: Initializecalculated_timeinssp_common_process_data
iio: adc: stmpe-adc: Shuffle an if statement around instmpe_adc_isrNeil Armstrong (2):
dt-bindings: iio: adc: document the Meson G12A support
iio: adc: meson-saradc: add support for Meson G12AParesh Chaudhary (2):
iio:temperature:max31856:Add device tree bind info iio:temperature: Add MAX31856 thermocouple supportPatrick Havelange (1):
dt-bindings: iio/temperature: Add thermocouple types (and doc)Philippe Schenker (3):
dt-bindings: stmpe: Reformatting parameter list and use tabs only
mfd: stmpe: Move ADC related defines to MFD header
Input: stmpe-ts: preparations for STMPE ADC driverRenato Lui Geh (11):
staging: iio: ad7780: add gain & filter gpio support
staging: iio: ad7780: add missing switch default case
staging: iio: ad7780: add gain reading to ad778x
staging: iio: ad7780: add filter reading to ad778x
staging: iio: ad7780: set pattern values and masks directly staging:iio:ad7780: add chip ID values and mask
staging: iio: ad7780: move regulator to after GPIO init
staging: iio: ad7780: add SPDX identifier
staging: iio: ad7780: add new copyright holder
staging: iio: ad7780: moving ad7780 out of staging
staging: iio: ad7780: add device tree bindingRobert Yang (3):
dt-bindings: Add vendor prefix for Kionix, Inc.
dt-bindings: iio: accel: kxcjk1013: Add device tree binding documentation
iio: accel: kxcjk1013: Add device tree supportSean Nyekjaer (3):
mailmap: Update email for Sean Nyekjaer
iio: adc: ti-ads8688: Update the module author email address
iio: dac: ti-dac5571: Update the module author email addressStefan Agner (3):
mfd: stmpe: Preparations for STMPE ADC driver
iio: adc: add STMPE ADC driver using IIO framework
iio: adc: add STMPE ADC devicetree bindingsStefan Popa (10):
iio: imu: adis16480: Add support for configurable drdy indicator
iio: imu: adis16480: Add OF device ID table
iio: imu: adis16480: Treat temperature scale in a generic way
iio: imu: adis16480: Calculate the sampling frequency in a generic way
iio: imu: adis16480: Deal with filter freq in a generic way
iio: imu: adis16480: Add support for ADIS1649x family of devices
iio: imu: adis16480: Add docs for ADIS16480 IMU
iio: imu: adis16480: Add support for external clock
dt-bindings: iio: imu: adis16480: Document external clock
MAINTAINERS: Fix the link to ad7606 dt-bindingsSven Van Asbroeck (1):
iio: proximity: as3935: fix use-after-free on device removeTomasz Duszynski (3):
iio: chemical: pms7003: extend supported sensors list
dt-bindings: iio: chemical: pms7003: extend supported sensors list
iio: chemical: sps30: fix attribute kernel versionVladimir Petrigo (1):
iio: adc: ad7780: Add parentheses to macrosWei Yongjun (1):
iio: adc: ingenic: remove redundantdev_errcall iningenic_adc_probe().mailmap | 1 + .../sysfs-bus-iio-impedance-analyzer-ad5933 | 19 +- Documentation/ABI/testing/sysfs-bus-iio-sps30 | 2 +- .../ABI/testing/sysfs-bus-iio-temperature-max31856 | 24 + .../bindings/iio/accel/kionix,kxcjk1013.txt | 17 + .../devicetree/bindings/iio/adc/adi,ad7780.txt | 48 ++ .../bindings/iio/adc/amlogic,meson-saradc.txt | 1 + .../devicetree/bindings/iio/adc/lpc32xx-adc.txt | 5 + .../devicetree/bindings/iio/adc/stmpe-adc.txt | 21 + .../bindings/iio/chemical/plantower,pms7003.txt | 8 +- .../bindings/iio/counter/stm32-lptimer-cnt.txt | 8 +- .../devicetree/bindings/iio/gyroscope/bmg160.txt | 20 + .../devicetree/bindings/iio/imu/adi,adis16480.txt | 85 +++ .../devicetree/bindings/iio/imu/st_lsm6dsx.txt | 2 + .../devicetree/bindings/iio/light/vcnl4000.txt | 24 + .../bindings/iio/proximity/devantech-srf04.txt | 28 - .../bindings/iio/proximity/devantech-srf04.yaml | 59 ++ .../bindings/iio/proximity/maxbotix,mb1232.txt | 29 + .../bindings/iio/temperature/max31856.txt | 24 + .../iio/temperature/temperature-bindings.txt | 7 + .../bindings/input/touchscreen/stmpe.txt | 116 +++- Documentation/devicetree/bindings/mfd/stmpe.txt | 28 +- .../devicetree/bindings/vendor-prefixes.txt | 2 + MAINTAINERS | 10 +- drivers/iio/Kconfig | 24 +- drivers/iio/accel/Kconfig | 48 +- drivers/iio/accel/bma180.c | 18 +- drivers/iio/accel/bmc150-accel-core.c | 21 + drivers/iio/accel/cros_ec_accel_legacy.c | 40 +- drivers/iio/accel/kxcjk-1013.c | 10 + drivers/iio/accel/kxsd9.c | 4 +- drivers/iio/accel/mma8452.c | 2 +- drivers/iio/accel/st_accel_core.c | 2 +- drivers/iio/adc/Kconfig | 39 +- drivers/iio/adc/Makefile | 2 + drivers/iio/adc/ad7124.c | 2 +- drivers/iio/adc/ad7766.c | 22 +- drivers/{staging => }/iio/adc/ad7780.c | 179 ++++-- drivers/iio/adc/ad7923.c | 24 +- drivers/iio/adc/ad_sigma_delta.c | 16 +- drivers/iio/adc/ingenic-adc.c | 4 +- drivers/iio/adc/lpc32xx_adc.c | 60 +- drivers/iio/adc/meson_saradc.c | 8 + drivers/iio/adc/mxs-lradc-adc.c | 2 + drivers/iio/adc/stm32-dfsdm-adc.c | 628 ++++++++++++++++----- drivers/iio/adc/stm32-dfsdm-core.c | 180 +++++- drivers/iio/adc/stmpe-adc.c | 362 ++++++++++++ drivers/iio/adc/ti-ads7950.c | 219 ++++++- drivers/iio/adc/ti-ads8688.c | 2 +- drivers/iio/buffer/industrialio-buffer-cb.c | 10 +- drivers/iio/chemical/Kconfig | 12 +- drivers/iio/chemical/pms7003.c | 5 + .../iio/common/cros_ec_sensors/cros_ec_sensors.c | 12 +- .../common/cros_ec_sensors/cros_ec_sensors_core.c | 22 +- drivers/iio/common/ms_sensors/Kconfig | 2 +- drivers/iio/common/ssp_sensors/ssp_iio.c | 2 +- drivers/iio/counter/stm32-lptimer-cnt.c | 55 ++ drivers/iio/dac/ad5064.c | 15 +- drivers/iio/dac/ti-dac5571.c | 2 +- drivers/iio/frequency/ad9523.c | 16 +- drivers/iio/gyro/bmg160_core.c | 21 + drivers/iio/gyro/bmg160_i2c.c | 9 + drivers/iio/gyro/itg3200_core.c | 20 + drivers/iio/gyro/mpu3050-core.c | 3 +- drivers/iio/humidity/Kconfig | 20 +- drivers/iio/imu/Makefile | 2 - drivers/iio/imu/{adis16400_core.c => adis16400.c} | 232 +++++++- drivers/iio/imu/adis16400.h | 215 ------- drivers/iio/imu/adis16400_buffer.c | 101 ---- drivers/iio/imu/adis16480.c | 435 +++++++++++++- drivers/iio/imu/adis_buffer.c | 40 ++ drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 10 +- drivers/iio/imu/st_lsm6dsx/Kconfig | 2 +- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 4 + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c | 8 +- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 42 +- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c | 10 + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c | 10 + drivers/iio/industrialio-buffer.c | 24 +- drivers/iio/industrialio-core.c | 46 +- drivers/iio/industrialio-trigger.c | 5 +- drivers/iio/light/Kconfig | 274 ++++----- drivers/iio/light/cros_ec_light_prox.c | 12 +- drivers/iio/light/vcnl4000.c | 77 ++- drivers/iio/magnetometer/ak8974.c | 5 +- drivers/iio/magnetometer/ak8975.c | 13 +- drivers/iio/magnetometer/bmc150_magn.c | 21 + drivers/iio/magnetometer/hmc5843.h | 1 + drivers/iio/magnetometer/hmc5843_core.c | 20 +- drivers/iio/magnetometer/hmc5843_i2c.c | 7 +- drivers/iio/magnetometer/hmc5843_spi.c | 7 +- drivers/iio/potentiometer/Kconfig | 34 +- drivers/iio/potentiostat/lmp91000.c | 14 +- drivers/iio/pressure/bmp280-core.c | 6 + drivers/iio/pressure/cros_ec_baro.c | 11 +- drivers/iio/proximity/Kconfig | 12 + drivers/iio/proximity/Makefile | 1 + drivers/iio/proximity/as3935.c | 50 +- drivers/iio/proximity/mb1232.c | 272 +++++++++ drivers/iio/temperature/Kconfig | 24 +- drivers/iio/temperature/Makefile | 1 + drivers/iio/temperature/max31856.c | 353 ++++++++++++ drivers/iio/trigger/iio-trig-loop.c | 2 +- drivers/input/touchscreen/stmpe-ts.c | 66 +-- drivers/mfd/Kconfig | 3 +- drivers/mfd/stmpe.c | 68 +++ drivers/staging/iio/adc/Kconfig | 13 - drivers/staging/iio/adc/Makefile | 1 - drivers/staging/iio/adc/ad7192.c | 233 +++++--- drivers/staging/iio/adc/ad7192.h | 9 - drivers/staging/iio/adc/ad7280a.c | 109 ++-- drivers/staging/iio/impedance-analyzer/Kconfig | 2 +- drivers/staging/iio/impedance-analyzer/ad5933.c | 54 +- include/dt-bindings/iio/temperature/thermocouple.h | 16 + include/linux/iio/adc/ad_sigma_delta.h | 1 + include/linux/iio/driver.h | 1 + include/linux/iio/frequency/ad9523.h | 8 +- include/linux/iio/gyro/itg3200.h | 1 + include/linux/iio/iio.h | 4 +- include/linux/iio/imu/adis.h | 14 + include/linux/mfd/stmpe.h | 21 + 121 files changed, 4397 insertions(+), 1362 deletions(-) rename {drivers/staging/iio/Documentation => Documentation/ABI/testing}/sysfs-bus-iio-impedance-analyzer-ad5933 (56%) create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-temperature-max31856 create mode 100644 Documentation/devicetree/bindings/iio/accel/kionix,kxcjk1013.txt create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,ad7780.txt create mode 100644 Documentation/devicetree/bindings/iio/adc/stmpe-adc.txt create mode 100644 Documentation/devicetree/bindings/iio/gyroscope/bmg160.txt create mode 100644 Documentation/devicetree/bindings/iio/imu/adi,adis16480.txt create mode 100644 Documentation/devicetree/bindings/iio/light/vcnl4000.txt delete mode 100644 Documentation/devicetree/bindings/iio/proximity/devantech-srf04.txt create mode 100644 Documentation/devicetree/bindings/iio/proximity/devantech-srf04.yaml create mode 100644 Documentation/devicetree/bindings/iio/proximity/maxbotix,mb1232.txt create mode 100644 Documentation/devicetree/bindings/iio/temperature/max31856.txt create mode 100644 Documentation/devicetree/bindings/iio/temperature/temperature-bindings.txt rename drivers/{staging => }/iio/adc/ad7780.c (63%) create mode 100644 drivers/iio/adc/stmpe-adc.c rename drivers/iio/imu/{adis16400_core.c => adis16400.c} (77%) delete mode 100644 drivers/iio/imu/adis16400.h delete mode 100644 drivers/iio/imu/adis16400_buffer.c create mode 100644 drivers/iio/proximity/mb1232.c create mode 100644 drivers/iio/temperature/max31856.c create mode 100644 include/dt-bindings/iio/temperature/thermocouple.h
Quoted 10 lines · Jonathan Cameron
Hi Greg,
There is a merge conflict in here against the previous fixes branch in
industrialio-buffer.c. The resolution I would suggest is to take the cleanup from Andy that is in this branch that moves the code over tobitmap_kzallocavoiding the issue that was fixed in the other branch. I'd not noticed this one sneaking in until I did a test merge a few minutes ago. Sorry about that.Thanks for your help (for this and in general!)
Odd, all I had merge problems with was drivers/iio/adc/stmpe-adc.c due to a patch that was in my tree already for it.
I do have a bunch of "signed-off-by not present warnings" in your tree, when I try to do this merge:
Commit ddb27e1bf24c8db0a8803201aa46b9d26cc815ff
committer SOB missing [email protected] [email protected]
Commit e909fb9e1beec6968ad7dda3081556526a641ea3
committer SOB missing [email protected] [email protected]
Commit 8af18b62c593560c7ce360244fb47be27bb50a32
committer SOB missing [email protected] [email protected]
Commit d848b89bae04ade886320367f510d9f64c3a6e20
committer SOB missing [email protected] [email protected]
Commit ac7358ded6a5f1b6bf29031301bb9f774bf05372
committer SOB missing [email protected] [email protected]
Commit 0af69b0a78eac5a7041674be1736929a91758256
committer SOB missing [email protected] [email protected]
Commit 6c038d0bded5da24f13c509de7f47aba58a3bfc1
author SOB missing
[email protected] [email protected]
Errors in tree with signed-off-by, please fix!
Which is a bunch of errors :(
Can you fix these up for those that you can (i.e. the committers not signing off) and for those patches from authors without a s-o-b at all, we need that before we can take those.
thanks,
greg k-h
Quoted 57 lines · On Tue, 2 Apr 2019 09:14:52 +0200 Greg KH <[email protected]> wrote:
Quoted 10 lines · Jonathan Cameron
Hi Greg,
There is a merge conflict in here against the previous fixes branch in
industrialio-buffer.c. The resolution I would suggest is to take the cleanup from Andy that is in this branch that moves the code over tobitmap_kzallocavoiding the issue that was fixed in the other branch. I'd not noticed this one sneaking in until I did a test merge a few minutes ago. Sorry about that.Thanks for your help (for this and in general!)
Odd, all I had merge problems with was
drivers/iio/adc/stmpe-adc.cdue to a patch that was in my tree already for it.I do have a bunch of "signed-off-by not present warnings" in your tree, when I try to do this merge:
Commit
ddb27e1bf24c8db0a8803201aa46b9d26cc815ff
committer SOB missing [email protected] [email protected]Signed-off-by Stefan Agner <[email protected]>Signed-off-by Max Krummenacher <[email protected]>Signed-off-by Philippe Schenker <[email protected]>Signed-off-by Lee Jones <[email protected]>Commit
e909fb9e1beec6968ad7dda3081556526a641ea3
committer SOB missing [email protected] [email protected]Signed-off-by Stefan Agner <[email protected]>Signed-off-by Max Krummenacher <[email protected]>Signed-off-by Philippe Schenker <[email protected]>Signed-off-by Lee Jones <[email protected]>Commit
8af18b62c593560c7ce360244fb47be27bb50a32
committer SOB missing [email protected] [email protected]Signed-off-by Philippe Schenker <[email protected]>Signed-off-by Lee Jones <[email protected]>Commit
d848b89bae04ade886320367f510d9f64c3a6e20
committer SOB missing [email protected] [email protected]Signed-off-by Stefan Agner <[email protected]>Signed-off-by Max Krummenacher <[email protected]>Signed-off-by Philippe Schenker <[email protected]>Signed-off-by Lee Jones <[email protected]>Commit
ac7358ded6a5f1b6bf29031301bb9f774bf05372
committer SOB missing [email protected] [email protected]Signed-off-by Philippe Schenker <[email protected]>Signed-off-by Lee Jones <[email protected]>Commit
0af69b0a78eac5a7041674be1736929a91758256
committer SOB missing [email protected] [email protected]Signed-off-by Philippe Schenker <[email protected]>Signed-off-by Lee Jones <[email protected]>Commit
6c038d0bded5da24f13c509de7f47aba58a3bfc1
author SOB missing
[email protected] [email protected]
Quoted 8 lines
Signed-off-by Jonathan Cameron <[email protected]>Errors in tree with signed-off-by, please fix!
Which is a bunch of errors :(
Can you fix these up for those that you can (i.e. the committers not signing off) and for those patches from authors without a s-o-b at all, we need that before we can take those.
Will do, I think I know what happened here. I must have rebased across the merge to add a tag and not noticed. So those are actually committed by Lee but I broke my history.
I'll sort out the mess and I completely missed the author one. Sorry about that. Will drop that one until sorted.
Jonathan
Quoted 4 lines
thanks,
greg k-h
Quoted 69 lines · On Tue, 2 Apr 2019 10:57:21 +0100 Jonathan Cameron…
Quoted 57 lines · On Tue, 2 Apr 2019 09:14:52 +0200 Greg KH <[email protected]> wrote:
Quoted 10 lines · Jonathan Cameron
Hi Greg,
There is a merge conflict in here against the previous fixes branch in
industrialio-buffer.c. The resolution I would suggest is to take the cleanup from Andy that is in this branch that moves the code over tobitmap_kzallocavoiding the issue that was fixed in the other branch. I'd not noticed this one sneaking in until I did a test merge a few minutes ago. Sorry about that.Thanks for your help (for this and in general!)
Odd, all I had merge problems with was
drivers/iio/adc/stmpe-adc.cdue to a patch that was in my tree already for it.I do have a bunch of "signed-off-by not present warnings" in your tree, when I try to do this merge:
Commit
ddb27e1bf24c8db0a8803201aa46b9d26cc815ff
committer SOB missing [email protected] [email protected]Signed-off-by Stefan Agner <[email protected]>Signed-off-by Max Krummenacher <[email protected]>Signed-off-by Philippe Schenker <[email protected]>Signed-off-by Lee Jones <[email protected]>Commit
e909fb9e1beec6968ad7dda3081556526a641ea3
committer SOB missing [email protected] [email protected]Signed-off-by Stefan Agner <[email protected]>Signed-off-by Max Krummenacher <[email protected]>Signed-off-by Philippe Schenker <[email protected]>Signed-off-by Lee Jones <[email protected]>Commit
8af18b62c593560c7ce360244fb47be27bb50a32
committer SOB missing [email protected] [email protected]Signed-off-by Philippe Schenker <[email protected]>Signed-off-by Lee Jones <[email protected]>Commit
d848b89bae04ade886320367f510d9f64c3a6e20
committer SOB missing [email protected] [email protected]Signed-off-by Stefan Agner <[email protected]>Signed-off-by Max Krummenacher <[email protected]>Signed-off-by Philippe Schenker <[email protected]>Signed-off-by Lee Jones <[email protected]>Commit
ac7358ded6a5f1b6bf29031301bb9f774bf05372
committer SOB missing [email protected] [email protected]Signed-off-by Philippe Schenker <[email protected]>Signed-off-by Lee Jones <[email protected]>Commit
0af69b0a78eac5a7041674be1736929a91758256
committer SOB missing [email protected] [email protected]Signed-off-by Philippe Schenker <[email protected]>Signed-off-by Lee Jones <[email protected]>Commit
6c038d0bded5da24f13c509de7f47aba58a3bfc1
author SOB missing
[email protected] [email protected]Quoted 8 lines
Signed-off-by Jonathan Cameron <[email protected]>Errors in tree with signed-off-by, please fix!
Which is a bunch of errors :(
Can you fix these up for those that you can (i.e. the committers not signing off) and for those patches from authors without a s-o-b at all, we need that before we can take those.
Quoted 6 lines
Will do, I think I know what happened here. I must have rebased across the merge to add a tag and not noticed. So those are actually committed by Lee but I broke my history.
I'll sort out the mess and I completely missed the author one. Sorry about that. Will drop that one until sorted.
Having fixed it up in the obvious way with the merge back to normal, I realised that I was rebasing most the way back to the beginning of the set anyway, so dropped that plan and just rebased on staging/staging-next.
Pull request shortly.
Thanks,
Jonathan
Quoted 9 lines
Jonathan
Quoted 4 lines
thanks,
greg k-h