Merge tag 'staging-4.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

39272dde · Linus Torvalds <[email protected]> · 2016-01-13 10:13:36 -08:00

Pull staging driver updates from Greg KH:
 "Here is the big staging driver pull request for 4.5-rc1.

  Lots of cleanups and fixes here, not as many as some releases, but
  800+ isn't that bad.  Full details in the shortlog.  All of these have
  been in linux-next for a while"

* tag 'staging-4.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (843 commits)
  Revert "arm64: dts: Add dts files to enable ION on Hi6220 SoC."
  staging: gdm724x: constify tty_port_operations structs
  staging: gdm72xx: add userspace data struct
  staging: gdm72xx: Replace timeval with ktime_t
  iio: adc: ina2xx: Fix incorrect report of data endianness to userspace.
  iio: light: us5182d: Refactor read_raw function
  iio: light: us5182d: Add interrupt support and events
  iio: light: us5182d: Fix enable status inconcistency
  iio: Make IIO value formating function globally available.
  staging: emxx_udc: use list_first_entry_or_null()
  staging/emxx_udc: fix 64-bit warnings
  STAGING: COMEDI: Using kernel types in plx9080.h
  STAGING: COMEDI: Added spaces around binary operators in plx9080.h
  STAGING: COMEDI: Fixed format of comments in plx9080.h
  staging: comedi: comedilib.h: Coding style warning fix for block comments
  staging: comedi: s526: add macros for counter control reg values
  staging: comedi: s526: replace counter mode bitfield struct
  staging: comedi: check for more errors for zero-length write
  staging: comedi: simplify returned errors for comedi_write()
  staging: comedi: return error on "write" if no command set up
  ...

Commit: 39272dde8ffcfd1322209e05f3f8fa4d14f796de
Parents: 67ad058d · 841e3ed9

Merge commit. Changes below are compared with the first parent: 67ad058d.

Changes

504 files changed · +20904 −13960

File	Status	Add	Del	Content
Documentation/ABI/testing/configfs-iio	added	+21	−0	View file
Documentation/ABI/testing/sysfs-bus-iio-ina2xx-adc	added	+24	−0	View file
Documentation/devicetree/bindings/i2c/trivial-devices.txt	modified	+1	−0	View file
Documentation/devicetree/bindings/iio/accel/mma8452.txt	modified	+6	−0	View file
Documentation/devicetree/bindings/iio/adc/imx7d-adc.txt	added	+22	−0	View file
Documentation/devicetree/bindings/iio/adc/mcp320x.txt	modified	+21	−9	View file
Documentation/devicetree/bindings/iio/adc/mcp3422.txt	modified	+2	−1	View file
Documentation/devicetree/bindings/iio/adc/palmas-gpadc.txt	added	+48	−0	View file
Documentation/devicetree/bindings/iio/adc/ti-adc128s052.txt	modified	+2	−2	View file
Documentation/devicetree/bindings/iio/adc/ti-ads8688.txt	added	+20	−0	View file
Documentation/devicetree/bindings/iio/health/max30100.txt	added	+21	−0	View file
Documentation/devicetree/bindings/iio/light/us5182d.txt	modified	+11	−0	View file
Documentation/devicetree/bindings/iio/st-sensors.txt	modified	+1	−0	View file
Documentation/devicetree/bindings/staging/ion/hi6220-ion.txt	added	+31	−0	View file
Documentation/iio/iio_configfs.txt	added	+93	−0	View file
drivers/iio/Kconfig	modified	+18	−0	View file
drivers/iio/Makefile	modified	+4	−0	View file
drivers/iio/accel/Kconfig	modified	+41	−1	View file
drivers/iio/accel/Makefile	modified	+6	−0	View file
drivers/iio/accel/bmc150-accel-core.c	modified	+9	−11	View file
drivers/iio/accel/kxcjk-1013.c	modified	+9	−11	View file
drivers/iio/accel/mma7455.h	added	+19	−0	View file
drivers/iio/accel/mma7455_core.c	added	+311	−0	View file
drivers/iio/accel/mma7455_i2c.c	added	+56	−0	View file
drivers/iio/accel/mma7455_spi.c	added	+52	−0	View file
drivers/iio/accel/mma8452.c	modified	+38	−23	View file
drivers/iio/accel/mma9551.c	modified	+9	−10	View file
drivers/iio/accel/mma9553.c	modified	+9	−11	View file
drivers/iio/accel/mxc6255.c	added	+198	−0	View file
drivers/iio/accel/st_accel.h	modified	+1	−0	View file
drivers/iio/accel/st_accel_core.c	modified	+1	−0	View file
drivers/iio/accel/st_accel_i2c.c	modified	+5	−0	View file
drivers/iio/accel/st_accel_spi.c	modified	+1	−0	View file
drivers/iio/adc/Kconfig	modified	+40	−3	View file
drivers/iio/adc/Makefile	modified	+4	−0	View file
drivers/iio/adc/ad7793.c	modified	+2	−3	View file
drivers/iio/adc/at91_adc.c	modified	+1	−1	View file
drivers/iio/adc/imx7d_adc.c	added	+609	−0	View file
drivers/iio/adc/ina2xx-adc.c	added	+745	−0	View file
drivers/iio/adc/mcp320x.c	modified	+28	−0	View file
drivers/iio/adc/mcp3422.c	modified	+9	−0	View file
drivers/iio/adc/palmas_gpadc.c	added	+859	−0	View file
drivers/iio/adc/ti-adc128s052.c	modified	+12	−1	View file
drivers/iio/adc/ti-ads8688.c	added	+486	−0	View file
drivers/iio/adc/xilinx-xadc-core.c	modified	+1	−1	View file
drivers/iio/buffer/Kconfig	modified	+20	−0	View file
drivers/iio/buffer/Makefile	modified	+2	−0	View file
drivers/iio/buffer/industrialio-buffer-dma.c	added	+683	−0	View file
drivers/iio/buffer/industrialio-buffer-dmaengine.c	added	+213	−0	View file
drivers/iio/chemical/Kconfig	modified	+8	−0	View file
drivers/iio/chemical/Makefile	modified	+1	−0	View file
drivers/iio/chemical/ams-iaq-core.c	added	+200	−0	View file
drivers/iio/chemical/vz89x.c	modified	+52	−14	View file
drivers/iio/common/st_sensors/st_sensors_core.c	modified	+0	−3	View file
drivers/iio/dummy/Kconfig	added	+36	−0	View file
drivers/iio/dummy/Makefile	added	+10	−0	View file
drivers/staging/iio/iio_dummy_evgen.c → drivers/iio/dummy/iio_dummy_evgen.c	renamed	+0	−0	View file
drivers/staging/iio/iio_dummy_evgen.h → drivers/iio/dummy/iio_dummy_evgen.h	renamed	+0	−0	View file
drivers/staging/iio/iio_simple_dummy.c → drivers/iio/dummy/iio_simple_dummy.c	renamed	+0	−0	View file
drivers/staging/iio/iio_simple_dummy.h → drivers/iio/dummy/iio_simple_dummy.h	renamed	+0	−0	View file
drivers/staging/iio/iio_simple_dummy_buffer.c → drivers/iio/dummy/iio_simple_dummy_buffer.c	renamed	+0	−0	View file
drivers/staging/iio/iio_simple_dummy_events.c → drivers/iio/dummy/iio_simple_dummy_events.c	renamed	+0	−0	View file
drivers/iio/gyro/adis16136.c	modified	+3	−1	View file
drivers/iio/gyro/bmg160_core.c	modified	+9	−10	View file
drivers/iio/health/Kconfig	added	+21	−0	View file
drivers/iio/health/Makefile	added	+7	−0	View file
drivers/iio/health/max30100.c	added	+453	−0	View file
drivers/iio/imu/adis16400_core.c	modified	+5	−1	View file
drivers/iio/imu/adis16480.c	modified	+3	−1	View file
drivers/iio/imu/kmx61.c	modified	+11	−13	View file
drivers/iio/industrialio-buffer.c	modified	+52	−6	View file
drivers/iio/industrialio-configfs.c	added	+51	−0	View file
drivers/iio/industrialio-core.c	modified	+10	−0	View file
drivers/iio/industrialio-sw-trigger.c	added	+184	−0	View file
drivers/iio/inkern.c	modified	+2	−4	View file
drivers/iio/light/lm3533-als.c	modified	+3	−1	View file
drivers/iio/light/pa12203001.c	modified	+11	−5	View file
drivers/iio/light/rpr0521.c	modified	+4	−10	View file
drivers/iio/light/us5182d.c	modified	+546	−63	View file
drivers/iio/magnetometer/bmc150_magn.c	modified	+9	−11	View file
drivers/iio/proximity/pulsedlight-lidar-lite-v2.c	modified	+125	−26	View file
drivers/iio/trigger/Kconfig	modified	+10	−0	View file
drivers/iio/trigger/Makefile	modified	+2	−0	View file
drivers/iio/trigger/iio-trig-hrtimer.c	added	+193	−0	View file
drivers/staging/android/TODO	modified	+8	−0	View file
drivers/staging/android/ashmem.c	modified	+11	−4	View file
drivers/staging/android/ion/Kconfig	modified	+7	−0	View file
drivers/staging/android/ion/Makefile	modified	+1	−0	View file
drivers/staging/android/ion/compat_ion.c	modified	+3	−3	View file
drivers/staging/android/ion/hisilicon/Kconfig	added	+5	−0	View file
drivers/staging/android/ion/hisilicon/Makefile	added	+1	−0	View file
drivers/staging/android/ion/hisilicon/hi6220_ion.c	added	+223	−0	View file
drivers/staging/android/lowmemorykiller.c	modified	+3	−3	View file
drivers/staging/android/sync.c	modified	+22	−19	View file
drivers/staging/android/sync.h	modified	+10	−0	View file
drivers/staging/android/sync_debug.c	modified	+22	−20	View file
drivers/staging/android/timed_gpio.c	modified	+5	−6	View file
drivers/staging/comedi/Kconfig	modified	+20	−4	View file
drivers/staging/comedi/comedi.h	modified	+177	−130	View file
drivers/staging/comedi/comedi_fops.c	modified	+56	−68	View file
drivers/staging/comedi/comedilib.h	modified	+16	−16	View file
drivers/staging/comedi/drivers/Makefile	modified	+2	−0	View file
drivers/staging/comedi/drivers/adl_pci9118.c	modified	+2	−1	View file
drivers/staging/comedi/drivers/adv_pci1710.c	modified	+211	−331	View file
drivers/staging/comedi/drivers/adv_pci1720.c	added	+195	−0	View file
drivers/staging/comedi/drivers/adv_pci1760.c	added	+432	−0	View file
drivers/staging/comedi/drivers/adv_pci_dio.c	modified	+263	−862	View file
drivers/staging/comedi/drivers/amplc_pci224.c	modified	+7	−4	View file
drivers/staging/comedi/drivers/cb_pcidda.c	modified	+3	−3	View file
drivers/staging/comedi/drivers/comedi_parport.c	modified	+2	−2	View file
drivers/staging/comedi/drivers/das16.c	modified	+2	−1	View file
drivers/staging/comedi/drivers/ni_6527.c	modified	+12	−12	View file
drivers/staging/comedi/drivers/ni_65xx.c	modified	+27	−27	View file
drivers/staging/comedi/drivers/ni_670x.c	modified	+3	−2	View file
drivers/staging/comedi/drivers/ni_mio_common.c	modified	+62	−38	View file
drivers/staging/comedi/drivers/plx9080.h	modified	+80	−46	View file
drivers/staging/comedi/drivers/s526.c	modified	+130	−67	View file
drivers/staging/dgnc/dgnc_cls.c	modified	+1	−1	View file
drivers/staging/dgnc/dgnc_neo.c	modified	+5	−5	View file
drivers/staging/dgnc/dgnc_tty.c	modified	+1	−1	View file
drivers/staging/dgnc/dgnc_utils.c	modified	+0	−1	View file
drivers/staging/emxx_udc/emxx_udc.c	modified	+10	−30	View file
drivers/staging/fwserial/fwserial.c	modified	+1	−2	View file
drivers/staging/fwserial/fwserial.h	modified	+0	−10	View file
drivers/staging/gdm724x/gdm_lte.c	modified	+1	−1	View file
drivers/staging/gdm724x/gdm_tty.c	modified	+1	−1	View file
drivers/staging/gdm724x/netlink_k.c	modified	+0	−5	View file
drivers/staging/gdm724x/netlink_k.h	modified	+0	−1	View file
drivers/staging/gdm72xx/gdm_qos.c	modified	+26	−26	View file
drivers/staging/gdm72xx/gdm_sdio.c	modified	+6	−7	View file
drivers/staging/gdm72xx/gdm_sdio.h	modified	+2	−2	View file
drivers/staging/gdm72xx/gdm_wimax.c	modified	+10	−11	View file
drivers/staging/gdm72xx/wm_ioctl.h	modified	+6	−1	View file
drivers/staging/iio/Kconfig	modified	+0	−29	View file
drivers/staging/iio/Makefile	modified	+0	−7	View file
drivers/staging/iio/accel/sca3000_ring.c	modified	+1	−1	View file
drivers/staging/iio/adc/ad7192.c	modified	+1	−1	View file
drivers/staging/iio/adc/ad7280a.c	modified	+1	−1	View file
drivers/staging/iio/adc/ad7780.c	modified	+13	−23	View file
drivers/staging/iio/adc/ad7780.h	deleted	+0	−30	View before deletion
drivers/staging/iio/adc/ad7816.c	modified	+1	−1	View file
drivers/staging/iio/adc/mxs-lradc.c	modified	+2	−2	View file
drivers/staging/iio/frequency/ad9832.c	modified	+1	−1	View file
drivers/staging/iio/frequency/ad9834.c	modified	+1	−1	View file
drivers/staging/iio/light/tsl2x7x_core.c	modified	+1	−1	View file
drivers/staging/lustre/include/linux/libcfs/libcfs.h	modified	+1	−8	View file
drivers/staging/lustre/include/linux/libcfs/libcfs_cpu.h	modified	+2	−1	View file
drivers/staging/lustre/include/linux/libcfs/libcfs_hash.h	modified	+74	−82	View file
drivers/staging/lustre/include/linux/libcfs/libcfs_kernelcomm.h	modified	+1	−1	View file
drivers/staging/lustre/include/linux/libcfs/libcfs_private.h	modified	+0	−2	View file
drivers/staging/lustre/include/linux/lnet/api.h	modified	+0	−6	View file
drivers/staging/lustre/include/linux/lnet/lib-lnet.h	modified	+1	−1	View file
drivers/staging/lustre/include/linux/lnet/lib-types.h	modified	+1	−1	View file
drivers/staging/lustre/include/linux/lnet/nidstr.h	modified	+1	−1	View file
drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c	modified	+2	−2	View file
drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h	modified	+1	−1	View file
drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c	modified	+1	−1	View file
drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c	modified	+7	−6	View file
drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h	modified	+3	−0	View file
drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib.c	modified	+0	−2	View file
drivers/staging/lustre/lnet/lnet/acceptor.c	modified	+1	−1	View file
drivers/staging/lustre/lnet/lnet/api-ni.c	modified	+6	−15	View file
drivers/staging/lustre/lnet/lnet/config.c	modified	+11	−15	View file
drivers/staging/lustre/lnet/lnet/lib-eq.c	modified	+0	−18	View file
drivers/staging/lustre/lnet/lnet/lib-move.c	modified	+1	−2	View file
drivers/staging/lustre/lnet/lnet/lib-ptl.c	modified	+1	−1	View file
drivers/staging/lustre/lnet/lnet/lib-socket.c	modified	+1	−1	View file
drivers/staging/lustre/lnet/lnet/module.c	modified	+2	−2	View file
drivers/staging/lustre/lnet/lnet/router.c	modified	+1	−1	View file
drivers/staging/lustre/lnet/selftest/brw_test.c	modified	+3	−3	View file
drivers/staging/lustre/lnet/selftest/conctl.c	modified	+0	−2	View file
drivers/staging/lustre/lnet/selftest/conrpc.c	modified	+2	−2	View file
drivers/staging/lustre/lnet/selftest/console.c	modified	+41	−47	View file
drivers/staging/lustre/lnet/selftest/framework.c	modified	+4	−4	View file
drivers/staging/lustre/lnet/selftest/rpc.c	modified	+9	−16	View file
drivers/staging/lustre/lnet/selftest/selftest.h	modified	+8	−8	View file
drivers/staging/lustre/lustre/fid/fid_internal.h	modified	+0	−2	View file
drivers/staging/lustre/lustre/fid/fid_request.c	modified	+2	−23	View file
drivers/staging/lustre/lustre/fid/lproc_fid.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/fld/fld_cache.c	modified	+4	−31	View file
drivers/staging/lustre/lustre/fld/fld_internal.h	modified	+1	−10	View file
drivers/staging/lustre/lustre/fld/fld_request.c	modified	+2	−2	View file
drivers/staging/lustre/lustre/fld/lproc_fld.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/include/cl_object.h	modified	+1	−2	View file
drivers/staging/lustre/lustre/include/lprocfs_status.h	modified	+1	−4	View file
drivers/staging/lustre/lustre/include/lu_object.h	modified	+1	−1	View file
drivers/staging/lustre/lustre/include/lustre/ll_fiemap.h	modified	+2	−0	View file
drivers/staging/lustre/lustre/include/lustre/lustre_idl.h	modified	+1	−1	View file
drivers/staging/lustre/lustre/include/lustre/lustre_user.h	modified	+1	−1	View file
drivers/staging/lustre/lustre/include/lustre_disk.h	modified	+1	−0	View file
drivers/staging/lustre/lustre/include/lustre_dlm.h	modified	+1	−3	View file
drivers/staging/lustre/lustre/include/lustre_eacl.h	modified	+0	−2	View file
drivers/staging/lustre/lustre/include/lustre_export.h	modified	+1	−1	View file
drivers/staging/lustre/lustre/include/lustre_fid.h	modified	+1	−1	View file
drivers/staging/lustre/lustre/include/lustre_fld.h	modified	+1	−1	View file
drivers/staging/lustre/lustre/include/lustre_ha.h	modified	+1	−1	View file
drivers/staging/lustre/lustre/include/lustre_log.h	modified	+1	−4	View file
drivers/staging/lustre/lustre/include/lustre_mds.h	modified	+0	−6	View file
drivers/staging/lustre/lustre/include/lustre_net.h	modified	+1	−1	View file
drivers/staging/lustre/lustre/include/lustre_param.h	modified	+1	−1	View file
drivers/staging/lustre/lustre/include/lustre_req_layout.h	modified	+1	−1	View file
drivers/staging/lustre/lustre/include/obd.h	modified	+162	−162	View file
drivers/staging/lustre/lustre/include/obd_cksum.h	modified	+0	−23	View file
drivers/staging/lustre/lustre/include/obd_class.h	modified	+9	−9	View file
drivers/staging/lustre/lustre/include/obd_support.h	modified	+1	−1	View file
drivers/staging/lustre/lustre/lclient/lcommon_cl.c	modified	+3	−3	View file
drivers/staging/lustre/lustre/ldlm/interval_tree.c	modified	+2	−14	View file
drivers/staging/lustre/lustre/ldlm/ldlm_extent.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/ldlm/ldlm_internal.h	modified	+1	−1	View file
drivers/staging/lustre/lustre/ldlm/ldlm_lib.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/ldlm/ldlm_lock.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/ldlm/ldlm_pool.c	modified	+17	−32	View file
drivers/staging/lustre/lustre/ldlm/ldlm_request.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/ldlm/ldlm_resource.c	modified	+1	−3	View file
drivers/staging/lustre/lustre/libcfs/debug.c	modified	+3	−20	View file
drivers/staging/lustre/lustre/libcfs/fail.c	modified	+2	−2	View file
drivers/staging/lustre/lustre/libcfs/hash.c	modified	+182	−201	View file
drivers/staging/lustre/lustre/libcfs/kernel_user_comm.c	modified	+2	−1	View file
drivers/staging/lustre/lustre/libcfs/libcfs_lock.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/libcfs/libcfs_mem.c	modified	+0	−2	View file
drivers/staging/lustre/lustre/libcfs/libcfs_string.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/libcfs/linux/linux-cpu.c	modified	+9	−24	View file
drivers/staging/lustre/lustre/libcfs/linux/linux-crypto-adler.c	modified	+2	−7	View file
drivers/staging/lustre/lustre/libcfs/linux/linux-curproc.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/libcfs/linux/linux-debug.c	modified	+0	−1	View file
drivers/staging/lustre/lustre/libcfs/linux/linux-tracefile.h	deleted	+0	−48	View before deletion
drivers/staging/lustre/lustre/libcfs/module.c	modified	+4	−4	View file
drivers/staging/lustre/lustre/libcfs/tracefile.c	modified	+4	−23	View file
drivers/staging/lustre/lustre/libcfs/tracefile.h	modified	+6	−23	View file
drivers/staging/lustre/lustre/libcfs/workitem.c	modified	+24	−34	View file
drivers/staging/lustre/lustre/llite/dcache.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/llite/dir.c	modified	+4	−9	View file
drivers/staging/lustre/lustre/llite/file.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/llite/llite_internal.h	modified	+1	−11	View file
drivers/staging/lustre/lustre/llite/llite_lib.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/llite/llite_mmap.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/llite/lloop.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/llite/lproc_llite.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/llite/namei.c	modified	+1	−2	View file
drivers/staging/lustre/lustre/llite/rw.c	modified	+4	−10	View file
drivers/staging/lustre/lustre/llite/rw26.c	modified	+4	−1	View file
drivers/staging/lustre/lustre/llite/statahead.c	modified	+32	−46	View file
drivers/staging/lustre/lustre/llite/super25.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/llite/vvp_dev.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/llite/vvp_internal.h	modified	+2	−0	View file
drivers/staging/lustre/lustre/llite/vvp_io.c	modified	+2	−2	View file
drivers/staging/lustre/lustre/llite/vvp_lock.c	modified	+2	−0	View file
drivers/staging/lustre/lustre/llite/vvp_object.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/llite/vvp_page.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/llite/xattr.c	modified	+5	−2	View file
drivers/staging/lustre/lustre/llite/xattr_cache.c	modified	+2	−0	View file
drivers/staging/lustre/lustre/lmv/lmv_intent.c	modified	+12	−11	View file
drivers/staging/lustre/lustre/lmv/lmv_internal.h	modified	+1	−15	View file
drivers/staging/lustre/lustre/lmv/lmv_obd.c	modified	+48	−48	View file
drivers/staging/lustre/lustre/lov/lov_cl_internal.h	modified	+1	−1	View file
drivers/staging/lustre/lustre/lov/lov_dev.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/lov/lov_ea.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/lov/lov_internal.h	modified	+1	−16	View file
drivers/staging/lustre/lustre/lov/lov_io.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/lov/lov_merge.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/lov/lov_obd.c	modified	+31	−31	View file
drivers/staging/lustre/lustre/lov/lov_object.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/lov/lov_offset.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/lov/lov_pack.c	modified	+2	−15	View file
drivers/staging/lustre/lustre/lov/lov_page.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/lov/lov_pool.c	modified	+1	−2	View file
drivers/staging/lustre/lustre/lov/lov_request.c	modified	+10	−8	View file
drivers/staging/lustre/lustre/lov/lovsub_dev.c	modified	+2	−0	View file
drivers/staging/lustre/lustre/lov/lovsub_object.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/lov/lproc_lov.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/mdc/lproc_mdc.c	modified	+1	−78	View file
drivers/staging/lustre/lustre/mdc/mdc_internal.h	modified	+1	−16	View file
drivers/staging/lustre/lustre/mdc/mdc_lib.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/mdc/mdc_locks.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/mdc/mdc_reint.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/mdc/mdc_request.c	modified	+64	−77	View file
drivers/staging/lustre/lustre/mgc/mgc_request.c	modified	+18	−18	View file
drivers/staging/lustre/lustre/obdclass/acl.c	modified	+0	−9	View file
drivers/staging/lustre/lustre/obdclass/cl_io.c	modified	+9	−19	View file
drivers/staging/lustre/lustre/obdclass/cl_lock.c	modified	+1	−2	View file
drivers/staging/lustre/lustre/obdclass/cl_object.c	modified	+2	−3	View file
drivers/staging/lustre/lustre/obdclass/cl_page.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/obdclass/class_obd.c	modified	+2	−2	View file
drivers/staging/lustre/lustre/obdclass/genops.c	modified	+4	−4	View file
drivers/staging/lustre/lustre/obdclass/linux/linux-sysctl.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/obdclass/llog.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/obdclass/llog_cat.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/obdclass/llog_internal.h	modified	+1	−1	View file
drivers/staging/lustre/lustre/obdclass/llog_obd.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/obdclass/llog_swab.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/obdclass/lprocfs_status.c	modified	+13	−10	View file
drivers/staging/lustre/lustre/obdclass/lu_object.c	modified	+2	−2	View file
drivers/staging/lustre/lustre/obdclass/obd_config.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/obdclass/obd_mount.c	modified	+8	−4	View file
drivers/staging/lustre/lustre/obdecho/echo_client.c	modified	+10	−8	View file
drivers/staging/lustre/lustre/osc/lproc_osc.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/osc/osc_cache.c	modified	+6	−6	View file
drivers/staging/lustre/lustre/osc/osc_cl_internal.h	modified	+1	−1	View file
drivers/staging/lustre/lustre/osc/osc_dev.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/osc/osc_internal.h	modified	+1	−7	View file
drivers/staging/lustre/lustre/osc/osc_io.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/osc/osc_lock.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/osc/osc_object.c	modified	+3	−3	View file
drivers/staging/lustre/lustre/osc/osc_page.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/osc/osc_quota.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/osc/osc_request.c	modified	+37	−36	View file
drivers/staging/lustre/lustre/ptlrpc/client.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/ptlrpc/events.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/ptlrpc/import.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/ptlrpc/layout.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/ptlrpc/llog_client.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c	modified	+4	−4	View file
drivers/staging/lustre/lustre/ptlrpc/niobuf.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/ptlrpc/pers.c	modified	+2	−0	View file
drivers/staging/lustre/lustre/ptlrpc/pinger.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/ptlrpc/ptlrpc_internal.h	modified	+1	−4	View file
drivers/staging/lustre/lustre/ptlrpc/ptlrpc_module.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c	modified	+2	−1	View file
drivers/staging/lustre/lustre/ptlrpc/recover.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/ptlrpc/sec_config.c	modified	+2	−3	View file
drivers/staging/lustre/lustre/ptlrpc/sec_plain.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/ptlrpc/service.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/ptlrpc/wiretest.c	modified	+1	−1	View file
drivers/staging/media/bcm2048/radio-bcm2048.c	modified	+189	−204	View file
drivers/staging/most/aim-network/networking.h	modified	+0	−2	View file
drivers/staging/most/hdm-dim2/dim2_errors.h	modified	+0	−2	View file
drivers/staging/most/hdm-dim2/dim2_hal.c	modified	+67	−66	View file
drivers/staging/most/hdm-dim2/dim2_hal.h	modified	+25	−28	View file
drivers/staging/most/hdm-dim2/dim2_hdm.c	modified	+29	−31	View file
drivers/staging/most/hdm-dim2/dim2_reg.h	modified	+1	−4	View file
drivers/staging/most/hdm-dim2/dim2_sysfs.h	modified	+0	−3	View file
drivers/staging/most/mostcore/core.c	modified	+1	−2	View file
drivers/staging/most/mostcore/mostcore.h	modified	+0	−2	View file
drivers/staging/nvec/README	modified	+1	−1	View file
drivers/staging/nvec/nvec.c	modified	+10	−10	View file
drivers/staging/octeon/ethernet-defines.h	modified	+1	−1	View file
drivers/staging/rdma/amso1100/c2.c	modified	+8	−9	View file
drivers/staging/rdma/amso1100/c2.h	modified	+40	−40	View file
drivers/staging/rdma/amso1100/c2_mq.h	modified	+7	−7	View file
drivers/staging/rdma/amso1100/c2_provider.c	modified	+2	−8	View file
drivers/staging/rdma/amso1100/c2_rnic.c	modified	+1	−4	View file
drivers/staging/rdma/amso1100/c2_vq.h	modified	+10	−10	View file
drivers/staging/rdma/ehca/ehca_av.c	modified	+4	−2	View file
drivers/staging/rdma/ehca/ehca_cq.c	modified	+1	−2	View file
drivers/staging/rdma/ehca/ehca_main.c	modified	+1	−2	View file
drivers/staging/rdma/ehca/ehca_mrmw.c	modified	+2	−4	View file
drivers/staging/rdma/ehca/ehca_pd.c	modified	+1	−2	View file
drivers/staging/rdma/ehca/ehca_qp.c	modified	+1	−2	View file
drivers/staging/rdma/hfi1/Makefile	modified	+1	−1	View file
drivers/staging/rdma/hfi1/chip.c	modified	+3486	−200	View file
drivers/staging/rdma/hfi1/chip.h	modified	+271	−2	View file
drivers/staging/rdma/hfi1/chip_registers.h	modified	+3	−1	View file
drivers/staging/rdma/hfi1/common.h	modified	+8	−7	View file
drivers/staging/rdma/hfi1/diag.c	modified	+242	−257	View file
drivers/staging/rdma/hfi1/driver.c	modified	+144	−71	View file
drivers/staging/rdma/hfi1/efivar.c	added	+169	−0	View file
drivers/staging/rdma/hfi1/efivar.h	added	+60	−0	View file
drivers/staging/rdma/hfi1/eprom.c	modified	+67	−52	View file
drivers/staging/rdma/hfi1/file_ops.c	modified	+100	−107	View file
drivers/staging/rdma/hfi1/firmware.c	modified	+159	−34	View file
drivers/staging/rdma/hfi1/hfi.h	modified	+60	−44	View file
drivers/staging/rdma/hfi1/init.c	modified	+74	−27	View file
drivers/staging/rdma/hfi1/iowait.h	modified	+4	−2	View file
drivers/staging/rdma/hfi1/mad.c	modified	+91	−136	View file
drivers/staging/rdma/hfi1/mad.h	modified	+114	−0	View file
drivers/staging/rdma/hfi1/pcie.c	modified	+14	−22	View file
drivers/staging/rdma/hfi1/pio.c	modified	+51	−17	View file
drivers/staging/rdma/hfi1/pio.h	modified	+1	−1	View file
drivers/staging/rdma/hfi1/pio_copy.c	modified	+4	−2	View file
drivers/staging/rdma/hfi1/qp.c	modified	+42	−6	View file
drivers/staging/rdma/hfi1/qp.h	modified	+41	−5	View file
drivers/staging/rdma/hfi1/qsfp.c	modified	+2	−3	View file
drivers/staging/rdma/hfi1/rc.c	modified	+47	−34	View file
drivers/staging/rdma/hfi1/ruc.c	modified	+17	−38	View file
drivers/staging/rdma/hfi1/sdma.c	modified	+33	−34	View file
drivers/staging/rdma/hfi1/sdma.h	modified	+10	−5	View file
drivers/staging/rdma/hfi1/trace.c	modified	+22	−7	View file
drivers/staging/rdma/hfi1/trace.h	modified	+2	−1	View file
drivers/staging/rdma/hfi1/uc.c	modified	+9	−6	View file
drivers/staging/rdma/hfi1/ud.c	modified	+12	−10	View file
drivers/staging/rdma/hfi1/user_exp_rcv.h	added	+74	−0	View file
drivers/staging/rdma/hfi1/user_pages.c	modified	+26	−71	View file
drivers/staging/rdma/hfi1/user_sdma.c	modified	+211	−152	View file
drivers/staging/rdma/hfi1/user_sdma.h	modified	+3	−9	View file
drivers/staging/rdma/hfi1/verbs.c	modified	+67	−63	View file
drivers/staging/rdma/hfi1/verbs.h	modified	+29	−21	View file
drivers/staging/rdma/ipath/ipath_file_ops.c	modified	+4	−4	View file
drivers/staging/rtl8188eu/core/rtw_ap.c	modified	+1	−53	View file
drivers/staging/rtl8188eu/core/rtw_cmd.c	modified	+26	−74	View file
drivers/staging/rtl8188eu/core/rtw_efuse.c	modified	+2	−2	View file
drivers/staging/rtl8188eu/core/rtw_ioctl_set.c	modified	+0	−7	View file
drivers/staging/rtl8188eu/core/rtw_mlme.c	modified	+9	−13	View file
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c	modified	+51	−33	View file
drivers/staging/rtl8188eu/core/rtw_pwrctrl.c	modified	+7	−7	View file
drivers/staging/rtl8188eu/core/rtw_xmit.c	modified	+3	−8	View file
drivers/staging/rtl8188eu/hal/fw.c	modified	+14	−26	View file
drivers/staging/rtl8188eu/hal/hal_com.c	modified	+7	−7	View file
drivers/staging/rtl8188eu/hal/rtl8188e_dm.c	modified	+1	−1	View file
drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c	modified	+4	−3	View file
drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c	modified	+15	−19	View file
drivers/staging/rtl8188eu/hal/usb_halinit.c	modified	+6	−4	View file
drivers/staging/rtl8188eu/include/HalVerDef.h	modified	+0	−33	View file
drivers/staging/rtl8188eu/include/osdep_service.h	modified	+0	−2	View file
drivers/staging/rtl8188eu/include/rtw_xmit.h	modified	+0	−1	View file
drivers/staging/rtl8188eu/os_dep/os_intfs.c	modified	+6	−4	View file
drivers/staging/rtl8188eu/os_dep/osdep_service.c	modified	+0	−6	View file
drivers/staging/rtl8188eu/os_dep/usb_intf.c	modified	+4	−4	View file
drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c	modified	+2	−3	View file
drivers/staging/rtl8192u/r8192U_core.c	modified	+0	−15	View file
drivers/staging/rtl8192u/r819xU_phy.c	modified	+5	−20	View file
drivers/staging/rtl8712/rtl871x_mlme.c	modified	+1	−7	View file
drivers/staging/rtl8723au/core/rtw_efuse.c	modified	+2	−43	View file
drivers/staging/sm750fb/modedb.h	deleted	+0	−233	View before deletion
drivers/staging/sm750fb/sm750.c	modified	+0	−2	View file
drivers/staging/unisys/include/channel.h	modified	+67	−47	View file
drivers/staging/unisys/include/iochannel.h	modified	+64	−93	View file
drivers/staging/unisys/include/vbushelper.h	modified	+2	−1	View file
drivers/staging/unisys/include/visorbus.h	modified	+2	−2	View file
drivers/staging/unisys/visorbus/Kconfig	modified	+6	−1	View file
drivers/staging/unisys/visorbus/controlvmcompletionstatus.h	modified	+16	−8	View file
drivers/staging/unisys/visorbus/periodic_work.c	modified	+6	−5	View file
drivers/staging/unisys/visorbus/vbuschannel.h	modified	+5	−4	View file
drivers/staging/unisys/visorbus/visorbus_main.c	modified	+10	−5	View file
drivers/staging/unisys/visorbus/visorchannel.c	modified	+2	−2	View file
drivers/staging/unisys/visorbus/vmcallinterface.h	modified	+15	−19	View file
drivers/staging/unisys/visorhba/visorhba_main.c	modified	+4	−12	View file
drivers/staging/unisys/visorinput/Kconfig	modified	+6	−1	View file
drivers/staging/unisys/visorinput/visorinput.c	modified	+1	−3	View file
drivers/staging/unisys/visornic/visornic_main.c	modified	+0	−1	View file
drivers/staging/vme/devices/vme_pio2_cntr.c	modified	+1	−1	View file
drivers/staging/vme/devices/vme_pio2_core.c	modified	+11	−11	View file
drivers/staging/vme/devices/vme_pio2_gpio.c	modified	+15	−17	View file
drivers/staging/vme/devices/vme_user.c	modified	+11	−11	View file
drivers/staging/vme/devices/vme_user.h	modified	+0	−2	View file
drivers/staging/vt6656/baseband.c	modified	+0	−4	View file
drivers/staging/vt6656/baseband.h	modified	+0	−4	View file
drivers/staging/vt6656/card.c	modified	+0	−3	View file
drivers/staging/vt6656/card.h	modified	+0	−3	View file
drivers/staging/vt6656/channel.c	modified	+0	−4	View file
drivers/staging/vt6656/channel.h	modified	+0	−4	View file
drivers/staging/vt6656/desc.h	modified	+0	−3	View file
drivers/staging/vt6656/device.h	modified	+0	−3	View file
drivers/staging/vt6656/dpc.c	modified	+0	−3	View file
drivers/staging/vt6656/dpc.h	modified	+0	−3	View file
drivers/staging/vt6656/firmware.c	modified	+0	−4	View file
drivers/staging/vt6656/firmware.h	modified	+0	−4	View file
drivers/staging/vt6656/int.c	modified	+0	−4	View file
drivers/staging/vt6656/int.h	modified	+0	−4	View file
drivers/staging/vt6656/key.c	modified	+0	−5	View file
drivers/staging/vt6656/key.h	modified	+0	−4	View file
drivers/staging/vt6656/mac.c	modified	+0	−4	View file
drivers/staging/vt6656/mac.h	modified	+0	−4	View file
drivers/staging/vt6656/main_usb.c	modified	+0	−3	View file
drivers/staging/vt6656/power.c	modified	+0	−4	View file
drivers/staging/vt6656/power.h	modified	+0	−3	View file
drivers/staging/vt6656/rf.c	modified	+0	−4	View file
drivers/staging/vt6656/rf.h	modified	+0	−4	View file
drivers/staging/vt6656/rxtx.c	modified	+0	−3	View file
drivers/staging/vt6656/rxtx.h	modified	+0	−3	View file
drivers/staging/vt6656/usbpipe.c	modified	+0	−4	View file
drivers/staging/vt6656/usbpipe.h	modified	+0	−4	View file
drivers/staging/vt6656/wcmd.c	modified	+0	−3	View file
drivers/staging/vt6656/wcmd.h	modified	+0	−3	View file
drivers/staging/wilc1000/Kconfig	modified	+7	−39	View file
drivers/staging/wilc1000/Makefile	modified	+7	−15	View file
drivers/staging/wilc1000/coreconfigurator.c	modified	+17	−17	View file
drivers/staging/wilc1000/coreconfigurator.h	modified	+13	−11	View file
drivers/staging/wilc1000/host_interface.c	modified	+1027	−1333	View file
drivers/staging/wilc1000/host_interface.h	modified	+145	−889	View file
drivers/staging/wilc1000/linux_mon.c	modified	+5	−8	View file
drivers/staging/wilc1000/linux_wlan.c	modified	+461	−791	View file
drivers/staging/wilc1000/linux_wlan_common.h	modified	+10	−14	View file
drivers/staging/wilc1000/linux_wlan_sdio.c	deleted	+0	−251	View before deletion
drivers/staging/wilc1000/linux_wlan_sdio.h	deleted	+0	−14	View before deletion
drivers/staging/wilc1000/linux_wlan_spi.c	deleted	+0	−409	View before deletion
drivers/staging/wilc1000/linux_wlan_spi.h	deleted	+0	−14	View before deletion
drivers/staging/wilc1000/wilc_debugfs.c	modified	+15	−11	View file
drivers/staging/wilc1000/wilc_msgqueue.c	modified	+1	−8	View file
drivers/staging/wilc1000/wilc_msgqueue.h	modified	+6	−6	View file
drivers/staging/wilc1000/wilc_sdio.c	modified	+379	−338	View file
drivers/staging/wilc1000/wilc_spi.c	modified	+308	−406	View file
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c	modified	+719	−1342	View file
drivers/staging/wilc1000/wilc_wfi_cfgoperations.h	modified	+1	−86	View file
drivers/staging/wilc1000/wilc_wfi_netdevice.h	modified	+50	−30	View file
drivers/staging/wilc1000/wilc_wlan.c	modified	+571	−971	View file
drivers/staging/wilc1000/wilc_wlan.h	modified	+186	−198	View file
drivers/staging/wilc1000/wilc_wlan_cfg.c	modified	+8	−17	View file
drivers/staging/wilc1000/wilc_wlan_cfg.h	modified	+3	−1	View file
drivers/staging/wilc1000/wilc_wlan_if.h	modified	+5	−33	View file
drivers/staging/wlan-ng/hfa384x_usb.c	modified	+3	−31	View file
drivers/staging/wlan-ng/p80211netdev.h	modified	+0	−1	View file
drivers/staging/wlan-ng/prism2mgmt.h	modified	+0	−1	View file
drivers/staging/wlan-ng/prism2mib.c	modified	+1	−4	View file
drivers/staging/wlan-ng/prism2sta.c	modified	+0	−21	View file
include/linux/iio/buffer-dma.h	added	+152	−0	View file
include/linux/iio/buffer-dmaengine.h	added	+18	−0	View file
include/linux/iio/buffer.h	modified	+16	−0	View file
include/linux/iio/configfs.h	added	+15	−0	View file
include/linux/iio/iio.h	modified	+2	−0	View file
include/linux/iio/sw_trigger.h	added	+70	−0	View file
include/linux/mfd/palmas.h	modified	+51	−24	View file
include/uapi/rdma/hfi/hfi1_user.h	modified	+18	−20	View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/ABI/testing/configfs-iio

View file

diff --git a/Documentation/ABI/testing/configfs-iio b/Documentation/ABI/testing/configfs-iio
new file mode 100644
index 0000000..2483756
--- /dev/null
+++ b/Documentation/ABI/testing/configfs-iio
@@ -0,0 +1,21 @@
+What:		/config/iio
+Date:		October 2015
+KernelVersion:	4.4
+Contact:	[email protected]
+Description:
+		This represents Industrial IO configuration entry point
+		directory. It contains sub-groups corresponding to IIO
+		objects.
+
+What:		/config/iio/triggers
+Date:		October 2015
+KernelVersion:	4.4
+Description:
+		Industrial IO software triggers directory.
+
+What:		/config/iio/triggers/hrtimers
+Date:		October 2015
+KernelVersion:	4.4
+Description:
+		High resolution timers directory. Creating a directory here
+		will result in creating a hrtimer trigger in the IIO subsystem.

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

View file

diff --git a/Documentation/ABI/testing/sysfs-bus-iio-ina2xx-adc b/Documentation/ABI/testing/sysfs-bus-iio-ina2xx-adc
new file mode 100644
index 0000000..8916f7e
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-bus-iio-ina2xx-adc
@@ -0,0 +1,24 @@
+What:		/sys/bus/iio/devices/iio:deviceX/in_allow_async_readout
+Date:		December 2015
+KernelVersion:	4.4
+Contact:	[email protected]
+Description:
+		By default (value '0'), the capture thread checks for the Conversion
+		Ready Flag to being set prior to committing a new value to the sample
+		buffer. This synchronizes the in-chip conversion rate with the
+		in-driver readout rate at the cost of an additional register read.
+
+		Writing '1' will remove the polling for the Conversion Ready Flags to
+		save the additional i2c transaction, which will improve the bandwidth
+		available for reading data. However, samples can be occasionally skipped
+		or repeated, depending on the beat between the capture and conversion
+		rates.
+
+What:		/sys/bus/iio/devices/iio:deviceX/in_shunt_resistor
+Date:		December 2015
+KernelVersion:	4.4
+Contact:	[email protected]
+Description:
+		The value of the shunt resistor may be known only at runtime fom an
+		eeprom content read by a client application. This attribute allows to
+		set its value in ohms.

Documentation/devicetree/bindings/i2c/trivial-devices.txt

View file

diff --git a/Documentation/devicetree/bindings/i2c/trivial-devices.txt b/Documentation/devicetree/bindings/i2c/trivial-devices.txt
index c50cf13..f6fec95 100644
--- a/Documentation/devicetree/bindings/i2c/trivial-devices.txt
+++ b/Documentation/devicetree/bindings/i2c/trivial-devices.txt
@@ -20,6 +20,7 @@ adi,adt7476		+/-1C TDM Extended Temp Range I.C
 adi,adt7490		+/-1C TDM Extended Temp Range I.C
 adi,adxl345		Three-Axis Digital Accelerometer
 adi,adxl346		Three-Axis Digital Accelerometer (backward-compatibility value "adi,adxl345" must be listed too)
+ams,iaq-core		AMS iAQ-Core VOC Sensor
 at,24c08		i2c serial eeprom  (24cxx)
 atmel,24c00		i2c serial eeprom  (24cxx)
 atmel,24c01		i2c serial eeprom  (24cxx)

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

View file

diff --git a/Documentation/devicetree/bindings/iio/accel/mma8452.txt b/Documentation/devicetree/bindings/iio/accel/mma8452.txt
index e3c3746..3c10e85 100644
--- a/Documentation/devicetree/bindings/iio/accel/mma8452.txt
+++ b/Documentation/devicetree/bindings/iio/accel/mma8452.txt
@@ -7,13 +7,18 @@ Required properties:
     * "fsl,mma8453"
     * "fsl,mma8652"
     * "fsl,mma8653"
+
   - reg: the I2C address of the chip
 
 Optional properties:
 
   - interrupt-parent: should be the phandle for the interrupt controller
+
   - interrupts: interrupt mapping for GPIO IRQ
 
+  - interrupt-names: should contain "INT1" and/or "INT2", the accelerometer's
+		     interrupt line in use.
+
 Example:
 
 	mma8453fc@1d {
@@ -21,4 +26,5 @@ Example:
 		reg = <0x1d>;
 		interrupt-parent = <&gpio1>;
 		interrupts = <5 0>;
+		interrupt-names = "INT2";
 	};

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

View file

diff --git a/Documentation/devicetree/bindings/iio/adc/imx7d-adc.txt b/Documentation/devicetree/bindings/iio/adc/imx7d-adc.txt
new file mode 100644
index 0000000..5c184b9
--- /dev/null
+++ b/Documentation/devicetree/bindings/iio/adc/imx7d-adc.txt
@@ -0,0 +1,22 @@
+Freescale imx7d ADC bindings
+
+The devicetree bindings are for the ADC driver written for
+imx7d SoC.
+
+Required properties:
+- compatible: Should be "fsl,imx7d-adc"
+- reg: Offset and length of the register set for the ADC device
+- interrupts: The interrupt number for the ADC device
+- clocks: The root clock of the ADC controller
+- clock-names: Must contain "adc", matching entry in the clocks property
+- vref-supply: The regulator supply ADC reference voltage
+
+Example:
+adc1: adc@30610000 {
+	compatible = "fsl,imx7d-adc";
+	reg = <0x30610000 0x10000>;
+	interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;
+	clocks = <&clks IMX7D_ADC_ROOT_CLK>;
+	clock-names = "adc";
+	vref-supply = <&reg_vcc_3v3_mcu>;
+};

Documentation/devicetree/bindings/iio/adc/mcp320x.txt

View file

diff --git a/Documentation/devicetree/bindings/iio/adc/mcp320x.txt b/Documentation/devicetree/bindings/iio/adc/mcp320x.txt
index 2a1f3af..bcd3ac8 100644
--- a/Documentation/devicetree/bindings/iio/adc/mcp320x.txt
+++ b/Documentation/devicetree/bindings/iio/adc/mcp320x.txt
@@ -10,16 +10,28 @@ must be specified.
 Required properties:
 	- compatible:  	Must be one of the following, depending on the
 			model:
-				"mcp3001"
-				"mcp3002"
-				"mcp3004"
-				"mcp3008"
-				"mcp3201"
-				"mcp3202"
-				"mcp3204"
-				"mcp3208"
-				"mcp3301"
+				"mcp3001" (DEPRECATED)
+				"mcp3002" (DEPRECATED)
+				"mcp3004" (DEPRECATED)
+				"mcp3008" (DEPRECATED)
+				"mcp3201" (DEPRECATED)
+				"mcp3202" (DEPRECATED)
+				"mcp3204" (DEPRECATED)
+				"mcp3208" (DEPRECATED)
+				"mcp3301" (DEPRECATED)
 
+				"microchip,mcp3001"
+				"microchip,mcp3002"
+				"microchip,mcp3004"
+				"microchip,mcp3008"
+				"microchip,mcp3201"
+				"microchip,mcp3202"
+				"microchip,mcp3204"
+				"microchip,mcp3208"
+				"microchip,mcp3301"
+
+			NOTE: The use of the compatibles with no vendor prefix
+			is deprecated and only listed because old DT use them.
 
 Examples:
 spi_controller {

Documentation/devicetree/bindings/iio/adc/mcp3422.txt

View file

diff --git a/Documentation/devicetree/bindings/iio/adc/mcp3422.txt b/Documentation/devicetree/bindings/iio/adc/mcp3422.txt
index 333139c..dcae4cc 100644
--- a/Documentation/devicetree/bindings/iio/adc/mcp3422.txt
+++ b/Documentation/devicetree/bindings/iio/adc/mcp3422.txt
@@ -1,7 +1,8 @@
-* Microchip mcp3422/3/4/6/7/8 chip family (ADC)
+* Microchip mcp3421/2/3/4/6/7/8 chip family (ADC)
 
 Required properties:
  - compatible: Should be
+	"microchip,mcp3421" or
 	"microchip,mcp3422" or
 	"microchip,mcp3423" or
 	"microchip,mcp3424" or

Documentation/devicetree/bindings/iio/adc/palmas-gpadc.txt

View file

diff --git a/Documentation/devicetree/bindings/iio/adc/palmas-gpadc.txt b/Documentation/devicetree/bindings/iio/adc/palmas-gpadc.txt
new file mode 100644
index 0000000..4bb9a86
--- /dev/null
+++ b/Documentation/devicetree/bindings/iio/adc/palmas-gpadc.txt
@@ -0,0 +1,48 @@
+* Palmas general purpose ADC IP block devicetree bindings
+
+Channels list:
+	0 battery type
+	1 battery temp NTC (optional current source)
+	2 GP
+	3 temp (with ext. diode, optional current source)
+	4 GP
+	5 GP
+	6 VBAT_SENSE
+	7 VCC_SENSE
+	8 Backup Battery voltage
+	9 external charger (VCHG)
+	10 VBUS
+	11 DC-DC current probe (how does this work?)
+	12 internal die temp
+	13 internal die temp
+	14 USB ID pin voltage
+	15 test network
+
+Required properties:
+- compatible : Must be "ti,palmas-gpadc".
+- #io-channel-cells: Should be set to <1>.
+
+Optional sub-nodes:
+ti,channel0-current-microamp: Channel 0 current in uA.
+	Values are rounded to derive 0uA, 5uA, 15uA, 20uA.
+ti,channel3-current-microamp: Channel 3 current in uA.
+	Values are rounded to derive 0uA, 10uA, 400uA, 800uA.
+ti,enable-extended-delay: Enable extended delay.
+
+Example:
+
+pmic {
+	compatible = "ti,twl6035-pmic", "ti,palmas-pmic";
+	...
+	gpadc {
+		compatible = "ti,palmas-gpadc";
+		interrupts = <18 0
+			      16 0
+			      17 0>;
+		#io-channel-cells = <1>;
+		ti,channel0-current-microamp = <5>;
+		ti,channel3-current-microamp = <10>;
+		};
+	};
+	...
+};

Documentation/devicetree/bindings/iio/adc/ti-adc128s052.txt

View file

diff --git a/Documentation/devicetree/bindings/iio/adc/ti-adc128s052.txt b/Documentation/devicetree/bindings/iio/adc/ti-adc128s052.txt
index 15ca6b4..daa2b2c 100644
--- a/Documentation/devicetree/bindings/iio/adc/ti-adc128s052.txt
+++ b/Documentation/devicetree/bindings/iio/adc/ti-adc128s052.txt
@@ -1,7 +1,7 @@
-* Texas Instruments' ADC128S052 and ADC122S021 ADC chip
+* Texas Instruments' ADC128S052, ADC122S021 and ADC124S021 ADC chip
 
 Required properties:
- - compatible: Should be "ti,adc128s052" or "ti,adc122s021"
+ - compatible: Should be "ti,adc128s052", "ti,adc122s021" or "ti,adc124s021"
  - reg: spi chip select number for the device
  - vref-supply: The regulator supply for ADC reference voltage
 

Documentation/devicetree/bindings/iio/adc/ti-ads8688.txt

View file

diff --git a/Documentation/devicetree/bindings/iio/adc/ti-ads8688.txt b/Documentation/devicetree/bindings/iio/adc/ti-ads8688.txt
new file mode 100644
index 0000000..a02337d
--- /dev/null
+++ b/Documentation/devicetree/bindings/iio/adc/ti-ads8688.txt
@@ -0,0 +1,20 @@
+* Texas Instruments' ADS8684 and ADS8688 ADC chip
+
+Required properties:
+ - compatible: Should be "ti,ads8684" or "ti,ads8688"
+ - reg: spi chip select number for the device
+
+Recommended properties:
+ - spi-max-frequency: Definition as per
+		Documentation/devicetree/bindings/spi/spi-bus.txt
+
+Optional properties:
+ - vref-supply: The regulator supply for ADC reference voltage
+
+Example:
+adc@0 {
+	compatible = "ti,ads8688";
+	reg = <0>;
+	vref-supply = <&vdd_supply>;
+	spi-max-frequency = <1000000>;
+};

Documentation/devicetree/bindings/iio/health/max30100.txt

View file

diff --git a/Documentation/devicetree/bindings/iio/health/max30100.txt b/Documentation/devicetree/bindings/iio/health/max30100.txt
new file mode 100644
index 0000000..f6fbac6
--- /dev/null
+++ b/Documentation/devicetree/bindings/iio/health/max30100.txt
@@ -0,0 +1,21 @@
+Maxim MAX30100 heart rate and pulse oximeter sensor
+
+* https://datasheets.maximintegrated.com/en/ds/MAX30100.pdf
+
+Required properties:
+  - compatible: must be "maxim,max30100"
+  - reg: the I2C address of the sensor
+  - interrupt-parent: should be the phandle for the interrupt controller
+  - interrupts: the sole interrupt generated by the device
+
+  Refer to interrupt-controller/interrupts.txt for generic
+  interrupt client node bindings.
+
+Example:
+
+max30100@057 {
+	compatible = "maxim,max30100";
+	reg = <57>;
+	interrupt-parent = <&gpio1>;
+	interrupts = <16 2>;
+};

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

View file

diff --git a/Documentation/devicetree/bindings/iio/light/us5182d.txt b/Documentation/devicetree/bindings/iio/light/us5182d.txt
index 6f0a530..a619799 100644
--- a/Documentation/devicetree/bindings/iio/light/us5182d.txt
+++ b/Documentation/devicetree/bindings/iio/light/us5182d.txt
@@ -7,13 +7,24 @@ Required properties:
 Optional properties:
 - upisemi,glass-coef: glass attenuation factor - compensation factor of
                       resolution 1000 for material transmittance.
+
 - upisemi,dark-ths: array of 8 elements containing 16-bit thresholds (adc
                     counts) corresponding to every scale.
+
 - upisemi,upper-dark-gain: 8-bit dark gain compensation factor(4 int and 4
                            fractional bits - Q4.4) applied when light > threshold
+
 - upisemi,lower-dark-gain: 8-bit dark gain compensation factor(4 int and 4
                            fractional bits - Q4.4) applied when light < threshold
 
+- upisemi,continuous: This chip has two power modes: one-shot (chip takes one
+                      measurement and then shuts itself down) and continuous (
+                      chip takes continuous measurements). The one-shot mode is
+                      more power-friendly but the continuous mode may be more
+                      reliable. If this property is specified the continuous
+                      mode will be used instead of the default one-shot one for
+                      raw reads.
+
 If the optional properties are not specified these factors will default to the
 values in the below example.
 The glass-coef defaults to no compensation for the covering material.

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

View file

diff --git a/Documentation/devicetree/bindings/iio/st-sensors.txt b/Documentation/devicetree/bindings/iio/st-sensors.txt
index d3ccdb1..d4b87cc 100644
--- a/Documentation/devicetree/bindings/iio/st-sensors.txt
+++ b/Documentation/devicetree/bindings/iio/st-sensors.txt
@@ -36,6 +36,7 @@ Accelerometers:
 - st,lsm303dlm-accel
 - st,lsm330-accel
 - st,lsm303agr-accel
+- st,lis2dh12-accel
 
 Gyroscopes:
 - st,l3g4200d-gyro

Documentation/devicetree/bindings/staging/ion/hi6220-ion.txt

View file

diff --git a/Documentation/devicetree/bindings/staging/ion/hi6220-ion.txt b/Documentation/devicetree/bindings/staging/ion/hi6220-ion.txt
new file mode 100644
index 0000000..c59e27c
--- /dev/null
+++ b/Documentation/devicetree/bindings/staging/ion/hi6220-ion.txt
@@ -0,0 +1,31 @@
+Hi6220 SoC ION
+===================================================================
+Required properties:
+- compatible : "hisilicon,hi6220-ion"
+- list of the ION heaps
+	- heap name : maybe heap_sys_user@0
+	- heap id   : id should be unique in the system.
+	- heap base : base ddr address of the heap,0 means that
+	it is dynamic.
+	- heap size : memory size and 0 means it is dynamic.
+	- heap type : the heap type of the heap, please also
+	see the define in ion.h(drivers/staging/android/uapi/ion.h)
+-------------------------------------------------------------------
+Example:
+	hi6220-ion {
+		compatible = "hisilicon,hi6220-ion";
+		heap_sys_user@0 {
+			heap-name = "sys_user";
+			heap-id   = <0x0>;
+			heap-base = <0x0>;
+			heap-size = <0x0>;
+			heap-type = "ion_system";
+		};
+		heap_sys_contig@0 {
+			heap-name = "sys_contig";
+			heap-id   = <0x1>;
+			heap-base = <0x0>;
+			heap-size = <0x0>;
+			heap-type = "ion_system_contig";
+		};
+	};

Documentation/iio/iio_configfs.txt

View file

diff --git a/Documentation/iio/iio_configfs.txt b/Documentation/iio/iio_configfs.txt
new file mode 100644
index 0000000..f0add35
--- /dev/null
+++ b/Documentation/iio/iio_configfs.txt
@@ -0,0 +1,93 @@
+Industrial IIO configfs support
+
+1. Overview
+
+Configfs is a filesystem-based manager of kernel objects. IIO uses some
+objects that could be easily configured using configfs (e.g.: devices,
+triggers).
+
+See Documentation/filesystems/configfs/configfs.txt for more information
+about how configfs works.
+
+2. Usage
+
+In order to use configfs support in IIO we need to select it at compile
+time via CONFIG_IIO_CONFIGFS config option.
+
+Then, mount the configfs filesystem (usually under /config directory):
+
+$ mkdir /config
+$ mount -t configfs none /config
+
+At this point, all default IIO groups will be created and can be accessed
+under /config/iio. Next chapters will describe available IIO configuration
+objects.
+
+3. Software triggers
+
+One of the IIO default configfs groups is the "triggers" group. It is
+automagically accessible when the configfs is mounted and can be found
+under /config/iio/triggers.
+
+IIO software triggers implementation offers support for creating multiple
+trigger types. A new trigger type is usually implemented as a separate
+kernel module following the interface in include/linux/iio/sw_trigger.h:
+
+/*
+ * drivers/iio/trigger/iio-trig-sample.c
+ * sample kernel module implementing a new trigger type
+ */
+#include <linux/iio/sw_trigger.h>
+
+
+static struct iio_sw_trigger *iio_trig_sample_probe(const char *name)
+{
+	/*
+	 * This allocates and registers an IIO trigger plus other
+	 * trigger type specific initialization.
+	 */
+}
+
+static int iio_trig_hrtimer_remove(struct iio_sw_trigger *swt)
+{
+	/*
+	 * This undoes the actions in iio_trig_sample_probe
+	 */
+}
+
+static const struct iio_sw_trigger_ops iio_trig_sample_ops = {
+	.probe		= iio_trig_sample_probe,
+	.remove		= iio_trig_sample_remove,
+};
+
+static struct iio_sw_trigger_type iio_trig_sample = {
+	.name = "trig-sample",
+	.owner = THIS_MODULE,
+	.ops = &iio_trig_sample_ops,
+};
+
+module_iio_sw_trigger_driver(iio_trig_sample);
+
+Each trigger type has its own directory under /config/iio/triggers. Loading
+iio-trig-sample module will create 'trig-sample' trigger type directory
+/config/iio/triggers/trig-sample.
+
+We support the following interrupt sources (trigger types):
+	* hrtimer, uses high resolution timers as interrupt source
+
+3.1 Hrtimer triggers creation and destruction
+
+Loading iio-trig-hrtimer module will register hrtimer trigger types allowing
+users to create hrtimer triggers under /config/iio/triggers/hrtimer.
+
+e.g:
+
+$ mkdir /config/triggers/hrtimer/instance1
+$ rmdir /config/triggers/hrtimer/instance1
+
+Each trigger can have one or more attributes specific to the trigger type.
+
+3.2 "hrtimer" trigger types attributes
+
+"hrtimer" trigger type doesn't have any configurable attribute from /config dir.
+It does introduce the sampling_frequency attribute to trigger directory.

drivers/iio/Kconfig

View file

diff --git a/drivers/iio/Kconfig b/drivers/iio/Kconfig
index 66792e7..505e921 100644
--- a/drivers/iio/Kconfig
+++ b/drivers/iio/Kconfig
@@ -22,6 +22,14 @@ if IIO_BUFFER
 	source "drivers/iio/buffer/Kconfig"
 endif # IIO_BUFFER
 
+config IIO_CONFIGFS
+	tristate "Enable IIO configuration via configfs"
+	select CONFIGFS_FS
+	help
+	  This allows configuring various IIO bits through configfs
+	  (e.g. software triggers). For more info see
+	  Documentation/iio/iio_configfs.txt.
+
 config IIO_TRIGGER
 	bool "Enable triggered sampling support"
 	help
@@ -38,6 +46,14 @@ config IIO_CONSUMERS_PER_TRIGGER
 	This value controls the maximum number of consumers that a
 	given trigger may handle. Default is 2.
 
+config IIO_SW_TRIGGER
+	tristate "Enable software triggers support"
+	select IIO_CONFIGFS
+	help
+	 Provides IIO core support for software triggers. A software
+	 trigger can be created via configfs or directly by a driver
+	 using the API provided.
+
 config IIO_TRIGGERED_EVENT
 	tristate
 	select IIO_TRIGGER
@@ -50,8 +66,10 @@ source "drivers/iio/amplifiers/Kconfig"
 source "drivers/iio/chemical/Kconfig"
 source "drivers/iio/common/Kconfig"
 source "drivers/iio/dac/Kconfig"
+source "drivers/iio/dummy/Kconfig"
 source "drivers/iio/frequency/Kconfig"
 source "drivers/iio/gyro/Kconfig"
+source "drivers/iio/health/Kconfig"
 source "drivers/iio/humidity/Kconfig"
 source "drivers/iio/imu/Kconfig"
 source "drivers/iio/light/Kconfig"

drivers/iio/Makefile

View file

diff --git a/drivers/iio/Makefile b/drivers/iio/Makefile
index aeca726..20f6490 100644
--- a/drivers/iio/Makefile
+++ b/drivers/iio/Makefile
@@ -7,6 +7,8 @@ industrialio-y := industrialio-core.o industrialio-event.o inkern.o
 industrialio-$(CONFIG_IIO_BUFFER) += industrialio-buffer.o
 industrialio-$(CONFIG_IIO_TRIGGER) += industrialio-trigger.o
 
+obj-$(CONFIG_IIO_CONFIGFS) += industrialio-configfs.o
+obj-$(CONFIG_IIO_SW_TRIGGER) += industrialio-sw-trigger.o
 obj-$(CONFIG_IIO_TRIGGERED_EVENT) += industrialio-triggered-event.o
 
 obj-y += accel/
@@ -16,8 +18,10 @@ obj-y += buffer/
 obj-y += chemical/
 obj-y += common/
 obj-y += dac/
+obj-y += dummy/
 obj-y += gyro/
 obj-y += frequency/
+obj-y += health/
 obj-y += humidity/
 obj-y += imu/
 obj-y += light/

drivers/iio/accel/Kconfig

View file

diff --git a/drivers/iio/accel/Kconfig b/drivers/iio/accel/Kconfig
index 969428d..edc29b1 100644
--- a/drivers/iio/accel/Kconfig
+++ b/drivers/iio/accel/Kconfig
@@ -64,7 +64,7 @@ config IIO_ST_ACCEL_3AXIS
 	help
 	  Say yes here to build support for STMicroelectronics accelerometers:
 	  LSM303DLH, LSM303DLHC, LIS3DH, LSM330D, LSM330DL, LSM330DLC,
-	  LIS331DLH, LSM303DL, LSM303DLM, LSM330.
+	  LIS331DLH, LSM303DL, LSM303DLM, LSM330, LIS2DH12.
 
 	  This driver can also be built as a module. If so, these modules
 	  will be created:
@@ -107,6 +107,35 @@ config KXCJK1013
 	  To compile this driver as a module, choose M here: the module will
 	  be called kxcjk-1013.
 
+config MMA7455
+	tristate
+	select IIO_BUFFER
+	select IIO_TRIGGERED_BUFFER
+
+config MMA7455_I2C
+	tristate "Freescale MMA7455L/MMA7456L Accelerometer I2C Driver"
+	depends on I2C
+	select MMA7455
+	select REGMAP_I2C
+	help
+	  Say yes here to build support for the Freescale MMA7455L and
+	  MMA7456L 3-axis accelerometer.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called mma7455_i2c.
+
+config MMA7455_SPI
+	tristate "Freescale MMA7455L/MMA7456L Accelerometer SPI Driver"
+	depends on SPI_MASTER
+	select MMA7455
+	select REGMAP_SPI
+	help
+	  Say yes here to build support for the Freescale MMA7455L and
+	  MMA7456L 3-axis accelerometer.
+
+	  To compile this driver as a module, choose M here: the module
+	  will be called mma7455_spi.
+
 config MMA8452
 	tristate "Freescale MMA8452Q and similar Accelerometers Driver"
 	depends on I2C
@@ -158,6 +187,17 @@ config MXC4005
 	  To compile this driver as a module, choose M. The module will be