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

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

1 files changed, 31 insertions, 20 deletions

diff --git a/drivers/i2c/i2c-core-of.c b/drivers/i2c/i2c-core-of.c
index c405270a98b4..6cb7ad608bcd 100644
--- a/drivers/i2c/i2c-core-of.c
+++ b/drivers/i2c/i2c-core-of.c
@@ -22,53 +22,64 @@
 
 #include "i2c-core.h"
 
-static struct i2c_client *of_i2c_register_device(struct i2c_adapter *adap,
-                                                 struct device_node *node)
+int of_i2c_get_board_info(struct device *dev, struct device_node *node,
+                          struct i2c_board_info *info)
 {
-        struct i2c_client *client;
-        struct i2c_board_info info = {};
-        struct dev_archdata dev_ad = {};
         u32 addr;
         int ret;
 
-        dev_dbg(&adap->dev, "of_i2c: register %pOF\n", node);
+        memset(info, 0, sizeof(*info));
 
-        if (of_modalias_node(node, info.type, sizeof(info.type)) < 0) {
-                dev_err(&adap->dev, "of_i2c: modalias failure on %pOF\n",
-                        node);
-                return ERR_PTR(-EINVAL);
+        if (of_modalias_node(node, info->type, sizeof(info->type)) < 0) {
+                dev_err(dev, "of_i2c: modalias failure on %pOF\n", node);
+                return -EINVAL;
         }
 
         ret = of_property_read_u32(node, "reg", &addr);
         if (ret) {
-                dev_err(&adap->dev, "of_i2c: invalid reg on %pOF\n", node);
-                return ERR_PTR(ret);
+                dev_err(dev, "of_i2c: invalid reg on %pOF\n", node);
+                return ret;
         }
 
         if (addr & I2C_TEN_BIT_ADDRESS) {
                 addr &= ~I2C_TEN_BIT_ADDRESS;
-                info.flags |= I2C_CLIENT_TEN;
+                info->flags |= I2C_CLIENT_TEN;
         }
 
         if (addr & I2C_OWN_SLAVE_ADDRESS) {
                 addr &= ~I2C_OWN_SLAVE_ADDRESS;
-                info.flags |= I2C_CLIENT_SLAVE;
+                info->flags |= I2C_CLIENT_SLAVE;
         }
 
-        info.addr = addr;
-        info.archdata = &dev_ad;
-        info.of_node = of_node_get(node);
+        info->addr = addr;
+        info->of_node = node;
 
         if (of_property_read_bool(node, "host-notify"))
-                info.flags |= I2C_CLIENT_HOST_NOTIFY;
+                info->flags |= I2C_CLIENT_HOST_NOTIFY;
 
         if (of_get_property(node, "wakeup-source", NULL))
-                info.flags |= I2C_CLIENT_WAKE;
+                info->flags |= I2C_CLIENT_WAKE;
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(of_i2c_get_board_info);
+
+static struct i2c_client *of_i2c_register_device(struct i2c_adapter *adap,
+                                                 struct device_node *node)
+{
+        struct i2c_client *client;
+        struct i2c_board_info info;
+        int ret;
+
+        dev_dbg(&adap->dev, "of_i2c: register %pOF\n", node);
+
+        ret = of_i2c_get_board_info(&adap->dev, node, &info);
+        if (ret)
+                return ERR_PTR(ret);
 
         client = i2c_new_device(adap, &info);
         if (!client) {
                 dev_err(&adap->dev, "of_i2c: Failure registering %pOF\n", node);
-                of_node_put(node);
                 return ERR_PTR(-EINVAL);
         }
         return client;