Merge branch 'i2c/for-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux

Pull i2c updates from Wolfram Sang:

 - New drivers: UniPhier (with and without FIFO)

 - some drivers got some bigger rework: ismt, designware, img-scb (rcar
   had to be reverted because issues were showing up just lately)

 - ACPI: reworked the device scanning and added support for muxes

... and quite a lot of driver bugfixes and cleanups this time.  All
files touched outside of the i2c realm have proper acks.

* 'i2c/for-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (70 commits)
  i2c: rcar: Revert the latest refactoring series
  i2c: pnx: remove superfluous assignment
  MAINTAINERS: i2c: drop i2c-pnx maintainer
  MAINTAINERS: i2c: mark also subdirectories as maintained
  i2c: cadence: enable driver for ARM64
  i2c: i801: Document Intel DNV and Broxton
  i2c: at91: manage unexpected RXRDY flag when starting a transfer
  i2c: pnx: Use setup_timer instead of open coding it
  i2c: add ACPI support for I2C mux ports
  acpi: add acpi_preset_companion() stub
  i2c: pxa: Add support for pxa910/988 & new configuration features
  i2c: au1550: Convert to devm_kzalloc and devm_ioremap_resource
  i2c-dev: Fix I2C_SLAVE ioctl comment
  i2c-dev: Fix typo in ioctl name reference
  i2c: sirf: tune the divider to make i2c bus freq more accurate
  i2c: imx: Use -ENXIO as error in the NACK case
  i2c: i801: Add support for Intel Broxton
  i2c: i801: Add support for Intel DNV
  i2c: mediatek: add i2c resume support
  i2c: imx: implement bus recovery
  ...

1 files changed, 2 insertions, 6 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 1a73c20bc400..8f10834124a9 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1626,6 +1626,7 @@ L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
 F:      arch/arm/boot/dts/uniphier*
 F:      arch/arm/mach-uniphier/
+F:      drivers/i2c/busses/i2c-uniphier*
 F:      drivers/pinctrl/uniphier/
 F:      drivers/tty/serial/8250/8250_uniphier.c
 N:      uniphier
@@ -5163,6 +5164,7 @@ S:	Maintained
 F:      Documentation/devicetree/bindings/i2c/
 F:      Documentation/i2c/
 F:      drivers/i2c/
+F:      drivers/i2c/*/
 F:      include/linux/i2c.h
 F:      include/linux/i2c-*.h
 F:      include/uapi/linux/i2c.h
@@ -8418,12 +8420,6 @@ M:	"Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
 S:      Maintained
 F:      drivers/pnp/
 
-PNXxxxx I2C DRIVER
-M:      Vitaly Wool <vitalywool@gmail.com>
-L:      linux-i2c@vger.kernel.org
-S:      Maintained
-F:      drivers/i2c/busses/i2c-pnx.c
-
 PPP PROTOCOL DRIVERS AND COMPRESSORS
 M:      Paul Mackerras <paulus@samba.org>
 L:      linux-ppp@vger.kernel.org