Re: [PATCH v2 2/6] twl-core: add power off implementation for twl603x

[Lee Jones <lee@kernel.org>]

On Mon, 27 Nov 2023, Andreas Kemnade wrote:

> If the system-power-controller property is there, enable power off.
> Implementation is based on a Linux v3.0 vendor kernel.
> 
> Signed-off-by: Andreas Kemnade <andreas@kemnade.info>
> ---
>  drivers/mfd/twl-core.c  | 34 ++++++++++++++++++++++++++++++++++
>  include/linux/mfd/twl.h |  1 +
>  2 files changed, 35 insertions(+)
> 
> diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c
> index 6e384a79e3418..54482d5d8888b 100644
> --- a/drivers/mfd/twl-core.c
> +++ b/drivers/mfd/twl-core.c
> @@ -687,6 +687,31 @@ static void twl_remove(struct i2c_client *client)
>  	twl_priv->ready = false;
>  }
>  
> +static void twl6030_power_off(void)
> +{
> +#define APP_DEVOFF      (1<<0)
> +#define CON_DEVOFF      (1<<1)
> +#define MOD_DEVOFF      (1<<2)

Please place these at the top somewhere.

You should also have spaces around the '<<'s.

These look like they should be BIT()s though.

> +
> +	int err;
> +	u8 val;
> +
> +	err = twl_i2c_read_u8(TWL_MODULE_PM_MASTER, &val,
> +			      TWL6030_PHOENIX_DEV_ON);

You can use 100-chars if you like.

> +	if (err) {
> +		pr_err("I2C error %d reading PHOENIX_DEV_ON\n", err);

It would save an awful lot of lines and space if we could place these
warnings/errors inside twl_i2c_read_u8().

> +		return;
> +	}
> +
> +	val |= APP_DEVOFF | CON_DEVOFF | MOD_DEVOFF;
> +
> +	err = twl_i2c_write_u8(TWL_MODULE_PM_MASTER, val,
> +			       TWL6030_PHOENIX_DEV_ON);
> +	if (err)
> +		pr_err("TWL6030 Unable to power off\n");
> +}
> +
> +
>  static struct of_dev_auxdata twl_auxdata_lookup[] = {
>  	OF_DEV_AUXDATA("ti,twl4030-gpio", 0, "twl4030-gpio", NULL),
>  	{ /* sentinel */ },
> @@ -852,6 +877,15 @@ twl_probe(struct i2c_client *client)
>  			goto free;
>  	}
>  
> +	if (twl_class_is_6030()) {
> +		if (of_device_is_system_power_controller(client->dev.of_node)) {

Use 'node' instead.

> +			if (!pm_power_off)
> +				pm_power_off = twl6030_power_off;
> +			else
> +				dev_warn(&client->dev, "Poweroff callback already assigned\n");
> +		}
> +	}
> +
>  	status = of_platform_populate(node, NULL, twl_auxdata_lookup,
>  				      &client->dev);
>  
> diff --git a/include/linux/mfd/twl.h b/include/linux/mfd/twl.h
> index c062d91a67d92..85dc406173dba 100644
> --- a/include/linux/mfd/twl.h
> +++ b/include/linux/mfd/twl.h
> @@ -461,6 +461,7 @@ static inline int twl6030_mmc_card_detect(struct device *dev, int slot)
>  
>  #define TWL4030_PM_MASTER_GLOBAL_TST		0xb6
>  
> +#define TWL6030_PHOENIX_DEV_ON                  0x06
>  /*----------------------------------------------------------------------*/
>  
>  /* Power bus message definitions */
> -- 
> 2.39.2
> 

-- 
Lee Jones [李琼斯]