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

cbcd4f08 · Linus Torvalds <[email protected]> · 2017-07-03 19:57:30 -07:00

Pull staging/IIO updates from Greg KH:
 "Here's the large set of staging and iio driver patches for 4.13-rc1.

  After over 500 patches, we removed about 200 more lines of code than
  we added, not great, but we added some new IIO drivers for unsupported
  hardware, so it's an overall win.

  Also here are lots of small fixes, and some tty core api additions
  (with the tty maintainer's ack) for the speakup drivers, those are
  finally getting some much needed cleanups and are looking much better
  now than before. Full details in the shortlog.

  All of these have been in linux-next for a while with no reported
  issues"

* tag 'staging-4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (529 commits)
  staging: lustre: replace kmalloc with kmalloc_array
  Staging: ion: fix code style warning from NULL comparisons
  staging: fsl-mc: make dprc.h header private
  staging: fsl-mc: move mc-cmd.h contents in the public header
  staging: fsl-mc: move mc-sys.h contents in the public header
  staging: fsl-mc: fix a few implicit includes
  staging: fsl-mc: remove dpmng API files
  staging: fsl-mc: move rest of mc-bus.h to private header
  staging: fsl-mc: move couple of definitions to public header
  staging: fsl-mc: move irq domain creation prototype to public header
  staging: fsl-mc: turn several exported functions static
  staging: fsl-mc: delete prototype of unimplemented function
  staging: fsl-mc: delete duplicated function prototypes
  staging: fsl-mc: decouple the mc-bus public headers from dprc.h
  staging: fsl-mc: drop useless #includes
  staging: fsl-mc: be consistent when checking strcmp() return
  staging: fsl-mc: move comparison before strcmp() call
  staging: speakup: make function ser_to_dev static
  staging: ks7010: fix spelling mistake: "errror" -> "error"
  staging: rtl8192e: fix spelling mistake: "respose" -> "response"
  ...

Commit: cbcd4f08aa637b74f575268770da86a00fabde6d
Parents: 362f6729 · 9b326dfc

Merge commit. Changes below are compared with the first parent: 362f6729.

Changes

407 files changed · +11603 −11578

File	Status	Add	Del	Content
Documentation/ABI/testing/sysfs-bus-iio	modified	+11	−0	View file
Documentation/ABI/testing/sysfs-bus-iio-meas-spec	modified	+0	−1	View file
Documentation/ABI/testing/sysfs-bus-iio-timer-stm32	modified	+63	−0	View file
Documentation/devicetree/bindings/iio/adc/amlogic,meson-saradc.txt	modified	+2	−0	View file
Documentation/devicetree/bindings/iio/adc/renesas,gyroadc.txt	modified	+4	−5	View file
Documentation/devicetree/bindings/iio/adc/st,stm32-adc.txt	modified	+21	−7	View file
Documentation/devicetree/bindings/iio/adc/ti-adc084s021.txt	added	+19	−0	View file
Documentation/devicetree/bindings/iio/adc/ti-adc108s102.txt	added	+18	−0	View file
Documentation/devicetree/bindings/iio/imu/st_lsm6dsx.txt	modified	+2	−1	View file
Documentation/devicetree/bindings/trivial-devices.txt	modified	+1	−0	View file
MAINTAINERS	modified	+1	−0	View file
drivers/iio/accel/hid-sensor-accel-3d.c	modified	+1	−1	View file
drivers/iio/accel/mma9551.c	modified	+1	−3	View file
drivers/iio/accel/st_accel_core.c	modified	+4	−3	View file
drivers/iio/accel/st_accel_spi.c	modified	+0	−4	View file
drivers/iio/adc/Kconfig	modified	+24	−0	View file
drivers/iio/adc/Makefile	modified	+2	−0	View file
drivers/iio/adc/ad7791.c	modified	+3	−5	View file
drivers/iio/adc/aspeed_adc.c	modified	+5	−1	View file
drivers/iio/adc/cpcap-adc.c	modified	+76	−32	View file
drivers/iio/adc/hi8435.c	modified	+40	−6	View file
drivers/iio/adc/ina2xx-adc.c	modified	+190	−28	View file
drivers/iio/adc/lpc32xx_adc.c	modified	+6	−2	View file
drivers/iio/adc/meson_saradc.c	modified	+59	−27	View file
drivers/iio/adc/mxs-lradc-adc.c	modified	+16	−16	View file
drivers/iio/adc/rcar-gyroadc.c	modified	+8	−8	View file
drivers/iio/adc/stm32-adc-core.c	modified	+248	−21	View file
drivers/iio/adc/stm32-adc-core.h	modified	+2	−0	View file
drivers/iio/adc/stm32-adc.c	modified	+701	−61	View file
drivers/iio/adc/ti-adc084s021.c	added	+275	−0	View file
drivers/iio/adc/ti-adc108s102.c	added	+348	−0	View file
drivers/iio/adc/twl4030-madc.c	modified	+115	−94	View file
drivers/iio/adc/xilinx-xadc-core.c	modified	+4	−1	View file
drivers/iio/common/hid-sensors/Kconfig	modified	+1	−1	View file
drivers/iio/common/hid-sensors/hid-sensor-attributes.c	modified	+52	−2	View file
drivers/iio/common/hid-sensors/hid-sensor-trigger.c	modified	+80	−0	View file
drivers/iio/dac/Kconfig	modified	+2	−1	View file
drivers/iio/dac/ad5064.c	modified	+69	−2	View file
drivers/iio/humidity/hts221.h	modified	+3	−0	View file
drivers/iio/humidity/hts221_core.c	modified	+50	−4	View file
drivers/iio/humidity/hts221_i2c.c	modified	+1	−0	View file
drivers/iio/humidity/hts221_spi.c	modified	+1	−0	View file
drivers/iio/imu/inv_mpu6050/inv_mpu_core.c	modified	+110	−73	View file
drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c	modified	+4	−4	View file
drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h	modified	+3	−2	View file
drivers/iio/imu/inv_mpu6050/inv_mpu_ring.c	modified	+3	−3	View file
drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c	modified	+9	−2	View file
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h	modified	+5	−0	View file
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c	modified	+17	−3	View file
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c	modified	+52	−0	View file
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c	modified	+1	−0	View file
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c	modified	+1	−0	View file
drivers/iio/industrialio-core.c	modified	+8	−13	View file
drivers/iio/inkern.c	modified	+1	−3	View file
drivers/iio/light/Kconfig	modified	+10	−0	View file
drivers/iio/light/Makefile	modified	+1	−0	View file
drivers/iio/light/isl29018.c	modified	+2	−0	View file
drivers/staging/iio/light/isl29028.c → drivers/iio/light/isl29028.c	renamed	+56	−20	View file
drivers/iio/light/rpr0521.c	modified	+260	−47	View file
drivers/iio/light/tsl2583.c	modified	+76	−30	View file
drivers/iio/magnetometer/st_magn_spi.c	modified	+0	−2	View file
drivers/iio/orientation/hid-sensor-rotation.c	modified	+47	−8	View file
drivers/iio/pressure/Kconfig	modified	+1	−1	View file
drivers/iio/pressure/st_pressure_core.c	modified	+4	−4	View file
drivers/iio/pressure/zpa2326.c	modified	+11	−7	View file
drivers/iio/proximity/as3935.c	modified	+3	−3	View file
drivers/iio/proximity/sx9500.c	modified	+1	−2	View file
drivers/iio/temperature/maxim_thermocouple.c	modified	+1	−0	View file
drivers/iio/trigger/stm32-timer-trigger.c	modified	+160	−14	View file
drivers/staging/android/ion/ion-ioctl.c	modified	+2	−2	View file
drivers/staging/android/ion/ion.c	modified	+10	−20	View file
drivers/staging/android/ion/ion.h	modified	+0	−14	View file
drivers/staging/android/ion/ion_carveout_heap.c	modified	+1	−1	View file
drivers/staging/android/ion/ion_system_heap.c	modified	+3	−3	View file
drivers/staging/android/uapi/ion.h	modified	+0	−24	View file
drivers/staging/ccree/Kconfig	modified	+1	−10	View file
drivers/staging/ccree/Makefile	modified	+1	−1	View file
drivers/staging/ccree/cc_bitops.h	deleted	+0	−62	View before deletion
drivers/staging/ccree/cc_crypto_ctx.h	modified	+24	−123	View file
drivers/staging/ccree/cc_hal.h	modified	+9	−6	View file
drivers/staging/ccree/cc_hw_queue_defs.h	modified	+443	−453	View file
drivers/staging/ccree/cc_lli_defs.h	modified	+36	−21	View file
drivers/staging/ccree/cc_pal_log.h	deleted	+0	−188	View before deletion
drivers/staging/ccree/cc_pal_log_plat.h	deleted	+0	−33	View before deletion
drivers/staging/ccree/cc_pal_types.h	deleted	+0	−97	View before deletion
drivers/staging/ccree/cc_pal_types_plat.h	deleted	+0	−29	View before deletion
drivers/staging/ccree/cc_regs.h	modified	+17	−81	View file
drivers/staging/ccree/dx_crys_kernel.h	modified	+157	−157	View file
drivers/staging/ccree/dx_env.h	deleted	+0	−224	View before deletion
drivers/staging/ccree/dx_host.h	modified	+131	−131	View file
drivers/staging/ccree/dx_reg_base_host.h	modified	+3	−12	View file
drivers/staging/ccree/dx_reg_common.h	modified	+4	−4	View file
drivers/staging/ccree/hash_defs.h	modified	+10	−52	View file
drivers/staging/ccree/hw_queue_defs_plat.h	deleted	+0	−43	View before deletion
drivers/staging/ccree/ssi_aead.c	modified	+678	−764	View file
drivers/staging/ccree/ssi_aead.h	modified	+30	−33	View file
drivers/staging/ccree/ssi_buffer_mgr.c	modified	+354	−467	View file
drivers/staging/ccree/ssi_buffer_mgr.h	modified	+9	−26	View file
drivers/staging/ccree/ssi_cipher.c	modified	+232	−384	View file
drivers/staging/ccree/ssi_cipher.h	modified	+10	−16	View file
drivers/staging/ccree/ssi_config.h	modified	+4	−29	View file
drivers/staging/ccree/ssi_driver.c	modified	+93	−64	View file
drivers/staging/ccree/ssi_driver.h	modified	+30	−54	View file
drivers/staging/ccree/ssi_fips.c	modified	+19	−23	View file
drivers/staging/ccree/ssi_fips.h	modified	+18	−27	View file
drivers/staging/ccree/ssi_fips_data.h	modified	+64	−73	View file
drivers/staging/ccree/ssi_fips_ext.c	modified	+36	−40	View file
drivers/staging/ccree/ssi_fips_ll.c	modified	+501	−533	View file
drivers/staging/ccree/ssi_fips_local.c	modified	+79	−91	View file
drivers/staging/ccree/ssi_fips_local.h	modified	+12	−22	View file
drivers/staging/ccree/ssi_hash.c	modified	+887	−1066	View file
drivers/staging/ccree/ssi_hash.h	modified	+30	−28	View file
drivers/staging/ccree/ssi_ivgen.c	modified	+78	−81	View file
drivers/staging/ccree/ssi_ivgen.h	modified	+20	−21	View file
drivers/staging/ccree/ssi_pm.c	modified	+20	−26	View file
drivers/staging/ccree/ssi_pm.h	modified	+5	−8	View file
drivers/staging/ccree/ssi_pm_ext.c	deleted	+0	−60	View before deletion
drivers/staging/ccree/ssi_pm_ext.h	deleted	+0	−33	View before deletion
drivers/staging/ccree/ssi_request_mgr.c	modified	+140	−253	View file
drivers/staging/ccree/ssi_request_mgr.h	modified	+13	−13	View file
drivers/staging/ccree/ssi_sram_mgr.c	modified	+24	−26	View file
drivers/staging/ccree/ssi_sram_mgr.h	modified	+23	−24	View file
drivers/staging/ccree/ssi_sysfs.c	modified	+58	−61	View file
drivers/staging/ccree/ssi_sysfs.h	modified	+5	−4	View file
drivers/staging/comedi/comedi_fops.c	modified	+22	−20	View file
drivers/staging/comedi/drivers/ni_labpc_isadma.h	modified	+1	−1	View file
drivers/staging/comedi/drivers/ni_labpc_regs.h	modified	+1	−1	View file
drivers/staging/comedi/drivers/s626.c	modified	+6	−3	View file
drivers/staging/dgnc/dgnc_driver.c	modified	+0	−2	View file
drivers/staging/dgnc/dgnc_driver.h	modified	+0	−13	View file
drivers/staging/dgnc/dgnc_tty.c	modified	+59	−91	View file
drivers/staging/emxx_udc/emxx_udc.c	modified	+202	−196	View file
drivers/staging/emxx_udc/emxx_udc.h	modified	+113	−113	View file
drivers/staging/fbtft/fb_agm1264k-fl.c	modified	+2	−2	View file
drivers/staging/fbtft/fb_hx8340bn.c	modified	+1	−1	View file
drivers/staging/fbtft/fbtft-io.c	modified	+1	−1	View file
drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c	modified	+166	−102	View file
drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h	modified	+23	−10	View file
drivers/staging/fsl-dpaa2/ethernet/dpaa2-ethtool.c	modified	+32	−32	View file
drivers/staging/fsl-dpaa2/ethernet/dpni.c	modified	+3	−2	View file
drivers/staging/fsl-mc/README.txt	modified	+3	−3	View file
drivers/staging/fsl-mc/bus/Makefile	modified	+0	−1	View file
drivers/staging/fsl-mc/bus/dpbp-cmd.h	modified	+1	−1	View file
drivers/staging/fsl-mc/bus/dpbp.c	modified	+2	−2	View file
drivers/staging/fsl-mc/bus/dpcon.c	modified	+2	−2	View file
drivers/staging/fsl-mc/bus/dpio/dpio-service.c	modified	+4	−4	View file
drivers/staging/fsl-mc/bus/dpio/dpio.c	modified	+2	−2	View file
drivers/staging/fsl-mc/bus/dpmcp-cmd.h	modified	+1	−1	View file
drivers/staging/fsl-mc/bus/dpmcp.c	modified	+2	−2	View file
drivers/staging/fsl-mc/bus/dpmng-cmd.h	modified	+1	−1	View file
drivers/staging/fsl-mc/bus/dpmng.c	deleted	+0	−74	View before deletion
drivers/staging/fsl-mc/bus/dprc-cmd.h	modified	+1	−1	View file
drivers/staging/fsl-mc/bus/dprc-driver.c	modified	+34	−33	View file
drivers/staging/fsl-mc/bus/dprc.c	modified	+4	−4	View file
drivers/staging/fsl-mc/include/dprc.h → drivers/staging/fsl-mc/bus/dprc.h	renamed	+3	−46	View file
drivers/staging/fsl-mc/bus/fsl-mc-allocator.c	modified	+11	−12	View file
drivers/staging/fsl-mc/bus/fsl-mc-bus.c	modified	+66	−25	View file
drivers/staging/fsl-mc/bus/fsl-mc-msi.c	modified	+0	−1	View file
drivers/staging/fsl-mc/bus/fsl-mc-private.h	modified	+63	−2	View file
drivers/staging/fsl-mc/bus/irq-gic-v3-its-fsl-mc-msi.c	modified	+0	−1	View file
drivers/staging/fsl-mc/bus/mc-io.c	modified	+1	−2	View file
drivers/staging/fsl-mc/bus/mc-sys.c	modified	+0	−2	View file
drivers/staging/fsl-mc/include/dpmng.h	deleted	+0	−67	View before deletion
drivers/staging/fsl-mc/include/mc-bus.h	deleted	+0	−111	View before deletion
drivers/staging/fsl-mc/include/mc-cmd.h	deleted	+0	−130	View before deletion
drivers/staging/fsl-mc/include/mc-sys.h	deleted	+0	−99	View before deletion
drivers/staging/fsl-mc/include/mc.h	modified	+202	−2	View file
drivers/staging/gdm724x/gdm_usb.c	modified	+4	−4	View file
drivers/staging/greybus/Kconfig	modified	+10	−0	View file
drivers/staging/greybus/Makefile	modified	+1	−1	View file
drivers/staging/greybus/arche-apb-ctrl.c	modified	+3	−8	View file
drivers/staging/greybus/arche-platform.c	modified	+9	−145	View file
drivers/staging/greybus/arche_platform.h	modified	+0	−8	View file
drivers/staging/greybus/light.c	modified	+2	−2	View file
drivers/staging/greybus/power_supply.c	modified	+1	−1	View file
drivers/staging/iio/frequency/ad9834.c	modified	+11	−11	View file
drivers/staging/iio/frequency/dds.h	modified	+1	−1	View file
drivers/staging/iio/light/Kconfig	modified	+0	−10	View file
drivers/staging/iio/light/Makefile	modified	+1	−2	View file
drivers/staging/iio/light/tsl2x7x_core.c → drivers/staging/iio/light/tsl2x7x.c	renamed	+26	−40	View file
drivers/staging/iio/meter/ade7753.c	modified	+50	−51	View file
drivers/staging/iio/meter/ade7754.c	modified	+28	−28	View file
drivers/staging/iio/meter/ade7758_core.c	modified	+25	−25	View file
drivers/staging/iio/meter/ade7854.c	modified	+44	−44	View file
drivers/staging/ks7010/eap_packet.h	modified	+2	−2	View file
drivers/staging/ks7010/ks7010_sdio.c	modified	+6	−4	View file
drivers/staging/ks7010/ks_hostif.c	modified	+53	−52	View file
drivers/staging/ks7010/ks_hostif.h	modified	+96	−96	View file
drivers/staging/ks7010/ks_wlan.h	modified	+4	−4	View file
drivers/staging/ks7010/ks_wlan_net.c	modified	+11	−11	View file
drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c	modified	+2	−2	View file
drivers/staging/lustre/lnet/libcfs/linux/linux-tracefile.c	modified	+3	−2	View file
drivers/staging/lustre/lnet/libcfs/tracefile.c	modified	+5	−7	View file
drivers/staging/lustre/lnet/lnet/lib-move.c	modified	+10	−10	View file
drivers/staging/lustre/lnet/lnet/lib-socket.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/fid/fid_request.c	modified	+2	−2	View file
drivers/staging/lustre/lustre/fld/fld_cache.c	modified	+3	−3	View file
drivers/staging/lustre/lustre/fld/lproc_fld.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/include/cl_object.h	modified	+2	−2	View file
drivers/staging/lustre/lustre/include/lprocfs_status.h	modified	+6	−6	View file
drivers/staging/lustre/lustre/include/lu_object.h	modified	+2	−2	View file
drivers/staging/lustre/lustre/include/lustre/lustre_idl.h	modified	+3	−3	View file
drivers/staging/lustre/lustre/include/lustre/lustre_user.h	modified	+1	−1	View file
drivers/staging/lustre/lustre/include/lustre_fid.h	modified	+1	−1	View file
drivers/staging/lustre/lustre/ldlm/ldlm_internal.h	modified	+15	−12	View file
drivers/staging/lustre/lustre/ldlm/ldlm_lib.c	modified	+5	−6	View file
drivers/staging/lustre/lustre/ldlm/ldlm_request.c	modified	+3	−3	View file
drivers/staging/lustre/lustre/ldlm/ldlm_resource.c	modified	+21	−3	View file
drivers/staging/lustre/lustre/llite/dcache.c	modified	+2	−2	View file
drivers/staging/lustre/lustre/llite/dir.c	modified	+7	−7	View file
drivers/staging/lustre/lustre/llite/file.c	modified	+24	−24	View file
drivers/staging/lustre/lustre/llite/llite_internal.h	modified	+13	−13	View file
drivers/staging/lustre/lustre/llite/llite_lib.c	modified	+17	−17	View file
drivers/staging/lustre/lustre/llite/llite_mmap.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/llite/llite_nfs.c	modified	+5	−5	View file
drivers/staging/lustre/lustre/llite/lproc_llite.c	modified	+3	−3	View file
drivers/staging/lustre/lustre/llite/namei.c	modified	+20	−20	View file
drivers/staging/lustre/lustre/llite/rw26.c	modified	+2	−2	View file
drivers/staging/lustre/lustre/llite/statahead.c	modified	+7	−7	View file
drivers/staging/lustre/lustre/llite/symlink.c	modified	+2	−2	View file
drivers/staging/lustre/lustre/llite/vvp_dev.c	modified	+3	−3	View file
drivers/staging/lustre/lustre/llite/vvp_io.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/llite/vvp_object.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/llite/xattr.c	modified	+3	−3	View file
drivers/staging/lustre/lustre/llite/xattr_cache.c	modified	+2	−2	View file
drivers/staging/lustre/lustre/lmv/lmv_fld.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/lmv/lmv_intent.c	modified	+3	−3	View file
drivers/staging/lustre/lustre/lmv/lmv_obd.c	modified	+27	−28	View file
drivers/staging/lustre/lustre/lov/lov_io.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/lov/lov_merge.c	modified	+2	−2	View file
drivers/staging/lustre/lustre/lov/lov_object.c	modified	+3	−4	View file
drivers/staging/lustre/lustre/lov/lov_pack.c	modified	+3	−3	View file
drivers/staging/lustre/lustre/lov/lov_pool.c	modified	+5	−5	View file
drivers/staging/lustre/lustre/mdc/mdc_locks.c	modified	+7	−7	View file
drivers/staging/lustre/lustre/mdc/mdc_reint.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/mdc/mdc_request.c	modified	+8	−8	View file
drivers/staging/lustre/lustre/mgc/mgc_request.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/obdclass/cl_lock.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/obdclass/cl_page.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/obdclass/llog_cat.c	modified	+6	−6	View file
drivers/staging/lustre/lustre/obdclass/llog_swab.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/obdclass/lprocfs_status.c	modified	+11	−45	View file
drivers/staging/lustre/lustre/obdclass/lu_object.c	modified	+2	−3	View file
drivers/staging/lustre/lustre/obdecho/echo_client.c	modified	+3	−4	View file
drivers/staging/lustre/lustre/osc/osc_cache.c	modified	+8	−9	View file
drivers/staging/lustre/lustre/osc/osc_internal.h	modified	+1	−1	View file
drivers/staging/lustre/lustre/osc/osc_request.c	modified	+1	−2	View file
drivers/staging/lustre/lustre/ptlrpc/client.c	modified	+2	−2	View file
drivers/staging/lustre/lustre/ptlrpc/import.c	modified	+5	−10	View file
drivers/staging/lustre/lustre/ptlrpc/layout.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/ptlrpc/pack_generic.c	modified	+1	−1	View file
drivers/staging/lustre/lustre/ptlrpc/ptlrpc_internal.h	modified	+2	−2	View file
drivers/staging/lustre/lustre/ptlrpc/service.c	modified	+1	−1	View file
drivers/staging/most/aim-network/networking.c	modified	+136	−163	View file
drivers/staging/most/aim-network/networking.h	deleted	+0	−21	View before deletion
drivers/staging/most/hdm-dim2/Kconfig	modified	+0	−1	View file
drivers/staging/most/hdm-dim2/dim2_hal.c	modified	+10	−7	View file
drivers/staging/most/hdm-dim2/dim2_hdm.c	modified	+14	−4	View file
drivers/staging/most/hdm-dim2/dim2_reg.h	modified	+1	−0	View file
drivers/staging/most/hdm-i2c/hdm_i2c.c	modified	+0	−7	View file
drivers/staging/most/hdm-usb/Kconfig	modified	+1	−1	View file
drivers/staging/most/hdm-usb/hdm_usb.c	modified	+12	−3	View file
drivers/staging/most/mostcore/mostcore.h	modified	+6	−1	View file
drivers/staging/octeon-usb/octeon-hcd.c	modified	+3	−3	View file
drivers/staging/octeon/ethernet-util.h	modified	+1	−1	View file
drivers/staging/rtl8188eu/core/rtw_ap.c	modified	+26	−14	View file
drivers/staging/rtl8188eu/core/rtw_cmd.c	modified	+49	−82	View file
drivers/staging/rtl8188eu/core/rtw_ieee80211.c	modified	+0	−44	View file
drivers/staging/rtl8188eu/core/rtw_mlme.c	modified	+6	−6	View file
drivers/staging/rtl8188eu/core/rtw_recv.c	modified	+33	−50	View file
drivers/staging/rtl8188eu/core/rtw_sta_mgt.c	modified	+0	−8	View file
drivers/staging/rtl8188eu/hal/phy.c	modified	+2	−2	View file
drivers/staging/rtl8188eu/hal/rtl8188e_rxdesc.c	modified	+1	−1	View file
drivers/staging/rtl8188eu/include/ieee80211.h	modified	+0	−107	View file
drivers/staging/rtl8188eu/os_dep/mon.c	modified	+29	−5	View file
drivers/staging/rtl8192e/dot11d.h	modified	+2	−2	View file
drivers/staging/rtl8192e/rtl8192e/rtl_core.c	modified	+0	−126	View file
drivers/staging/rtl8192e/rtl8192e/rtl_core.h	modified	+0	−2	View file
drivers/staging/rtl8192e/rtl8192e/rtl_dm.c	modified	+0	−16	View file
drivers/staging/rtl8192e/rtl819x_HTProc.c	modified	+2	−2	View file
drivers/staging/rtl8192e/rtllib.h	modified	+0	−54	View file
drivers/staging/rtl8192e/rtllib_rx.c	modified	+0	−3	View file
drivers/staging/rtl8192e/rtllib_softmac.c	modified	+4	−385	View file
drivers/staging/rtl8192e/rtllib_wx.c	modified	+1	−1	View file
drivers/staging/rtl8192u/ieee80211/ieee80211.h	modified	+1	−1	View file
drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.h	modified	+2	−2	View file
drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c	modified	+10	−17	View file
drivers/staging/rtl8192u/ieee80211/ieee80211_module.c	modified	+1	−2	View file
drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c	modified	+55	−116	View file
drivers/staging/rtl8192u/r8192U.h	modified	+4	−4	View file
drivers/staging/rtl8192u/r8192U_core.c	modified	+5	−5	View file
drivers/staging/rtl8192u/r8192U_dm.c	modified	+43	−34	View file
drivers/staging/rtl8712/ieee80211.c	modified	+7	−6	View file
drivers/staging/rtl8712/os_intfs.c	modified	+1	−1	View file
drivers/staging/rtl8712/wifi.h	modified	+4	−2	View file
drivers/staging/rtl8723bs/core/rtw_mlme.c	modified	+16	−16	View file
drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c	modified	+4	−4	View file
drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c	modified	+2	−2	View file
drivers/staging/rtl8723bs/hal/hal_btcoex.c	modified	+1	−1	View file
drivers/staging/rtl8723bs/hal/hal_com.c	modified	+3	−2	View file
drivers/staging/rtl8723bs/hal/odm.h	modified	+4	−1	View file
drivers/staging/rtl8723bs/hal/odm_DIG.c	modified	+5	−5	View file
drivers/staging/rtl8723bs/hal/odm_debug.h	modified	+45	−36	View file
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c	modified	+2	−1	View file
drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c	modified	+8	−10	View file
drivers/staging/rtl8723bs/hal/rtl8723b_rf6052.c	modified	+6	−6	View file
drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c	modified	+10	−10	View file
drivers/staging/rtl8723bs/include/ieee80211.h	modified	+4	−4	View file
drivers/staging/rtl8723bs/include/osdep_service.h	modified	+2	−2	View file
drivers/staging/rtl8723bs/include/osdep_service_linux.h	modified	+3	−3	View file
drivers/staging/rtl8723bs/include/rtl8192c_rf.h	modified	+10	−13	View file
drivers/staging/rtl8723bs/include/rtl8723b_spec.h	modified	+22	−27	View file
drivers/staging/rtl8723bs/os_dep/ioctl_linux.c	modified	+7	−7	View file
drivers/staging/rtl8723bs/os_dep/sdio_ops_linux.c	modified	+12	−12	View file
drivers/staging/rtl8723bs/os_dep/wifi_regd.c	modified	+23	−23	View file
drivers/staging/rts5208/rtsx_scsi.c	modified	+1	−1	View file
drivers/staging/rts5208/sd.c	modified	+2	−2	View file
drivers/staging/rts5208/xd.c	modified	+1	−1	View file
drivers/staging/sm750fb/ddk750_chip.c	modified	+4	−3	View file
drivers/staging/sm750fb/ddk750_dvi.c	modified	+20	−15	View file
drivers/staging/sm750fb/ddk750_dvi.h	modified	+20	−23	View file
drivers/staging/sm750fb/ddk750_hwi2c.c	modified	+11	−22	View file
drivers/staging/sm750fb/ddk750_sii164.c	modified	+21	−28	View file
drivers/staging/sm750fb/ddk750_sii164.h	modified	+10	−12	View file
drivers/staging/sm750fb/ddk750_swi2c.c	modified	+6	−15	View file
drivers/staging/sm750fb/ddk750_swi2c.h	modified	+5	−13	View file
drivers/staging/sm750fb/sm750.c	modified	+27	−27	View file
drivers/staging/sm750fb/sm750.h	modified	+16	−8	View file
drivers/staging/sm750fb/sm750_accel.c	modified	+8	−7	View file
drivers/staging/sm750fb/sm750_cursor.c	modified	+7	−10	View file
drivers/staging/speakup/Makefile	modified	+1	−0	View file
drivers/staging/speakup/main.c	modified	+2	−0	View file
drivers/staging/speakup/serialio.c	modified	+20	−8	View file
drivers/staging/speakup/serialio.h	modified	+3	−1	View file
drivers/staging/speakup/speakup_acntsa.c	modified	+7	−4	View file
drivers/staging/speakup/speakup_apollo.c	modified	+8	−5	View file
drivers/staging/speakup/speakup_audptr.c	modified	+10	−7	View file
drivers/staging/speakup/speakup_bns.c	modified	+7	−4	View file
drivers/staging/speakup/speakup_decext.c	modified	+14	−14	View file
drivers/staging/speakup/speakup_decpc.c	modified	+1	−1	View file
drivers/staging/speakup/speakup_dectlk.c	modified	+10	−7	View file
drivers/staging/speakup/speakup_dtlk.c	modified	+1	−1	View file
drivers/staging/speakup/speakup_dtlk.h	modified	+5	−5	View file
drivers/staging/speakup/speakup_dummy.c	modified	+7	−4	View file
drivers/staging/speakup/speakup_ltlk.c	modified	+9	−7	View file
drivers/staging/speakup/speakup_soft.c	modified	+2	−2	View file
drivers/staging/speakup/speakup_spkout.c	modified	+9	−6	View file
drivers/staging/speakup/speakup_txprt.c	modified	+7	−4	View file
drivers/staging/speakup/spk_priv.h	modified	+8	−2	View file
drivers/staging/speakup/spk_ttyio.c	added	+320	−0	View file
drivers/staging/speakup/spk_types.h	modified	+5	−1	View file
drivers/staging/speakup/synth.c	modified	+16	−4	View file
drivers/staging/typec/fusb302/fusb302.c	modified	+2	−2	View file
drivers/staging/unisys/Documentation/overview.txt	modified	+7	−7	View file
drivers/staging/unisys/include/channel.h	modified	+29	−31	View file
drivers/staging/unisys/include/iochannel.h	modified	+19	−20	View file
drivers/staging/unisys/visorbus/controlvmchannel.h	modified	+27	−29	View file
drivers/staging/unisys/visorbus/vbuschannel.h	modified	+12	−13	View file
drivers/staging/unisys/visorbus/visorbus_main.c	modified	+62	−63	View file
drivers/staging/unisys/visorbus/visorbus_private.h	modified	+12	−12	View file
drivers/staging/unisys/visorbus/visorchannel.c	modified	+4	−4	View file
drivers/staging/unisys/visorbus/visorchipset.c	modified	+111	−115	View file
drivers/staging/unisys/visorhba/visorhba_main.c	modified	+9	−10	View file
drivers/staging/unisys/visorinput/ultrainputreport.h	modified	+22	−27	View file
drivers/staging/unisys/visorinput/visorinput.c	modified	+24	−27	View file
drivers/staging/unisys/visornic/visornic_main.c	modified	+10	−13	View file
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c	modified	+13	−8	View file
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c	modified	+7	−7	View file
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c	modified	+57	−38	View file
drivers/staging/vme/devices/vme_pio2.h	modified	+40	−40	View file
drivers/staging/vt6655/card.c	modified	+1	−1	View file
drivers/staging/vt6655/card.h	modified	+16	−16	View file
drivers/staging/vt6655/channel.h	modified	+2	−2	View file
drivers/staging/vt6655/device_main.c	modified	+9	−10	View file
drivers/staging/vt6655/key.c	modified	+2	−2	View file
drivers/staging/vt6655/mac.h	modified	+29	−29	View file
drivers/staging/vt6655/power.h	modified	+3	−13	View file
drivers/staging/vt6655/rf.h	modified	+8	−8	View file
drivers/staging/vt6656/card.c	modified	+6	−23	View file
drivers/staging/vt6656/main_usb.c	modified	+7	−10	View file
drivers/staging/vt6656/rxtx.c	modified	+49	−41	View file
drivers/staging/wilc1000/host_interface.c	modified	+55	−35	View file
drivers/staging/wilc1000/host_interface.h	modified	+9	−10	View file
drivers/staging/wilc1000/linux_wlan.c	modified	+10	−27	View file
drivers/staging/wilc1000/wilc_debugfs.c	modified	+18	−10	View file
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c	modified	+4	−32	View file
drivers/staging/wilc1000/wilc_wfi_netdevice.h	modified	+1	−0	View file
drivers/staging/wilc1000/wilc_wlan_if.h	modified	+1	−1	View file
drivers/staging/wlan-ng/hfa384x.h	modified	+11	−11	View file
drivers/staging/wlan-ng/hfa384x_usb.c	modified	+8	−10	View file
drivers/staging/wlan-ng/prism2fw.c	modified	+12	−12	View file
drivers/staging/wlan-ng/prism2mgmt.c	modified	+2	−2	View file
drivers/staging/wlan-ng/prism2mib.c	modified	+1	−1	View file
drivers/staging/wlan-ng/prism2sta.c	modified	+50	−50	View file
drivers/staging/xgifb/vb_table.h	modified	+9	−9	View file
drivers/tty/tty_io.c	modified	+57	−3	View file
drivers/tty/tty_ldisc.c	modified	+2	−0	View file
include/linux/hid-sensor-hub.h	modified	+5	−0	View file
include/linux/hid-sensor-ids.h	modified	+5	−0	View file
include/linux/i2c/twl4030-madc.h	deleted	+0	−147	View before deletion
include/linux/iio/iio.h	modified	+6	−0	View file
include/linux/iio/timer/stm32-timer-trigger.h	modified	+2	−0	View file
include/linux/mfd/stm32-timers.h	modified	+2	−0	View file
include/linux/tty.h	modified	+8	−0	View file
include/uapi/linux/tty.h	modified	+1	−0	View file
tools/iio/Makefile	modified	+1	−1	View file
tools/iio/iio_utils.h	modified	+1	−1	View file

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

Documentation/ABI/testing/sysfs-bus-iio

View file

diff --git a/Documentation/ABI/testing/sysfs-bus-iio b/Documentation/ABI/testing/sysfs-bus-iio
index 8c24d08..2db2cdf 100644
--- a/Documentation/ABI/testing/sysfs-bus-iio
+++ b/Documentation/ABI/testing/sysfs-bus-iio
@@ -1425,6 +1425,17 @@ Description:
 		guarantees that the hardware fifo is flushed to the device
 		buffer.
 
+What:		/sys/bus/iio/devices/iio:device*/buffer/hwfifo_timeout
+KernelVersion:	4.12
+Contact:	[email protected]
+Description:
+		A read/write property to provide capability to delay reporting of
+		samples till a timeout is reached. This allows host processors to
+		sleep, while the sensor is storing samples in its internal fifo.
+		The maximum timeout in seconds can be specified by setting
+		hwfifo_timeout.The current delay can be read by reading
+		hwfifo_timeout. A value of 0 means that there is no timeout.
+
 What:		/sys/bus/iio/devices/iio:deviceX/buffer/hwfifo_watermark
 KernelVersion: 4.2
 Contact:	[email protected]

Documentation/ABI/testing/sysfs-bus-iio-meas-spec

View file

diff --git a/Documentation/ABI/testing/sysfs-bus-iio-meas-spec b/Documentation/ABI/testing/sysfs-bus-iio-meas-spec
index 1a6265e..6d47e54 100644
--- a/Documentation/ABI/testing/sysfs-bus-iio-meas-spec
+++ b/Documentation/ABI/testing/sysfs-bus-iio-meas-spec
@@ -5,4 +5,3 @@ Description:
                 Reading returns either '1' or '0'. '1' means that the
                 battery level supplied to sensor is below 2.25V.
                 This ABI is available for tsys02d, htu21, ms8607
-		This ABI is available for htu21, ms8607

Documentation/ABI/testing/sysfs-bus-iio-timer-stm32

View file

diff --git a/Documentation/ABI/testing/sysfs-bus-iio-timer-stm32 b/Documentation/ABI/testing/sysfs-bus-iio-timer-stm32
index 230020e..161c147 100644
--- a/Documentation/ABI/testing/sysfs-bus-iio-timer-stm32
+++ b/Documentation/ABI/testing/sysfs-bus-iio-timer-stm32
@@ -16,6 +16,54 @@ Description:
 		- "OC2REF"    : OC2REF signal is used as trigger output.
 		- "OC3REF"    : OC3REF signal is used as trigger output.
 		- "OC4REF"    : OC4REF signal is used as trigger output.
+		Additional modes (on TRGO2 only):
+		- "OC5REF"    : OC5REF signal is used as trigger output.
+		- "OC6REF"    : OC6REF signal is used as trigger output.
+		- "compare_pulse_OC4REF":
+		  OC4REF rising or falling edges generate pulses.
+		- "compare_pulse_OC6REF":
+		  OC6REF rising or falling edges generate pulses.
+		- "compare_pulse_OC4REF_r_or_OC6REF_r":
+		  OC4REF or OC6REF rising edges generate pulses.
+		- "compare_pulse_OC4REF_r_or_OC6REF_f":
+		  OC4REF rising or OC6REF falling edges generate pulses.
+		- "compare_pulse_OC5REF_r_or_OC6REF_r":
+		  OC5REF or OC6REF rising edges generate pulses.
+		- "compare_pulse_OC5REF_r_or_OC6REF_f":
+		  OC5REF rising or OC6REF falling edges generate pulses.
+
+		+-----------+   +-------------+            +---------+
+		| Prescaler +-> | Counter     |        +-> | Master  | TRGO(2)
+		+-----------+   +--+--------+-+        |-> | Control +-->
+		                   |        |          ||  +---------+
+		                +--v--------+-+ OCxREF ||  +---------+
+		                | Chx compare +----------> | Output  | ChX
+		                +-----------+-+         |  | Control +-->
+		                      .     |           |  +---------+
+		                      .     |           |    .
+		                +-----------v-+ OC6REF  |    .
+		                | Ch6 compare +---------+>
+		                +-------------+
+
+		Example with: "compare_pulse_OC4REF_r_or_OC6REF_r":
+
+		                X
+		              X   X
+		            X .   . X
+		          X   .   .   X
+		        X     .   .     X
+		count X .     .   .     . X
+		        .     .   .     .
+		        .     .   .     .
+		        +---------------+
+		OC4REF  |     .   .     |
+		      +-+     .   .     +-+
+		        .     +---+     .
+		OC6REF  .     |   |     .
+		      +-------+   +-------+
+		        +-+   +-+
+		TRGO2   | |   | |
+		      +-+ +---+ +---------+
 
 What:		/sys/bus/iio/devices/triggerX/master_mode
 KernelVersion:	4.11
@@ -90,3 +138,18 @@ Description:
 			Counting is enabled on rising edge of the connected
 			trigger, and remains enabled for the duration of this
 			selected mode.
+
+What:		/sys/bus/iio/devices/iio:deviceX/in_count_trigger_mode_available
+KernelVersion:	4.13
+Contact:	[email protected]
+Description:
+		Reading returns the list possible trigger modes.
+
+What:		/sys/bus/iio/devices/iio:deviceX/in_count0_trigger_mode
+KernelVersion:	4.13
+Contact:	[email protected]
+Description:
+		Configure the device counter trigger mode
+		counting direction is set by in_count0_count_direction
+		attribute and the counter is clocked by the connected trigger
+		rising edges.

Documentation/devicetree/bindings/iio/adc/amlogic,meson-saradc.txt

View file

diff --git a/Documentation/devicetree/bindings/iio/adc/amlogic,meson-saradc.txt b/Documentation/devicetree/bindings/iio/adc/amlogic,meson-saradc.txt
index 0471891..f413e82 100644
--- a/Documentation/devicetree/bindings/iio/adc/amlogic,meson-saradc.txt
+++ b/Documentation/devicetree/bindings/iio/adc/amlogic,meson-saradc.txt
@@ -2,6 +2,8 @@
 
 Required properties:
 - compatible:	depending on the SoC this should be one of:
+			- "amlogic,meson8-saradc" for Meson8
+			- "amlogic,meson8b-saradc" for Meson8b
 			- "amlogic,meson-gxbb-saradc" for GXBB
 			- "amlogic,meson-gxl-saradc" for GXL
 			- "amlogic,meson-gxm-saradc" for GXM

Documentation/devicetree/bindings/iio/adc/renesas,gyroadc.txt

View file

diff --git a/Documentation/devicetree/bindings/iio/adc/renesas,gyroadc.txt b/Documentation/devicetree/bindings/iio/adc/renesas,gyroadc.txt
index f5b0ada..df5b9f2 100644
--- a/Documentation/devicetree/bindings/iio/adc/renesas,gyroadc.txt
+++ b/Documentation/devicetree/bindings/iio/adc/renesas,gyroadc.txt
@@ -1,4 +1,4 @@
-* Renesas RCar GyroADC device driver
+* Renesas R-Car GyroADC device driver
 
 The GyroADC block is a reduced SPI block with up to 8 chipselect lines,
 which supports the SPI protocol of a selected few SPI ADCs. The SPI ADCs
@@ -16,8 +16,7 @@ Required properties:
 - clocks:	References to all the clocks specified in the clock-names
 		property as specified in
 		Documentation/devicetree/bindings/clock/clock-bindings.txt.
-- clock-names:	Shall contain "fck" and "if". The "fck" is the GyroADC block
-		clock, the "if" is the interface clock.
+- clock-names:	Shall contain "fck". The "fck" is the GyroADC block clock.
 - power-domains: Must contain a reference to the PM domain, if available.
 - #address-cells: Should be <1> (setting for the subnodes) for all ADCs
 		except for "fujitsu,mb88101a". Should be <0> (setting for
@@ -75,8 +74,8 @@ Example:
 	adc@e6e54000 {
 		compatible = "renesas,r8a7791-gyroadc", "renesas,rcar-gyroadc";
 		reg = <0 0xe6e54000 0 64>;
-		clocks = <&mstp9_clks R8A7791_CLK_GYROADC>, <&clk_65m>;
-		clock-names = "fck", "if";
+		clocks = <&mstp9_clks R8A7791_CLK_GYROADC>;
+		clock-names = "fck";
 		power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;
 
 		pinctrl-0 = <&adc_pins>;

Documentation/devicetree/bindings/iio/adc/st,stm32-adc.txt

View file

diff --git a/Documentation/devicetree/bindings/iio/adc/st,stm32-adc.txt b/Documentation/devicetree/bindings/iio/adc/st,stm32-adc.txt
index e35f9f1..8310073 100644
--- a/Documentation/devicetree/bindings/iio/adc/st,stm32-adc.txt
+++ b/Documentation/devicetree/bindings/iio/adc/st,stm32-adc.txt
@@ -21,11 +21,19 @@ own configurable sequence and trigger:
 Contents of a stm32 adc root node:
 -----------------------------------
 Required properties:
-- compatible: Should be "st,stm32f4-adc-core".
+- compatible: Should be one of:
+  "st,stm32f4-adc-core"
+  "st,stm32h7-adc-core"
 - reg: Offset and length of the ADC block register set.
 - interrupts: Must contain the interrupt for ADC block.
-- clocks: Clock for the analog circuitry (common to all ADCs).
-- clock-names: Must be "adc".
+- clocks: Core can use up to two clocks, depending on part used:
+  - "adc" clock: for the analog circuitry, common to all ADCs.
+    It's required on stm32f4.
+    It's optional on stm32h7.
+  - "bus" clock: for registers access, common to all ADCs.
+    It's not present on stm32f4.
+    It's required on stm32h7.
+- clock-names: Must be "adc" and/or "bus" depending on part used.
 - interrupt-controller: Identifies the controller node as interrupt-parent
 - vref-supply: Phandle to the vref input analog reference voltage.
 - #interrupt-cells = <1>;
@@ -42,14 +50,18 @@ An ADC block node should contain at least one subnode, representing an
 ADC instance available on the machine.
 
 Required properties:
-- compatible: Should be "st,stm32f4-adc".
+- compatible: Should be one of:
+  "st,stm32f4-adc"
+  "st,stm32h7-adc"
 - reg: Offset of ADC instance in ADC block (e.g. may be 0x0, 0x100, 0x200).
-- clocks: Input clock private to this ADC instance.
+- clocks: Input clock private to this ADC instance. It's required only on
+  stm32f4, that has per instance clock input for registers access.
 - interrupt-parent: Phandle to the parent interrupt controller.
 - interrupts: IRQ Line for the ADC (e.g. may be 0 for adc@0, 1 for adc@100 or
   2 for adc@200).
 - st,adc-channels: List of single-ended channels muxed for this ADC.
-  It can have up to 16 channels, numbered from 0 to 15 (resp. for in0..in15).
+  It can have up to 16 channels on stm32f4 or 20 channels on stm32h7, numbered
+  from 0 to 15 or 19 (resp. for in0..in15 or in0..in19).
 - #io-channel-cells = <1>: See the IIO bindings section "IIO consumers" in
   Documentation/devicetree/bindings/iio/iio-bindings.txt
 
@@ -58,7 +70,9 @@ Optional properties:
   See ../../dma/dma.txt for details.
 - dma-names: Must be "rx" when dmas property is being used.
 - assigned-resolution-bits: Resolution (bits) to use for conversions. Must
-  match device available resolutions (e.g. can be 6, 8, 10 or 12 on stm32f4).
+  match device available resolutions:
+  * can be 6, 8, 10 or 12 on stm32f4
+  * can be 8, 10, 12, 14 or 16 on stm32h7
   Default is maximum resolution if unset.
 
 Example:

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

View file

diff --git a/Documentation/devicetree/bindings/iio/adc/ti-adc084s021.txt b/Documentation/devicetree/bindings/iio/adc/ti-adc084s021.txt
new file mode 100644
index 0000000..4259e50
--- /dev/null
+++ b/Documentation/devicetree/bindings/iio/adc/ti-adc084s021.txt
@@ -0,0 +1,19 @@
+* Texas Instruments' ADC084S021
+
+Required properties:
+ - compatible        : Must be "ti,adc084s021"
+ - reg               : SPI chip select number for the device
+ - vref-supply       : The regulator supply for ADC reference voltage
+ - spi-cpol          : Per spi-bus bindings
+ - spi-cpha          : Per spi-bus bindings
+ - spi-max-frequency : Per spi-bus bindings
+
+Example:
+adc@0 {
+	compatible = "ti,adc084s021";
+	reg = <0>;
+	vref-supply = <&adc_vref>;
+	spi-cpol;
+	spi-cpha;
+	spi-max-frequency = <16000000>;
+};

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

View file

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

Documentation/devicetree/bindings/iio/imu/st_lsm6dsx.txt

View file

diff --git a/Documentation/devicetree/bindings/iio/imu/st_lsm6dsx.txt b/Documentation/devicetree/bindings/iio/imu/st_lsm6dsx.txt
index 8305fb0..6f28ff5 100644
--- a/Documentation/devicetree/bindings/iio/imu/st_lsm6dsx.txt
+++ b/Documentation/devicetree/bindings/iio/imu/st_lsm6dsx.txt
@@ -13,7 +13,8 @@ Optional properties:
   "data ready" (valid values: 1 or 2).
 - interrupt-parent: should be the phandle for the interrupt controller
 - interrupts: interrupt mapping for IRQ. It should be configured with
-  flags IRQ_TYPE_LEVEL_HIGH or IRQ_TYPE_EDGE_RISING.
+  flags IRQ_TYPE_LEVEL_HIGH, IRQ_TYPE_EDGE_RISING, IRQ_TYPE_LEVEL_LOW or
+  IRQ_TYPE_EDGE_FALLING.
 
   Refer to interrupt-controller/interrupts.txt for generic interrupt
   client node bindings.

Documentation/devicetree/bindings/trivial-devices.txt

View file

diff --git a/Documentation/devicetree/bindings/trivial-devices.txt b/Documentation/devicetree/bindings/trivial-devices.txt
index 3e0a34c..35f406d 100644
--- a/Documentation/devicetree/bindings/trivial-devices.txt
+++ b/Documentation/devicetree/bindings/trivial-devices.txt
@@ -55,6 +55,7 @@ gmt,g751		G751: Digital Temperature Sensor and Thermal Watchdog with Two-Wire In
 infineon,slb9635tt	Infineon SLB9635 (Soft-) I2C TPM (old protocol, max 100khz)
 infineon,slb9645tt	Infineon SLB9645 I2C TPM (new protocol, max 400khz)
 isil,isl29028		Intersil ISL29028 Ambient Light and Proximity Sensor
+isil,isl29030		Intersil ISL29030 Ambient Light and Proximity Sensor
 maxim,ds1050		5 Bit Programmable, Pulse-Width Modulator
 maxim,max1237		Low-Power, 4-/12-Channel, 2-Wire Serial, 12-Bit ADCs
 maxim,max6625		9-Bit/12-Bit Temperature Sensors with I²C-Compatible Serial Interface

MAINTAINERS

View file

diff --git a/MAINTAINERS b/MAINTAINERS
index f9c877f..209abda 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -10553,6 +10553,7 @@ M:	Laurentiu Tudor <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	drivers/staging/fsl-mc/
+F:	Documentation/devicetree/bindings/misc/fsl,qoriq-mc.txt
 
 QT1010 MEDIA DRIVER
 M:	Antti Palosaari <[email protected]>

drivers/iio/accel/hid-sensor-accel-3d.c

View file

diff --git a/drivers/iio/accel/hid-sensor-accel-3d.c b/drivers/iio/accel/hid-sensor-accel-3d.c
index 43a6cb0..2238a26 100644
--- a/drivers/iio/accel/hid-sensor-accel-3d.c
+++ b/drivers/iio/accel/hid-sensor-accel-3d.c
@@ -347,7 +347,7 @@ static int accel_3d_parse_report(struct platform_device *pdev,
 static int hid_accel_3d_probe(struct platform_device *pdev)
 {
 	int ret = 0;
-	static const char *name;
+	const char *name;
 	struct iio_dev *indio_dev;
 	struct accel_3d_state *accel_state;
 	const struct iio_chan_spec *channel_spec;

drivers/iio/accel/mma9551.c

View file

diff --git a/drivers/iio/accel/mma9551.c b/drivers/iio/accel/mma9551.c
index bf27044..1f53f08 100644
--- a/drivers/iio/accel/mma9551.c
+++ b/drivers/iio/accel/mma9551.c
@@ -27,7 +27,6 @@
 
 #define MMA9551_DRV_NAME		"mma9551"
 #define MMA9551_IRQ_NAME		"mma9551_event"
-#define MMA9551_GPIO_NAME		"mma9551_int"
 #define MMA9551_GPIO_COUNT		4
 
 /* Tilt application (inclination in IIO terms). */
@@ -418,8 +417,7 @@ static int mma9551_gpio_probe(struct iio_dev *indio_dev)
 	struct device *dev = &data->client->dev;
 
 	for (i = 0; i < MMA9551_GPIO_COUNT; i++) {
-		gpio = devm_gpiod_get_index(dev, MMA9551_GPIO_NAME, i,
-					    GPIOD_IN);
+		gpio = devm_gpiod_get_index(dev, NULL, i, GPIOD_IN);
 		if (IS_ERR(gpio)) {
 			dev_err(dev, "acpi gpio get index failed\n");
 			return PTR_ERR(gpio);

drivers/iio/accel/st_accel_core.c

View file

diff --git a/drivers/iio/accel/st_accel_core.c b/drivers/iio/accel/st_accel_core.c
index 784670e..07d1489 100644
--- a/drivers/iio/accel/st_accel_core.c
+++ b/drivers/iio/accel/st_accel_core.c
@@ -710,6 +710,8 @@ static const struct iio_trigger_ops st_accel_trigger_ops = {
 int st_accel_common_probe(struct iio_dev *indio_dev)
 {
 	struct st_sensor_data *adata = iio_priv(indio_dev);
+	struct st_sensors_platform_data *pdata =
+		(struct st_sensors_platform_data *)adata->dev->platform_data;
 	int irq = adata->get_irq_data_ready(indio_dev);
 	int err;
 
@@ -736,9 +738,8 @@ int st_accel_common_probe(struct iio_dev *indio_dev)
 					&adata->sensor_settings->fs.fs_avl[0];
 	adata->odr = adata->sensor_settings->odr.odr_avl[0].hz;
 
-	if (!adata->dev->platform_data)
-		adata->dev->platform_data =
-			(struct st_sensors_platform_data *)&default_accel_pdata;
+	if (!pdata)
+		pdata = (struct st_sensors_platform_data *)&default_accel_pdata;
 
 	err = st_sensors_init_sensor(indio_dev, adata->dev->platform_data);
 	if (err < 0)

drivers/iio/accel/st_accel_spi.c

View file

diff --git a/drivers/iio/accel/st_accel_spi.c b/drivers/iio/accel/st_accel_spi.c
index 29a15f2..1a867f5 100644
--- a/drivers/iio/accel/st_accel_spi.c
+++ b/drivers/iio/accel/st_accel_spi.c
@@ -47,15 +47,11 @@ static int st_accel_spi_remove(struct spi_device *spi)
 }
 
 static const struct spi_device_id st_accel_id_table[] = {
-	{ LSM303DLH_ACCEL_DEV_NAME },
-	{ LSM303DLHC_ACCEL_DEV_NAME },
 	{ LIS3DH_ACCEL_DEV_NAME },
 	{ LSM330D_ACCEL_DEV_NAME },
 	{ LSM330DL_ACCEL_DEV_NAME },
 	{ LSM330DLC_ACCEL_DEV_NAME },
 	{ LIS331DLH_ACCEL_DEV_NAME },
-	{ LSM303DL_ACCEL_DEV_NAME },
-	{ LSM303DLM_ACCEL_DEV_NAME },
 	{ LSM330_ACCEL_DEV_NAME },
 	{ LSM303AGR_ACCEL_DEV_NAME },
 	{ LIS2DH12_ACCEL_DEV_NAME },

drivers/iio/adc/Kconfig

View file

diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig
index 401f47b..614fa41 100644
--- a/drivers/iio/adc/Kconfig
+++ b/drivers/iio/adc/Kconfig
@@ -679,6 +679,18 @@ config TI_ADC0832
 	  This driver can also be built as a module. If so, the module will be
 	  called ti-adc0832.
 
+config TI_ADC084S021
+	tristate "Texas Instruments ADC084S021"
+	depends on SPI
+	select IIO_BUFFER
+	select IIO_TRIGGERED_BUFFER
+	help
+	  If you say yes here you get support for Texas Instruments ADC084S021
+	  chips.
+
+	  This driver can also be built as a module. If so, the module will be
+	  called ti-adc084s021.
+
 config TI_ADC12138
 	tristate "Texas Instruments ADC12130/ADC12132/ADC12138"
 	depends on SPI
@@ -691,6 +703,18 @@ config TI_ADC12138
 	  This driver can also be built as a module. If so, the module will be
 	  called ti-adc12138.
 
+config TI_ADC108S102
+	tristate "Texas Instruments ADC108S102 and ADC128S102 driver"
+	depends on SPI
+	select IIO_BUFFER
+	select IIO_TRIGGERED_BUFFER
+	help
+	  Say yes here to build support for Texas Instruments ADC108S102 and
+	  ADC128S102 ADC.
+
+	  To compile this driver as a module, choose M here: the module will
+	  be called ti-adc108s102.
+
 config TI_ADC128S052
 	tristate "Texas Instruments ADC128S052/ADC122S021/ADC124S021"
 	depends on SPI

drivers/iio/adc/Makefile

View file

diff --git a/drivers/iio/adc/Makefile b/drivers/iio/adc/Makefile
index 9339bec..b546736 100644
--- a/drivers/iio/adc/Makefile
+++ b/drivers/iio/adc/Makefile
@@ -62,7 +62,9 @@ obj-$(CONFIG_STM32_ADC_CORE) += stm32-adc-core.o
 obj-$(CONFIG_STM32_ADC) += stm32-adc.o
 obj-$(CONFIG_TI_ADC081C) += ti-adc081c.o
 obj-$(CONFIG_TI_ADC0832) += ti-adc0832.o
+obj-$(CONFIG_TI_ADC084S021) += ti-adc084s021.o
 obj-$(CONFIG_TI_ADC12138) += ti-adc12138.o
+obj-$(CONFIG_TI_ADC108S102) += ti-adc108s102.o
 obj-$(CONFIG_TI_ADC128S052) += ti-adc128s052.o
 obj-$(CONFIG_TI_ADC161S626) += ti-adc161s626.o
 obj-$(CONFIG_TI_ADS1015) += ti-ads1015.o

drivers/iio/adc/ad7791.c

View file

diff --git a/drivers/iio/adc/ad7791.c b/drivers/iio/adc/ad7791.c
index 1817ebf..34e353c 100644
--- a/drivers/iio/adc/ad7791.c
+++ b/drivers/iio/adc/ad7791.c
@@ -272,11 +272,9 @@ static ssize_t ad7791_write_frequency(struct device *dev,
 	struct ad7791_state *st = iio_priv(indio_dev);
 	int i, ret;
 
-	for (i = 0; i < ARRAY_SIZE(ad7791_sample_freq_avail); i++)
-		if (sysfs_streq(ad7791_sample_freq_avail[i], buf))
-			break;
-	if (i == ARRAY_SIZE(ad7791_sample_freq_avail))
-		return -EINVAL;
+	i = sysfs_match_string(ad7791_sample_freq_avail, buf);
+	if (i < 0)
+		return i;
 
 	ret = iio_device_claim_direct_mode(indio_dev);
 	if (ret)

drivers/iio/adc/aspeed_adc.c

View file

diff --git a/drivers/iio/adc/aspeed_adc.c b/drivers/iio/adc/aspeed_adc.c
index 62670cb..e0ea411 100644
--- a/drivers/iio/adc/aspeed_adc.c
+++ b/drivers/iio/adc/aspeed_adc.c
@@ -212,7 +212,10 @@ static int aspeed_adc_probe(struct platform_device *pdev)
 	}
 
 	/* Start all channels in normal mode. */
-	clk_prepare_enable(data->clk_scaler->clk);
+	ret = clk_prepare_enable(data->clk_scaler->clk);
+	if (ret)
+		goto clk_enable_error;
+
 	adc_engine_control_reg_val = GENMASK(31, 16) |
 		ASPEED_OPERATION_MODE_NORMAL | ASPEED_ENGINE_ENABLE;
 	writel(adc_engine_control_reg_val,
@@ -236,6 +239,7 @@ iio_register_error:
 	writel(ASPEED_OPERATION_MODE_POWER_DOWN,
 		data->base + ASPEED_REG_ENGINE_CONTROL);
 	clk_disable_unprepare(data->clk_scaler->clk);
+clk_enable_error:
 	clk_hw_unregister_divider(data->clk_scaler);
 
 scaler_error:

drivers/iio/adc/cpcap-adc.c

View file

diff --git a/drivers/iio/adc/cpcap-adc.c b/drivers/iio/adc/cpcap-adc.c
index 62d37f8..6e419d5 100644
--- a/drivers/iio/adc/cpcap-adc.c
+++ b/drivers/iio/adc/cpcap-adc.c
@@ -52,6 +52,10 @@
 #define CPCAP_BIT_RAND0			BIT(1)	/* Set with CAL_MODE */
 #define CPCAP_BIT_ADEN			BIT(0)	/* Currently unused */
 
+#define CPCAP_REG_ADCC1_DEFAULTS	(CPCAP_BIT_ADEN_AUTO_CLR | \
+					 CPCAP_BIT_ADC_CLK_SEL0 |  \
+					 CPCAP_BIT_RAND1)
+
 /* Register CPCAP_REG_ADCC2 bits */
 #define CPCAP_BIT_CAL_FACTOR_ENABLE	BIT(15)	/* Currently unused */
 #define CPCAP_BIT_BATDETB_EN		BIT(14)	/* Currently unused */
@@ -62,7 +66,7 @@
 #define CPCAP_BIT_ADC_PS_FACTOR0	BIT(9)
 #define CPCAP_BIT_AD4_SELECT		BIT(8)	/* Currently unused */
 #define CPCAP_BIT_ADC_BUSY		BIT(7)	/* Currently unused */
-#define CPCAP_BIT_THERMBIAS_EN		BIT(6)	/* Currently unused */
+#define CPCAP_BIT_THERMBIAS_EN		BIT(6)	/* Bias for AD0_BATTDETB */
 #define CPCAP_BIT_ADTRIG_DIS		BIT(5)	/* Disable interrupt */
 #define CPCAP_BIT_LIADC			BIT(4)	/* Currently unused */
 #define CPCAP_BIT_TS_REFEN		BIT(3)	/* Currently unused */
@@ -70,6 +74,12 @@
 #define CPCAP_BIT_TS_M1			BIT(1)	/* Currently unused */
 #define CPCAP_BIT_TS_M0			BIT(0)	/* Currently unused */
 
+#define CPCAP_REG_ADCC2_DEFAULTS	(CPCAP_BIT_AD4_SELECT | \
+					 CPCAP_BIT_ADTRIG_DIS | \
+					 CPCAP_BIT_LIADC | \
+					 CPCAP_BIT_TS_M2 | \
+					 CPCAP_BIT_TS_M1)
+
 #define CPCAP_MAX_TEMP_LVL		27
 #define CPCAP_FOUR_POINT_TWO_ADC	801
 #define ST_ADC_CAL_CHRGI_HIGH_THRESHOLD	530
@@ -78,7 +88,7 @@
 #define ST_ADC_CAL_BATTI_LOW_THRESHOLD	494
 #define ST_ADC_CALIBRATE_DIFF_THRESHOLD	3
 
-#define CPCAP_ADC_MAX_RETRIES		5	/* Calibration and quirk */
+#define CPCAP_ADC_MAX_RETRIES		5	/* Calibration */
 
 /**
  * struct cpcap_adc_ato - timing settings for cpcap adc
@@ -124,10 +134,10 @@ struct cpcap_adc {
  */
 enum cpcap_adc_channel {
 	/* Bank0 channels */
-	CPCAP_ADC_AD0_BATTDETB,	/* Battery detection */
+	CPCAP_ADC_AD0,		/* Battery temperature */
 	CPCAP_ADC_BATTP,	/* Battery voltage */
 	CPCAP_ADC_VBUS,		/* USB VBUS voltage */
-	CPCAP_ADC_AD3,		/* Battery temperature when charging */
+	CPCAP_ADC_AD3,		/* Die temperature when charging */
 	CPCAP_ADC_BPLUS_AD4,	/* Another battery or system voltage */
 	CPCAP_ADC_CHG_ISENSE,	/* Calibrated charge current */
 	CPCAP_ADC_BATTI,	/* Calibrated system current */
@@ -217,7 +227,7 @@ struct cpcap_adc_request {
 /* Phasing table for channels. Note that channels 16 & 17 use BATTP and BATTI */
 static const struct cpcap_adc_phasing_tbl bank_phasing[] = {
 	/* Bank0 */
-	[CPCAP_ADC_AD0_BATTDETB] = {0, 0x80, 0x80,    0, 1023},
+	[CPCAP_ADC_AD0] =          {0, 0x80, 0x80,    0, 1023},
 	[CPCAP_ADC_BATTP] =        {0, 0x80, 0x80,    0, 1023},
 	[CPCAP_ADC_VBUS] =         {0, 0x80, 0x80,    0, 1023},
 	[CPCAP_ADC_AD3] =          {0, 0x80, 0x80,    0, 1023},
@@ -243,7 +253,7 @@ static const struct cpcap_adc_phasing_tbl bank_phasing[] = {
  */
 static struct cpcap_adc_conversion_tbl bank_conversion[] = {
 	/* Bank0 */
-	[CPCAP_ADC_AD0_BATTDETB] = {
+	[CPCAP_ADC_AD0] = {
 		IIO_CHAN_INFO_PROCESSED,    0,    0, 0,     1,    1,
 	},
 	[CPCAP_ADC_BATTP] = {
@@ -541,6 +551,15 @@ static void cpcap_adc_setup_bank(struct cpcap_adc *ddata,
 		return;
 
 	switch (req->channel) {
+	case CPCAP_ADC_AD0:
+		value2 |= CPCAP_BIT_THERMBIAS_EN;
+		error = regmap_update_bits(ddata->reg, CPCAP_REG_ADCC2,
+					   CPCAP_BIT_THERMBIAS_EN,
+					   value2);
+		if (error)
+			return;
+		usleep_range(800, 1000);
+		break;
 	case CPCAP_ADC_AD8 ... CPCAP_ADC_TSY2_AD15:
 		value1 |= CPCAP_BIT_AD_SEL1;
 		break;
@@ -583,7 +602,8 @@ static void cpcap_adc_setup_bank(struct cpcap_adc *ddata,
 	error = regmap_update_bits(ddata->reg, CPCAP_REG_ADCC2,
 				   CPCAP_BIT_ATOX_PS_FACTOR |
 				   CPCAP_BIT_ADC_PS_FACTOR1 |
-				   CPCAP_BIT_ADC_PS_FACTOR0,
+				   CPCAP_BIT_ADC_PS_FACTOR0 |
+				   CPCAP_BIT_THERMBIAS_EN,
 				   value2);
 	if (error)
 		return;
@@ -614,27 +634,6 @@ static void cpcap_adc_setup_bank(struct cpcap_adc *ddata,
 	}
 }
 
-/*
- * Occasionally the ADC does not seem to start and there will be no
- * interrupt. Let's re-init interrupt to prevent the ADC from hanging
- * for the next request. It is unclear why this happens, but the next
- * request will usually work after doing this.
- */
-static void cpcap_adc_quirk_reset_lost_irq(struct cpcap_adc *ddata)
-{
-	int error;
-
-	dev_info(ddata->dev, "lost ADC irq, attempting to reinit\n");
-	disable_irq(ddata->irq);
-	error = regmap_update_bits(ddata->reg, CPCAP_REG_ADCC2,
-				   CPCAP_BIT_ADTRIG_DIS,