Merge branch 'i2c/for-4.15' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git...

Pull i2c updates from Wolfram Sang:
 "This contains two bigger than usual tree-wide changes this time. They
  all have proper acks, caused no merge conflicts in linux-next where
  they have been for a while. They are namely:

   - to-gpiod conversion of the i2c-gpio driver and its users (touching
     arch/* and drivers/mfd/*)

   - adding a sbs-manager based on I2C core updates to SMBus alerts
     (touching drivers/power/*)

  Other notable changes:

   - i2c_boardinfo can now carry a dev_name to be used when the device
     is created. This is because some devices in ACPI world need fixed
     names to find the regulators.

   - the designware driver got a long discussed overhaul of its PM
     handling. img-scb and davinci got PM support, too.

   - at24 driver has way better OF support. And it has a new maintainer.
     Thanks Bartosz for stepping up!

  The rest is regular driver updates and fixes"

* 'i2c/for-4.15' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (55 commits)
  ARM: sa1100: simpad: Correct I2C GPIO offsets
  i2c: aspeed: Deassert reset in probe
  eeprom: at24: Add OF device ID table
  MAINTAINERS: new maintainer for AT24 driver
  i2c: nuc900: remove platform_data, too
  i2c: thunderx: Remove duplicate NULL check
  i2c: taos-evm: Remove duplicate NULL check
  i2c: Make i2c_unregister_device() NULL-aware
  i2c: xgene-slimpro: Support v2
  i2c: mpc: remove useless variable initialization
  i2c: omap: Trigger bus recovery in lockup case
  i2c: gpio: Add support for named gpios in DT
  dt-bindings: i2c: i2c-gpio: Add support for named gpios
  i2c: gpio: Local vars in probe
  i2c: gpio: Augment all boardfiles to use open drain
  i2c: gpio: Enforce open drain through gpiolib
  gpio: Make it possible for consumers to enforce open drain
  i2c: gpio: Convert to use descriptors
  power: supply: sbs-message: fix some code style issues
  power: supply: sbs-battery: remove unchecked return var
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/mach-ep93xx/include/mach/platform.h
Simple merge

diff --cc arch/arm/mach-ixp4xx/avila-setup.c
Simple merge

diff --cc arch/arm/mach-ixp4xx/dsmg600-setup.c
Simple merge

diff --cc arch/arm/mach-ixp4xx/fsg-setup.c
Simple merge

diff --cc arch/arm/mach-ixp4xx/goramo_mlr.c
Simple merge

diff --cc arch/arm/mach-ixp4xx/ixdp425-setup.c
Simple merge

diff --cc arch/arm/mach-ixp4xx/nas100d-setup.c
Simple merge

diff --cc arch/arm/mach-ixp4xx/nslu2-setup.c
Simple merge

diff --cc arch/arm/mach-sa1100/simpad.c
Simple merge

diff --cc drivers/gpio/gpiolib.c
index 86dcd02cf602f91d85eb8af0342d07902c46878f,c952ef1b2f46469d2f07c4a30218b63b1c9a393d..641a5eb552cbe02706fd1f828d773f9a818f2b37
--- 1/drivers/gpio/gpiolib.c
--- 2/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@@ -3528,12 -3264,25 +3528,25 @@@ int gpiod_configure_flags(struct gpio_d
  
        if (lflags & GPIO_ACTIVE_LOW)
                set_bit(FLAG_ACTIVE_LOW, &desc->flags);
+ 
        if (lflags & GPIO_OPEN_DRAIN)
                set_bit(FLAG_OPEN_DRAIN, &desc->flags);
+       else if (dflags & GPIOD_FLAGS_BIT_OPEN_DRAIN) {
+               /*
+                * This enforces open drain mode from the consumer side.
+                * This is necessary for some busses like I2C, but the lookup
+                * should *REALLY* have specified them as open drain in the
+                * first place, so print a little warning here.
+                */
+               set_bit(FLAG_OPEN_DRAIN, &desc->flags);
+               gpiod_warn(desc,
+                          "enforced open drain please flag it properly in DT/ACPI DSDT/board file\n");
+       }
+ 
        if (lflags & GPIO_OPEN_SOURCE)
                set_bit(FLAG_OPEN_SOURCE, &desc->flags);
 -      if (lflags & GPIO_SLEEP_MAY_LOOSE_VALUE)
 -              set_bit(FLAG_SLEEP_MAY_LOOSE_VALUE, &desc->flags);
 +      if (lflags & GPIO_SLEEP_MAY_LOSE_VALUE)
 +              set_bit(FLAG_SLEEP_MAY_LOSE_VALUE, &desc->flags);
  
        /* No particular flag request, return here... */
        if (!(dflags & GPIOD_FLAGS_BIT_DIR_SET)) {

diff --cc drivers/power/supply/Makefile
Simple merge

diff --cc include/linux/gpio/consumer.h
Simple merge