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

Pull i2c updates from Wolfram Sang:

 - mainly feature additions to drivers (stm32f7, qup, xlp9xx, mlxcpld, ...)

 - conversion to use the i2c_8bit_addr_from_msg macro consistently

 - move includes to platform_data

 - core updates to allow the (still in review) I3C subsystem to connect

 - and the regular share of smaller driver updates

* 'i2c/for-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (68 commits)
  i2c: qup: fix building without CONFIG_ACPI
  i2c: tegra: Remove suspend-resume
  i2c: imx-lpi2c: Switch to SPDX identifier
  i2c: mxs: Switch to SPDX identifier
  i2c: busses: make use of i2c_8bit_addr_from_msg
  i2c: algos: make use of i2c_8bit_addr_from_msg
  i2c: rcar: document R8A77980 bindings
  i2c: qup: Add command-line parameter to override SCL frequency
  i2c: qup: Correct duty cycle for FM and FM+
  i2c: qup: Add support for Fast Mode Plus
  i2c: qup: add probe path for Centriq ACPI devices
  i2c: robotfuzz-osif: drop pointless test
  i2c: robotfuzz-osif: remove pointless local variable
  i2c: rk3x: Don't print visible virtual mapping MMIO address
  i2c: opal: don't check number of messages in the driver
  i2c: ibm_iic: don't check number of messages in the driver
  i2c: imx: Switch to SPDX identifier
  i2c: mux: pca954x: merge calls to of_match_device and of_device_get_match_data
  i2c: mux: demux-pinctrl: use proper parent device for demux adapter
  i2c: mux: improve error message for failed symlink
  ...

diff --cc Documentation/i2c/busses/i2c-ocores
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/mach-omap2/common.h
Simple merge

diff --cc arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
Simple merge

diff --cc arch/arm/mach-omap2/omap_hwmod_44xx_data.c
Simple merge

diff --cc arch/arm/mach-omap2/omap_hwmod_54xx_data.c
Simple merge

diff --cc arch/arm/mach-omap2/omap_hwmod_7xx_data.c
Simple merge

diff --cc arch/arm/mach-pxa/palmz72.c
Simple merge

diff --cc arch/arm/mach-pxa/viper.c
Simple merge

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

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

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

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

diff --cc drivers/i2c/i2c-core-base.c
Simple merge

diff --cc drivers/i2c/muxes/i2c-mux-gpio.c
Simple merge

diff --cc drivers/i2c/muxes/i2c-mux-reg.c
index f583f805fee9e5f7c96912a79eb67fdf24b3a3da,f624ed64a47b946e6fdf0efea3cad4e6c2b5cda7..5653295b01cd35c2a701335f976641fb9946f260
--- 1/drivers/i2c/muxes/i2c-mux-reg.c
--- 2/drivers/i2c/muxes/i2c-mux-reg.c
+++ b/drivers/i2c/muxes/i2c-mux-reg.c
@@@ -124,13 -124,11 +124,11 @@@ static int i2c_mux_reg_probe_dt(struct 
        }
        mux->data.write_only = of_property_read_bool(np, "write-only");
  
 -      values = devm_kzalloc(&pdev->dev,
 -                            sizeof(*mux->data.values) * mux->data.n_values,
 +      values = devm_kcalloc(&pdev->dev,
 +                            mux->data.n_values, sizeof(*mux->data.values),
                              GFP_KERNEL);
-       if (!values) {
-               dev_err(&pdev->dev, "Cannot allocate values array");
+       if (!values)
                return -ENOMEM;
-       }
  
        for_each_child_of_node(np, child) {
                of_property_read_u32(child, "reg", values + i);

diff --cc drivers/media/platform/marvell-ccic/mmp-driver.c
Simple merge

diff --cc drivers/mfd/sm501.c
Simple merge

diff --cc drivers/mfd/timberdale.c
Simple merge