lkml.org 
[lkml]   [2020]   [Jan]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 1/5] mfd: rk808: Always use poweroff when requested
    Date
    From: Soeren Moch <smoch@web.de>

    With the device tree property "rockchip,system-power-controller" we
    explicitly request to use this PMIC to power off the system. So always
    register our poweroff function, even if some other handler (probably
    PSCI poweroff) was registered before.

    This does tend to reveal a warning on shutdown due to the Rockchip I2C
    driver not implementing an atomic transfer method, however since the
    write to DEV_OFF takes effect immediately the I2C completion interrupt
    is moot anyway, and as the very last thing written to the console it is
    only visible to users going out of their way to capture serial output.

    Signed-off-by: Soeren Moch <smoch@web.de>
    Reviewed-by: Heiko Stuebner <heiko@sntech.de>
    [ rm: note potential warning in commit message ]
    Signed-off-by: Robin Murphy <robin.murphy@arm.com>
    ---
    drivers/mfd/rk808.c | 11 ++---------
    1 file changed, 2 insertions(+), 9 deletions(-)

    diff --git a/drivers/mfd/rk808.c b/drivers/mfd/rk808.c
    index a69a6742ecdc..616e44e7ef98 100644
    --- a/drivers/mfd/rk808.c
    +++ b/drivers/mfd/rk808.c
    @@ -550,7 +550,7 @@ static int rk808_probe(struct i2c_client *client,
    const struct mfd_cell *cells;
    int nr_pre_init_regs;
    int nr_cells;
    - int pm_off = 0, msb, lsb;
    + int msb, lsb;
    unsigned char pmic_id_msb, pmic_id_lsb;
    int ret;
    int i;
    @@ -674,16 +674,9 @@ static int rk808_probe(struct i2c_client *client,
    goto err_irq;
    }

    - pm_off = of_property_read_bool(np,
    - "rockchip,system-power-controller");
    - if (pm_off && !pm_power_off) {
    + if (of_property_read_bool(np, "rockchip,system-power-controller")) {
    rk808_i2c_client = client;
    pm_power_off = rk808->pm_pwroff_fn;
    - }
    -
    - if (pm_off && !pm_power_off_prepare) {
    - if (!rk808_i2c_client)
    - rk808_i2c_client = client;
    pm_power_off_prepare = rk808->pm_pwroff_prep_fn;
    }

    --
    2.17.1
    \
     
     \ /
      Last update: 2020-01-12 02:56    [W:2.818 / U:0.084 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site