Merge tag 'trace-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

[linux-2.6-microblaze.git] / drivers / mfd / tps65910.c

diff --git a/drivers/mfd/tps65910.c b/drivers/mfd/tps65910.c
index 1195902..6e105cc 100644 (file)
--- a/drivers/mfd/tps65910.c
+++ b/drivers/mfd/tps65910.c
@@ -21,7 +21,7 @@
 #include <linux/of.h>
 #include <linux/of_device.h>
 
-static struct resource rtc_resources[] = {
+static const struct resource rtc_resources[] = {
        {
                .start  = TPS65910_IRQ_RTC_ALARM,
                .end    = TPS65910_IRQ_RTC_ALARM,
@@ -292,8 +292,8 @@ static int tps65910_ck32k_init(struct tps65910 *tps65910,
        if (!pmic_pdata->en_ck32k_xtal)
                return 0;
 
-       ret = tps65910_reg_clear_bits(tps65910, TPS65910_DEVCTRL,
-                                               DEVCTRL_CK32K_CTRL_MASK);
+       ret = regmap_clear_bits(tps65910->regmap, TPS65910_DEVCTRL,
+                               DEVCTRL_CK32K_CTRL_MASK);
        if (ret < 0) {
                dev_err(tps65910->dev, "clear ck32k_ctrl failed: %d\n", ret);
                return ret;
@@ -314,17 +314,17 @@ static int tps65910_sleepinit(struct tps65910 *tps65910,
        dev = tps65910->dev;
 
        /* enabling SLEEP device state */
-       ret = tps65910_reg_set_bits(tps65910, TPS65910_DEVCTRL,
-                               DEVCTRL_DEV_SLP_MASK);
+       ret = regmap_set_bits(tps65910->regmap, TPS65910_DEVCTRL,
+                             DEVCTRL_DEV_SLP_MASK);
        if (ret < 0) {
                dev_err(dev, "set dev_slp failed: %d\n", ret);
                goto err_sleep_init;
        }
 
        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);
+               ret = regmap_set_bits(tps65910->regmap,
+                                     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;
@@ -332,9 +332,9 @@ static int tps65910_sleepinit(struct tps65910 *tps65910,
        }
 
        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);
+               ret = regmap_set_bits(tps65910->regmap,
+                                     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;
@@ -342,9 +342,9 @@ static int tps65910_sleepinit(struct tps65910 *tps65910,
        }
 
        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);
+               ret = regmap_set_bits(tps65910->regmap,
+                                     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;
@@ -354,8 +354,8 @@ static int tps65910_sleepinit(struct tps65910 *tps65910,
        return 0;
 
 disable_dev_slp:
-       tps65910_reg_clear_bits(tps65910, TPS65910_DEVCTRL,
-                               DEVCTRL_DEV_SLP_MASK);
+       regmap_clear_bits(tps65910->regmap, TPS65910_DEVCTRL,
+                         DEVCTRL_DEV_SLP_MASK);
 
 err_sleep_init:
        return ret;
@@ -436,12 +436,18 @@ static void tps65910_power_off(void)
 
        tps65910 = dev_get_drvdata(&tps65910_i2c_client->dev);
 
-       if (tps65910_reg_set_bits(tps65910, TPS65910_DEVCTRL,
-                       DEVCTRL_PWR_OFF_MASK) < 0)
+       /*
+        * The PWR_OFF bit needs to be set separately, before transitioning
+        * to the OFF state. It enables the "sequential" power-off mode on
+        * TPS65911, it's a NO-OP on TPS65910.
+        */
+       if (regmap_set_bits(tps65910->regmap, TPS65910_DEVCTRL,
+                           DEVCTRL_PWR_OFF_MASK) < 0)
                return;
 
-       tps65910_reg_clear_bits(tps65910, TPS65910_DEVCTRL,
-                       DEVCTRL_DEV_ON_MASK);
+       regmap_update_bits(tps65910->regmap, TPS65910_DEVCTRL,
+                          DEVCTRL_DEV_OFF_MASK | DEVCTRL_DEV_ON_MASK,
+                          DEVCTRL_DEV_OFF_MASK);
 }
 
 static int tps65910_i2c_probe(struct i2c_client *i2c,