From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 15 Nov 2017 01:52:21 +0000 (-0800)
Subject: Merge branch 'i2c/for-4.15' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v4.19~2203
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4008e6a9bcee2f3b61bb11951de0fb0ed764cb91;p=platform%2Fkernel%2Flinux-rpi.git

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

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
  ...
---

4008e6a9bcee2f3b61bb11951de0fb0ed764cb91
diff --cc drivers/gpio/gpiolib.c
index 86dcd02,c952ef1..641a5eb
--- a/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)) {