Merge tag 'iio-for-4.8b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio...

Jonathan writes:

Second round of new iio device support, features and cleanups in the 4.8 cycle

Firstly some contact detail updates:
* NXP took over freescale. Update the mma8452 header to reflect this.
* Martin Kepplinger email address change in mma8452 header.
* Adriana Reus has changed email address. Update .mailmap.
* Matt Ranostay has changed email address. Update .mailmap.

New Device Support
* max1363
  - add the missing i2c_device_ids for a couple of parts so they can actually
    be used.
* ms5867
  - add device ids for ms5805 and ms5837 parts.

New Features
* ad5755
  - DT support.  This one was a bit controversial and under review for a long
    time.  Still no one could come up with a better solution.
* stx104
  - add gpio support
* ti-adc081c
  - Add ACPI device ID matching.

Core changes
* Refuse to register triggers with duplicate names.  There is no way to
  distinguish between them so this makes no sense.  A few drivers do not
  generate unique names for each instance of the device present.  We can't
  fix this without changing ABI so leave them and wait for someone to
  actually take the rare step of two identical accelerometers on the same
  board.
* buffer-dma
  - use ARRAY_SIZE in a few appropriate locations.

Tools
* Fix the fact that the --trigger-num option in generic_buffer didn't allow
  0 which is perfectly valid in the ABI.

Cleanups
* as3935
  - improve error reporting.
  - remove redundant zeroing of a field in iio_priv.
* gp2ap020a00f
  - use the iio_device_claim_*_mode helpers rather than open coding locking
  around mode changes.
* isl29125
  - use the iio_device_claim_*_mode helpers rather than open coding locking.
* lidar
  - use the iio_device_claim_*_mode helpers rather than open coding locking.
* mma8452
  - more detail in devices supported description in comments (addresses and
  similar)
* sca3000
  - add a missing error check.
* tcs3414
  - use the iio_device_claim_*_mode helpers rather than open coding locking.
* tcs3472
  - use the iio_device_claim_*_mode helpers rather than open coding locking.

diff --cc .mailmap
index 779a9ca,2b81945..6c3d82d
--- 1/.mailmap
--- 2/.mailmap
+++ b/.mailmap
@@@ -89,7 -84,8 +90,9 @@@ Leonid I Ananiev <leonid.i.ananiev@inte
  Linas Vepstas <linas@austin.ibm.com>
  Mark Brown <broonie@sirena.org.uk>
  Matthieu CASTET <castet.matthieu@free.fr>
 +Mauro Carvalho Chehab <mchehab@kernel.org> <maurochehab@gmail.com> <mchehab@infradead.org> <mchehab@redhat.com> <m.chehab@samsung.com> <mchehab@osg.samsung.com> <mchehab@s-opensource.com>
+ Matt Ranostay <mranostay@gmail.com> Matthew Ranostay <mranostay@embeddedalley.com>
+ Matt Ranostay <mranostay@gmail.com> <matt.ranostay@intel.com>
  Mayuresh Janorkar <mayur@ti.com>
  Michael Buesch <m@bues.ch>
  Michel Dänzer <michel@tungstengraphics.com>

diff --cc drivers/iio/dac/Kconfig
index f7c71da,b3feb0b..ca81447
--- 1/drivers/iio/dac/Kconfig
--- 2/drivers/iio/dac/Kconfig
+++ b/drivers/iio/dac/Kconfig
@@@ -246,13 -246,14 +246,14 @@@ config MCP492
          will be called mcp4922.
  
  config STX104
 -      tristate "Apex Embedded Systems STX104 driver"
 -      depends on ISA
 +      tristate "Apex Embedded Systems STX104 DAC driver"
 +      depends on X86 && ISA_BUS_API
+       select GPIOLIB
        help
-         Say yes here to build support for the 2-channel DAC on the Apex
-         Embedded Systems STX104 integrated analog PC/104 card. The base port
-         addresses for the devices may be configured via the "base" module
-         parameter array.
+         Say yes here to build support for the 2-channel DAC and GPIO on the
+         Apex Embedded Systems STX104 integrated analog PC/104 card. The base
+         port addresses for the devices may be configured via the base array
+         module parameter.
  
  config VF610_DAC
        tristate "Vybrid vf610 DAC driver"

diff --cc drivers/iio/dac/stx104.c
index 2794122,e0f31a1..792a971
--- 1/drivers/iio/dac/stx104.c
--- 2/drivers/iio/dac/stx104.c
+++ b/drivers/iio/dac/stx104.c
@@@ -124,10 -251,22 +244,11 @@@ static struct isa_driver stx104_driver 
        .probe = stx104_probe,
        .driver = {
                .name = "stx104"
-       }
+       },
+       .remove = stx104_remove
  };
  
 -static void __exit stx104_exit(void)
 -{
 -      isa_unregister_driver(&stx104_driver);
 -}
 -
 -static int __init stx104_init(void)
 -{
 -      return isa_register_driver(&stx104_driver, num_stx104);
 -}
 -
 -module_init(stx104_init);
 -module_exit(stx104_exit);
 +module_isa_driver(stx104_driver, num_stx104);
  
  MODULE_AUTHOR("William Breathitt Gray <vilhelm.gray@gmail.com>");
  MODULE_DESCRIPTION("Apex Embedded Systems STX104 DAC driver");

diff --cc drivers/iio/industrialio-trigger.c
Simple merge

diff --cc drivers/iio/proximity/as3935.c
Simple merge