lkml.org 
[lkml]   [2014]   [Oct]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 09/47] mfd: palmas: Register with kernel poweroff handler
    Date
    Register with kernel poweroff handler instead of setting pm_power_off
    directly. Register with low priority to reflect that the original code
    only sets pm_power_off if it was not already set.

    Cc: Samuel Ortiz <sameo@linux.intel.com>
    Cc: Lee Jones <lee.jones@linaro.org>
    Signed-off-by: Guenter Roeck <linux@roeck-us.net>
    ---
    v2:
    - Use define to specify poweroff handler priority
    - Use devm_register_power_off_handler
    - Use dev_warn instead of dev_err

    drivers/mfd/palmas.c | 31 +++++++++++++++++--------------
    include/linux/mfd/palmas.h | 3 +++
    2 files changed, 20 insertions(+), 14 deletions(-)

    diff --git a/drivers/mfd/palmas.c b/drivers/mfd/palmas.c
    index 28cb048..2fda979 100644
    --- a/drivers/mfd/palmas.c
    +++ b/drivers/mfd/palmas.c
    @@ -19,6 +19,7 @@
    #include <linux/i2c.h>
    #include <linux/interrupt.h>
    #include <linux/irq.h>
    +#include <linux/pm.h>
    #include <linux/regmap.h>
    #include <linux/err.h>
    #include <linux/mfd/core.h>
    @@ -425,20 +426,18 @@ static void palmas_dt_to_pdata(struct i2c_client *i2c,
    "ti,system-power-controller");
    }

    -static struct palmas *palmas_dev;
    -static void palmas_power_off(void)
    +static int palmas_power_off(struct notifier_block *this, unsigned long unused1,
    + void *unused2)
    {
    + struct palmas *palmas = container_of(this, struct palmas, poweroff_nb);
    unsigned int addr;
    int ret, slave;

    - if (!palmas_dev)
    - return;
    -
    slave = PALMAS_BASE_TO_SLAVE(PALMAS_PMU_CONTROL_BASE);
    addr = PALMAS_BASE_TO_REG(PALMAS_PMU_CONTROL_BASE, PALMAS_DEV_CTRL);

    ret = regmap_update_bits(
    - palmas_dev->regmap[slave],
    + palmas->regmap[slave],
    addr,
    PALMAS_DEV_CTRL_DEV_ON,
    0);
    @@ -446,6 +445,8 @@ static void palmas_power_off(void)
    if (ret)
    pr_err("%s: Unable to write to DEV_CTRL_DEV_ON: %d\n",
    __func__, ret);
    +
    + return NOTIFY_DONE;
    }

    static unsigned int palmas_features = PALMAS_PMIC_FEATURE_SMPS10_BOOST;
    @@ -668,9 +669,16 @@ no_irq:
    ret = of_platform_populate(node, NULL, NULL, &i2c->dev);
    if (ret < 0) {
    goto err_irq;
    - } else if (pdata->pm_off && !pm_power_off) {
    - palmas_dev = palmas;
    - pm_power_off = palmas_power_off;
    + } else if (pdata->pm_off) {
    + int ret2;
    +
    + palmas->poweroff_nb.notifier_call = palmas_power_off;
    + palmas->poweroff_nb.priority = POWEROFF_PRIORITY_LOW;
    + ret2 = devm_register_power_off_handler(palmas->dev,
    + &palmas->poweroff_nb);
    + if (ret2)
    + dev_warn(palmas->dev,
    + "Failed to register poweroff handler");
    }
    }

    @@ -698,11 +706,6 @@ static int palmas_i2c_remove(struct i2c_client *i2c)
    i2c_unregister_device(palmas->i2c_clients[i]);
    }

    - if (palmas == palmas_dev) {
    - pm_power_off = NULL;
    - palmas_dev = NULL;
    - }
    -
    return 0;
    }

    diff --git a/include/linux/mfd/palmas.h b/include/linux/mfd/palmas.h
    index fb0390a..4715057 100644
    --- a/include/linux/mfd/palmas.h
    +++ b/include/linux/mfd/palmas.h
    @@ -18,6 +18,7 @@

    #include <linux/usb/otg.h>
    #include <linux/leds.h>
    +#include <linux/notifier.h>
    #include <linux/regmap.h>
    #include <linux/regulator/driver.h>
    #include <linux/extcon.h>
    @@ -68,6 +69,8 @@ struct palmas {
    struct i2c_client *i2c_clients[PALMAS_NUM_CLIENTS];
    struct regmap *regmap[PALMAS_NUM_CLIENTS];

    + struct notifier_block poweroff_nb;
    +
    /* Stored chip id */
    int id;

    --
    1.9.1


    \
     
     \ /
      Last update: 2014-10-21 07:01    [W:4.665 / U:0.628 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site