Merge branch 'for-4.7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...

[cascardo/linux.git] / drivers / mfd / rn5t618.c

diff --git a/drivers/mfd/rn5t618.c b/drivers/mfd/rn5t618.c
index 0ad51d7..ee94080 100644 (file)
--- a/drivers/mfd/rn5t618.c
+++ b/drivers/mfd/rn5t618.c
@@ -2,6 +2,7 @@
  * MFD core driver for Ricoh RN5T618 PMIC
  *
  * Copyright (C) 2014 Beniamino Galvani <b.galvani@gmail.com>
+ * Copyright (C) 2016 Toradex AG
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -11,10 +12,13 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <linux/delay.h>
 #include <linux/i2c.h>
 #include <linux/mfd/core.h>
 #include <linux/mfd/rn5t618.h>
 #include <linux/module.h>
+#include <linux/of_device.h>
+#include <linux/reboot.h>
 #include <linux/regmap.h>
 
 static const struct mfd_cell rn5t618_cells[] = {
@@ -48,28 +52,64 @@ static const struct regmap_config rn5t618_regmap_config = {
 };
 
 static struct rn5t618 *rn5t618_pm_power_off;
+static struct notifier_block rn5t618_restart_handler;
 
-static void rn5t618_power_off(void)
+static void rn5t618_trigger_poweroff_sequence(bool repower)
 {
        /* disable automatic repower-on */
        regmap_update_bits(rn5t618_pm_power_off->regmap, RN5T618_REPCNT,
-                          RN5T618_REPCNT_REPWRON, 0);
+                          RN5T618_REPCNT_REPWRON,
+                          repower ? RN5T618_REPCNT_REPWRON : 0);
        /* start power-off sequence */
        regmap_update_bits(rn5t618_pm_power_off->regmap, RN5T618_SLPCNT,
                           RN5T618_SLPCNT_SWPWROFF, RN5T618_SLPCNT_SWPWROFF);
 }
 
+static void rn5t618_power_off(void)
+{
+       rn5t618_trigger_poweroff_sequence(false);
+}
+
+static int rn5t618_restart(struct notifier_block *this,
+                           unsigned long mode, void *cmd)
+{
+       rn5t618_trigger_poweroff_sequence(true);
+
+       /*
+        * Re-power factor detection on PMIC side is not instant. 1ms
+        * proved to be enough time until reset takes effect.
+        */
+       mdelay(1);
+
+       return NOTIFY_DONE;
+}
+
+static const struct of_device_id rn5t618_of_match[] = {
+       { .compatible = "ricoh,rn5t567", .data = (void *)RN5T567 },
+       { .compatible = "ricoh,rn5t618", .data = (void *)RN5T618 },
+       { }
+};
+MODULE_DEVICE_TABLE(of, rn5t618_of_match);
+
 static int rn5t618_i2c_probe(struct i2c_client *i2c,
                             const struct i2c_device_id *id)
 {
+       const struct of_device_id *of_id;
        struct rn5t618 *priv;
        int ret;
 
+       of_id = of_match_device(rn5t618_of_match, &i2c->dev);
+       if (!of_id) {
+               dev_err(&i2c->dev, "Failed to find matching DT ID\n");
+               return -EINVAL;
+       }
+
        priv = devm_kzalloc(&i2c->dev, sizeof(*priv), GFP_KERNEL);
        if (!priv)
                return -ENOMEM;
 
        i2c_set_clientdata(i2c, priv);
+       priv->variant = (long)of_id->data;
 
        priv->regmap = devm_regmap_init_i2c(i2c, &rn5t618_regmap_config);
        if (IS_ERR(priv->regmap)) {
@@ -85,9 +125,21 @@ static int rn5t618_i2c_probe(struct i2c_client *i2c,
                return ret;
        }
 
-       if (!pm_power_off) {
-               rn5t618_pm_power_off = priv;
-               pm_power_off = rn5t618_power_off;
+       rn5t618_pm_power_off = priv;
+       if (of_device_is_system_power_controller(i2c->dev.of_node)) {
+               if (!pm_power_off)
+                       pm_power_off = rn5t618_power_off;
+               else
+                       dev_warn(&i2c->dev, "Poweroff callback already assigned\n");
+       }
+
+       rn5t618_restart_handler.notifier_call = rn5t618_restart;
+       rn5t618_restart_handler.priority = 192;
+
+       ret = register_restart_handler(&rn5t618_restart_handler);
+       if (ret) {
+               dev_err(&i2c->dev, "cannot register restart handler, %d\n", ret);
+               return ret;
        }
 
        return 0;
@@ -105,12 +157,6 @@ static int rn5t618_i2c_remove(struct i2c_client *i2c)
        return 0;
 }
 
-static const struct of_device_id rn5t618_of_match[] = {
-       { .compatible = "ricoh,rn5t618" },
-       { }
-};
-MODULE_DEVICE_TABLE(of, rn5t618_of_match);
-
 static const struct i2c_device_id rn5t618_i2c_id[] = {
        { }
 };
@@ -129,5 +175,5 @@ static struct i2c_driver rn5t618_i2c_driver = {
 module_i2c_driver(rn5t618_i2c_driver);
 
 MODULE_AUTHOR("Beniamino Galvani <b.galvani@gmail.com>");
-MODULE_DESCRIPTION("Ricoh RN5T618 MFD driver");
+MODULE_DESCRIPTION("Ricoh RN5T567/618 MFD driver");
 MODULE_LICENSE("GPL v2");