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

Pull i2c updates from Wolfram Sang:

 - new drivers for Spreadtrum I2C, Intel Cherry Trail Whiskey Cove SMBUS

 - quite some driver updates

 - cleanups for the i2c-mux subsystem

 - some subsystem-wide constification

 - further cleanup of include/linux/i2c

* 'i2c/for-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (50 commits)
  i2c: sprd: Fix undefined reference errors
  i2c: nomadik: constify amba_id
  i2c: versatile: Make i2c_algo_bit_data const
  i2c: busses: make i2c_adapter_quirks const
  i2c: busses: make i2c_adapter const
  i2c: busses: make i2c_algorithm const
  i2c: Add Spreadtrum I2C controller driver
  dt-bindings: i2c: Add Spreadtrum I2C controller documentation
  i2c-cht-wc: make cht_wc_i2c_adap_driver static
  MAINTAINERS: Add entry for drivers/i2c/busses/i2c-cht-wc.c
  i2c: aspeed: Retain delay/setup/hold values when configuring bus frequency
  dt-bindings: i2c: eeprom: Document vendor to be used and deprecated ones
  i2c: i801: Restore the presence state of P2SB PCI device after reading BAR
  MAINTAINERS: drop entry for Blackfin I2C and Sonic's email
  blackfin: merge the two TWI header files
  i2c: davinci: Preserve return value of devm_clk_get
  i2c: mediatek: Add i2c compatible for MediaTek MT7622
  dt-bindings: i2c: Add MediaTek MT7622 i2c binding
  dt-bindings: i2c: modify information formats
  i2c: mux: i2c-arb-gpio-challenge: allow compiling w/o OF support
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/i2c/busses/Kconfig
Simple merge

diff --cc drivers/i2c/busses/i2c-aspeed.c
Simple merge

diff --cc drivers/i2c/busses/i2c-designware-platdrv.c
index 2b98a173136f2e53d729dfbe7fe314fe1eaf07fc,abe1eca8d6899ad561f2d1205a89dca9182eaee1..0e65b97842b4332ba39e3f2eb584faf9ce74c7c0
--- 1/drivers/i2c/busses/i2c-designware-platdrv.c
--- 2/drivers/i2c/busses/i2c-designware-platdrv.c
+++ b/drivers/i2c/busses/i2c-designware-platdrv.c
@@@ -437,10 -426,9 +437,9 @@@ static void dw_i2c_plat_complete(struc
  #endif
  
  #ifdef CONFIG_PM
 -static int dw_i2c_plat_suspend(struct device *dev)
 +static int dw_i2c_plat_runtime_suspend(struct device *dev)
  {
-       struct platform_device *pdev = to_platform_device(dev);
-       struct dw_i2c_dev *i_dev = platform_get_drvdata(pdev);
+       struct dw_i2c_dev *i_dev = dev_get_drvdata(dev);
  
        i_dev->disable(i_dev);
        i2c_dw_plat_prepare_clk(i_dev, false);

diff --cc drivers/i2c/busses/i2c-designware-slave.c
Simple merge

diff --cc drivers/i2c/muxes/Kconfig
Simple merge