Re: [PATCH v4 2/3] Input: twl4030 - add TWL603x power button

Andreas Kemnade
2025-11-25T13:01:38Z

On Thu, 06 Nov 2025 10:00:26 +0100
akemnade@kernel.org wrote:

> From: Andreas Kemnade <andreas@kemnade.info>
>
> Like the TWL4030, these PMICs also have a power button feature, so extend
> the TWL4030 power button driver. As the irqchip of the TWL6030 mfd driver
> does not provide mask, unmask finctions, do it manually.
>
> Signed-off-by: Andreas Kemnade <andreas@kemnade.info>
> ---
a friendly ping
anything still to do here?

Regards,
Andreas
> drivers/input/misc/twl4030-pwrbutton.c | 58 +++++++++++++++++++++++++++++++---
> 1 file changed, 54 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/input/misc/twl4030-pwrbutton.c b/drivers/input/misc/twl4030-pwrbutton.c
> index f85cc289c053..8673b1b441bf 100644
> --- a/drivers/input/misc/twl4030-pwrbutton.c
> +++ b/drivers/input/misc/twl4030-pwrbutton.c
> @@ -20,6 +20,7 @@
> * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
> */
>
> +#include <linux/bits.h>
> #include <linux/module.h>
> #include <linux/init.h>
> #include <linux/kernel.h>
> @@ -30,17 +31,31 @@
> #include <linux/platform_device.h>
> #include <linux/mfd/twl.h>
>
> -#define PWR_PWRON_IRQ (1 << 0)
> +#define PWR_PWRON_IRQ BIT(0)
>
> -#define STS_HW_CONDITIONS 0xf
> +struct twl_pwrbutton_chipdata {
> + u8 status_reg;
> + bool need_manual_irq;
> +};
> +
> +static const struct twl_pwrbutton_chipdata twl4030_chipdata = {
> + .status_reg = 0xf,
> + .need_manual_irq = false,
> +};
> +
> +static const struct twl_pwrbutton_chipdata twl6030_chipdata = {
> + .status_reg = 0x2,
> + .need_manual_irq = true,
> +};
>
> static irqreturn_t powerbutton_irq(int irq, void *_pwr)
> {
> struct input_dev *pwr = _pwr;
> + const struct twl_pwrbutton_chipdata *pdata = dev_get_drvdata(pwr->dev.parent);
> int err;
> u8 value;
>
> - err = twl_i2c_read_u8(TWL_MODULE_PM_MASTER, &value, STS_HW_CONDITIONS);
> + err = twl_i2c_read_u8(TWL_MODULE_PM_MASTER, &value, pdata->status_reg);
> if (!err) {
> pm_wakeup_event(pwr->dev.parent, 0);
> input_report_key(pwr, KEY_POWER, value & PWR_PWRON_IRQ);
> @@ -55,10 +70,17 @@ static irqreturn_t powerbutton_irq(int irq, void *_pwr)
>
> static int twl4030_pwrbutton_probe(struct platform_device *pdev)
> {
> + const struct twl_pwrbutton_chipdata *pdata;
> struct input_dev *pwr;
> int irq = platform_get_irq(pdev, 0);
> int err;
>
> + pdata = device_get_match_data(&pdev->dev);
> + if (!pdata)
> + return -EINVAL;
> +
> + platform_set_drvdata(pdev, (void *)pdata);
> +
> pwr = devm_input_allocate_device(&pdev->dev);
> if (!pwr) {
> dev_err(&pdev->dev, "Can't allocate power button\n");
> @@ -85,14 +107,41 @@ static int twl4030_pwrbutton_probe(struct platform_device *pdev)
> return err;
> }
>
> + if (pdata->need_manual_irq) {
> + err = twl6030_interrupt_unmask(0x01, REG_INT_MSK_LINE_A);
> + if (err < 0)
> + return err;
> +
> + err = twl6030_interrupt_unmask(0x01, REG_INT_MSK_STS_A);
> + if (err < 0)
> + return err;
> + }
> +
> device_init_wakeup(&pdev->dev, true);
>
> return 0;
> }
>
> +static void twl4030_pwrbutton_remove(struct platform_device *pdev)
> +{
> + const struct twl_pwrbutton_chipdata *pdata = platform_get_drvdata(pdev);
> +
> + if (pdata->need_manual_irq) {
> + twl6030_interrupt_mask(0x01, REG_INT_MSK_LINE_A);
> + twl6030_interrupt_mask(0x01, REG_INT_MSK_STS_A);
> + }
> +}
> +
> #ifdef CONFIG_OF
> static const struct of_device_id twl4030_pwrbutton_dt_match_table[] = {
> - { .compatible = "ti,twl4030-pwrbutton" },
> + {
> + .compatible = "ti,twl4030-pwrbutton",
> + .data = &twl4030_chipdata,
> + },
> + {
> + .compatible = "ti,twl6030-pwrbutton",
> + .data = &twl6030_chipdata,
> + },
> {},
> };
> MODULE_DEVICE_TABLE(of, twl4030_pwrbutton_dt_match_table);
> @@ -100,6 +149,7 @@ MODULE_DEVICE_TABLE(of, twl4030_pwrbutton_dt_match_table);
>
> static struct platform_driver twl4030_pwrbutton_driver = {
> .probe = twl4030_pwrbutton_probe,
> + .remove = twl4030_pwrbutton_remove,
> .driver = {
> .name = "twl4030_pwrbutton",
> .of_match_table = of_match_ptr(twl4030_pwrbutton_dt_match_table),
>