From: "Heiko Stübner" <heiko@sntech.de>
To: Soeren Moch <smoch@web.de>
Cc: linux-rockchip@lists.infradead.org,
Lee Jones <lee.jones@linaro.org>,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH] mfd: rk808: Always use poweroff when requested
Date: Mon, 09 Dec 2019 13:32:38 +0100 [thread overview]
Message-ID: <6655566.N6zq5d2jo2@diego> (raw)
In-Reply-To: <20191209115746.12953-1-smoch@web.de>
Am Montag, 9. Dezember 2019, 12:57:46 CET schrieb Soeren Moch:
> 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.
>
> Signed-off-by: Soeren Moch <smoch@web.de>
Sounds very sensible
Reviewed-by: Heiko Stuebner <heiko@sntech.de>
> ---
> Cc: Lee Jones <lee.jones@linaro.org>
> Cc: Heiko Stuebner <heiko@sntech.de>
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: linux-rockchip@lists.infradead.org
> Cc: linux-kernel@vger.kernel.org
> ---
> 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
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-12-09 12:32 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-09 11:57 [PATCH] mfd: rk808: Always use poweroff when requested Soeren Moch
2019-12-09 12:32 ` Heiko Stübner [this message]
2019-12-09 13:43 ` Robin Murphy
2019-12-10 12:42 ` Anand Moon
2019-12-10 12:55 ` Markus Reichl
2019-12-10 16:40 ` Soeren Moch
2019-12-11 2:00 ` Anand Moon
2019-12-11 10:55 ` Soeren Moch
2019-12-12 0:28 ` Robin Murphy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6655566.N6zq5d2jo2@diego \
--to=heiko@sntech.de \
--cc=lee.jones@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=smoch@web.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).