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@xxxxxx>
Sounds very sensible
Reviewed-by: Heiko Stuebner <heiko@xxxxxxxxx>
> ---
> Cc: Lee Jones <lee.jones@xxxxxxxxxx>
> Cc: Heiko Stuebner <heiko@xxxxxxxxx>
> Cc: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx
> Cc: linux-rockchip@xxxxxxxxxxxxxxxxxxx
> Cc: linux-kernel@xxxxxxxxxxxxxxx
> ---
> 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-rockchip mailing list
Linux-rockchip@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/linux-rockchip
