Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck...
[firefly-linux-kernel-4.4.55.git] / drivers / mfd / tps65910.c
index bf2b25ebf2ca7d4c9c2777158518bd2a3185a39c..be9e07b77325a6afef8ed64253bc4a51e5cb4cc9 100644 (file)
 #include <linux/err.h>
 #include <linux/slab.h>
 #include <linux/i2c.h>
-#include <linux/gpio.h>
 #include <linux/mfd/core.h>
 #include <linux/regmap.h>
 #include <linux/mfd/tps65910.h>
+#include <linux/of_device.h>
 
 static struct mfd_cell tps65910s[] = {
+       {
+               .name = "tps65910-gpio",
+       },
        {
                .name = "tps65910-pmic",
        },
@@ -37,30 +40,6 @@ static struct mfd_cell tps65910s[] = {
 };
 
 
-static int tps65910_i2c_read(struct tps65910 *tps65910, u8 reg,
-                                 int bytes, void *dest)
-{
-       return regmap_bulk_read(tps65910->regmap, reg, dest, bytes);
-}
-
-static int tps65910_i2c_write(struct tps65910 *tps65910, u8 reg,
-                                 int bytes, void *src)
-{
-       return regmap_bulk_write(tps65910->regmap, reg, src, bytes);
-}
-
-int tps65910_set_bits(struct tps65910 *tps65910, u8 reg, u8 mask)
-{
-       return regmap_update_bits(tps65910->regmap, reg, mask, mask);
-}
-EXPORT_SYMBOL_GPL(tps65910_set_bits);
-
-int tps65910_clear_bits(struct tps65910 *tps65910, u8 reg, u8 mask)
-{
-       return regmap_update_bits(tps65910->regmap, reg, mask, 0);
-}
-EXPORT_SYMBOL_GPL(tps65910_clear_bits);
-
 static bool is_volatile_reg(struct device *dev, unsigned int reg)
 {
        struct tps65910 *tps65910 = dev_get_drvdata(dev);
@@ -85,80 +64,197 @@ static const struct regmap_config tps65910_regmap_config = {
        .reg_bits = 8,
        .val_bits = 8,
        .volatile_reg = is_volatile_reg,
-       .max_register = TPS65910_MAX_REGISTER,
-       .num_reg_defaults_raw = TPS65910_MAX_REGISTER,
+       .max_register = TPS65910_MAX_REGISTER - 1,
        .cache_type = REGCACHE_RBTREE,
 };
 
-static int tps65910_i2c_probe(struct i2c_client *i2c,
-                           const struct i2c_device_id *id)
+static int __devinit tps65910_sleepinit(struct tps65910 *tps65910,
+               struct tps65910_board *pmic_pdata)
+{
+       struct device *dev = NULL;
+       int ret = 0;
+
+       dev = tps65910->dev;
+
+       if (!pmic_pdata->en_dev_slp)
+               return 0;
+
+       /* enabling SLEEP device state */
+       ret = tps65910_reg_set_bits(tps65910, TPS65910_DEVCTRL,
+                               DEVCTRL_DEV_SLP_MASK);
+       if (ret < 0) {
+               dev_err(dev, "set dev_slp failed: %d\n", ret);
+               goto err_sleep_init;
+       }
+
+       /* Return if there is no sleep keepon data. */
+       if (!pmic_pdata->slp_keepon)
+               return 0;
+
+       if (pmic_pdata->slp_keepon->therm_keepon) {
+               ret = tps65910_reg_set_bits(tps65910,
+                               TPS65910_SLEEP_KEEP_RES_ON,
+                               SLEEP_KEEP_RES_ON_THERM_KEEPON_MASK);
+               if (ret < 0) {
+                       dev_err(dev, "set therm_keepon failed: %d\n", ret);
+                       goto disable_dev_slp;
+               }
+       }
+
+       if (pmic_pdata->slp_keepon->clkout32k_keepon) {
+               ret = tps65910_reg_set_bits(tps65910,
+                               TPS65910_SLEEP_KEEP_RES_ON,
+                               SLEEP_KEEP_RES_ON_CLKOUT32K_KEEPON_MASK);
+               if (ret < 0) {
+                       dev_err(dev, "set clkout32k_keepon failed: %d\n", ret);
+                       goto disable_dev_slp;
+               }
+       }
+
+       if (pmic_pdata->slp_keepon->i2chs_keepon) {
+               ret = tps65910_reg_set_bits(tps65910,
+                               TPS65910_SLEEP_KEEP_RES_ON,
+                               SLEEP_KEEP_RES_ON_I2CHS_KEEPON_MASK);
+               if (ret < 0) {
+                       dev_err(dev, "set i2chs_keepon failed: %d\n", ret);
+                       goto disable_dev_slp;
+               }
+       }
+
+       return 0;
+
+disable_dev_slp:
+       tps65910_reg_clear_bits(tps65910, TPS65910_DEVCTRL,
+                               DEVCTRL_DEV_SLP_MASK);
+
+err_sleep_init:
+       return ret;
+}
+
+#ifdef CONFIG_OF
+static struct of_device_id tps65910_of_match[] = {
+       { .compatible = "ti,tps65910", .data = (void *)TPS65910},
+       { .compatible = "ti,tps65911", .data = (void *)TPS65911},
+       { },
+};
+MODULE_DEVICE_TABLE(of, tps65910_of_match);
+
+static struct tps65910_board *tps65910_parse_dt(struct i2c_client *client,
+                                               int *chip_id)
+{
+       struct device_node *np = client->dev.of_node;
+       struct tps65910_board *board_info;
+       unsigned int prop;
+       const struct of_device_id *match;
+       int ret = 0;
+
+       match = of_match_device(tps65910_of_match, &client->dev);
+       if (!match) {
+               dev_err(&client->dev, "Failed to find matching dt id\n");
+               return NULL;
+       }
+
+       *chip_id  = (int)match->data;
+
+       board_info = devm_kzalloc(&client->dev, sizeof(*board_info),
+                       GFP_KERNEL);
+       if (!board_info) {
+               dev_err(&client->dev, "Failed to allocate pdata\n");
+               return NULL;
+       }
+
+       ret = of_property_read_u32(np, "ti,vmbch-threshold", &prop);
+       if (!ret)
+               board_info->vmbch_threshold = prop;
+       else if (*chip_id == TPS65911)
+               dev_warn(&client->dev, "VMBCH-Threshold not specified");
+
+       ret = of_property_read_u32(np, "ti,vmbch2-threshold", &prop);
+       if (!ret)
+               board_info->vmbch2_threshold = prop;
+       else if (*chip_id == TPS65911)
+               dev_warn(&client->dev, "VMBCH2-Threshold not specified");
+
+       board_info->irq = client->irq;
+       board_info->irq_base = -1;
+
+       return board_info;
+}
+#else
+static inline
+struct tps65910_board *tps65910_parse_dt(struct i2c_client *client,
+                                        int *chip_id)
+{
+       return NULL;
+}
+#endif
+
+static __devinit int tps65910_i2c_probe(struct i2c_client *i2c,
+                                       const struct i2c_device_id *id)
 {
        struct tps65910 *tps65910;
        struct tps65910_board *pmic_plat_data;
+       struct tps65910_board *of_pmic_plat_data = NULL;
        struct tps65910_platform_data *init_data;
        int ret = 0;
+       int chip_id = id->driver_data;
 
        pmic_plat_data = dev_get_platdata(&i2c->dev);
+
+       if (!pmic_plat_data && i2c->dev.of_node) {
+               pmic_plat_data = tps65910_parse_dt(i2c, &chip_id);
+               of_pmic_plat_data = pmic_plat_data;
+       }
+
        if (!pmic_plat_data)
                return -EINVAL;
 
-       init_data = kzalloc(sizeof(struct tps65910_platform_data), GFP_KERNEL);
+       init_data = devm_kzalloc(&i2c->dev, sizeof(*init_data), GFP_KERNEL);
        if (init_data == NULL)
                return -ENOMEM;
 
-       tps65910 = kzalloc(sizeof(struct tps65910), GFP_KERNEL);
-       if (tps65910 == NULL) {
-               kfree(init_data);
+       tps65910 = devm_kzalloc(&i2c->dev, sizeof(*tps65910), GFP_KERNEL);
+       if (tps65910 == NULL)
                return -ENOMEM;
-       }
 
+       tps65910->of_plat_data = of_pmic_plat_data;
        i2c_set_clientdata(i2c, tps65910);
        tps65910->dev = &i2c->dev;
        tps65910->i2c_client = i2c;
-       tps65910->id = id->driver_data;
-       tps65910->read = tps65910_i2c_read;
-       tps65910->write = tps65910_i2c_write;
+       tps65910->id = chip_id;
        mutex_init(&tps65910->io_mutex);
 
-       tps65910->regmap = regmap_init_i2c(i2c, &tps65910_regmap_config);
+       tps65910->regmap = devm_regmap_init_i2c(i2c, &tps65910_regmap_config);
        if (IS_ERR(tps65910->regmap)) {
                ret = PTR_ERR(tps65910->regmap);
                dev_err(&i2c->dev, "regmap initialization failed: %d\n", ret);
-               goto regmap_err;
+               return ret;
        }
 
        ret = mfd_add_devices(tps65910->dev, -1,
                              tps65910s, ARRAY_SIZE(tps65910s),
                              NULL, 0);
-       if (ret < 0)
-               goto err;
+       if (ret < 0) {
+               dev_err(&i2c->dev, "mfd_add_devices failed: %d\n", ret);
+               return ret;
+       }
 
        init_data->irq = pmic_plat_data->irq;
        init_data->irq_base = pmic_plat_data->irq_base;
 
-       tps65910_gpio_init(tps65910, pmic_plat_data->gpio_base);
-
        tps65910_irq_init(tps65910, init_data->irq, init_data);
 
-       kfree(init_data);
-       return ret;
+       tps65910_sleepinit(tps65910, pmic_plat_data);
 
-err:
-       regmap_exit(tps65910->regmap);
-regmap_err:
-       kfree(tps65910);
-       kfree(init_data);
        return ret;
 }
 
-static int tps65910_i2c_remove(struct i2c_client *i2c)
+static __devexit int tps65910_i2c_remove(struct i2c_client *i2c)
 {
        struct tps65910 *tps65910 = i2c_get_clientdata(i2c);
 
        tps65910_irq_exit(tps65910);
        mfd_remove_devices(tps65910->dev);
-       regmap_exit(tps65910->regmap);
-       kfree(tps65910);
 
        return 0;
 }
@@ -175,9 +271,10 @@ static struct i2c_driver tps65910_i2c_driver = {
        .driver = {
                   .name = "tps65910",
                   .owner = THIS_MODULE,
+                  .of_match_table = of_match_ptr(tps65910_of_match),
        },
        .probe = tps65910_i2c_probe,
-       .remove = tps65910_i2c_remove,
+       .remove = __devexit_p(tps65910_i2c_remove),
        .id_table = tps65910_i2c_id,
 };