Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv...

[~andy/linux] / drivers / i2c / muxes / i2c-mux-pca954x.c

diff --git a/drivers/i2c/muxes/i2c-mux-pca954x.c b/drivers/i2c/muxes/i2c-mux-pca954x.c
index 0ebc9d8748a016fe10c4af078b32a6f4a831153c..8720b6a1123777a727f1da4165f12a7327729f55 100644 (file)
--- a/drivers/i2c/muxes/i2c-mux-pca954x.c
+++ b/drivers/i2c/muxes/i2c-mux-pca954x.c
@@ -35,14 +35,15 @@
  * warranty of any kind, whether express or implied.
  */
 
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/slab.h>
 #include <linux/device.h>
+#include <linux/gpio.h>
 #include <linux/i2c.h>
 #include <linux/i2c-mux.h>
-
 #include <linux/i2c/pca954x.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/of_gpio.h>
+#include <linux/slab.h>
 
 #define PCA954X_MAX_NCHANS 8
 
@@ -186,28 +187,43 @@ static int pca954x_probe(struct i2c_client *client,
 {
        struct i2c_adapter *adap = to_i2c_adapter(client->dev.parent);
        struct pca954x_platform_data *pdata = dev_get_platdata(&client->dev);
+       struct device_node *np = client->dev.of_node;
        int num, force, class;
        struct pca954x *data;
-       int ret = -ENODEV;
+       int ret;
 
        if (!i2c_check_functionality(adap, I2C_FUNC_SMBUS_BYTE))
-               goto err;
+               return -ENODEV;
 
-       data = kzalloc(sizeof(struct pca954x), GFP_KERNEL);
-       if (!data) {
-               ret = -ENOMEM;
-               goto err;
-       }
+       data = devm_kzalloc(&client->dev, sizeof(struct pca954x), GFP_KERNEL);
+       if (!data)
+               return -ENOMEM;
 
        i2c_set_clientdata(client, data);
 
+       if (IS_ENABLED(CONFIG_OF) && np) {
+               enum of_gpio_flags flags;
+               int gpio;
+
+               /* Get the mux out of reset if a reset GPIO is specified. */
+               gpio = of_get_named_gpio_flags(np, "reset-gpio", 0, &flags);
+               if (gpio_is_valid(gpio)) {
+                       ret = devm_gpio_request_one(&client->dev, gpio,
+                                       flags & OF_GPIO_ACTIVE_LOW ?
+                                       GPIOF_OUT_INIT_HIGH : GPIOF_OUT_INIT_LOW,
+                                       "pca954x reset");
+                       if (ret < 0)
+                               return ret;
+               }
+       }
+
        /* Write the mux register at addr to verify
         * that the mux is in fact present. This also
         * initializes the mux to disconnected state.
         */
        if (i2c_smbus_write_byte(client, 0) < 0) {
                dev_warn(&client->dev, "probe failed\n");
-               goto exit_free;
+               return -ENODEV;
        }
 
        data->type = id->driver_data;
@@ -252,9 +268,6 @@ static int pca954x_probe(struct i2c_client *client,
 virt_reg_failed:
        for (num--; num >= 0; num--)
                i2c_del_mux_adapter(data->virt_adaps[num]);
-exit_free:
-       kfree(data);
-err:
        return ret;
 }
 
@@ -270,7 +283,6 @@ static int pca954x_remove(struct i2c_client *client)
                        data->virt_adaps[i] = NULL;
                }
 
-       kfree(data);
        return 0;
 }