| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20251113143057.GK1949330@google.com>
Date: Thu, 13 Nov 2025 14:30:57 +0000
From: Lee Jones <lee@...nel.org>
To: Alexander Kurz <akurz@...la.de>
Cc: Rob Herring <robh@...nel.org>, Krzysztof Kozlowski <krzk+dt@...nel.org>,
Conor Dooley <conor+dt@...nel.org>, Shawn Guo <shawnguo@...nel.org>,
Sascha Hauer <s.hauer@...gutronix.de>,
Pengutronix Kernel Team <kernel@...gutronix.de>,
Fabio Estevam <festevam@...il.com>,
Dmitry Torokhov <dmitry.torokhov@...il.com>,
Dzmitry Sankouski <dsankouski@...il.com>,
Griffin Kroah-Hartman <griffin.kroah@...rphone.com>,
Mathieu Dubois-Briand <mathieu.dubois-briand@...tlin.com>,
Heiko Stuebner <heiko@...ech.de>,
"Dr . David Alan Gilbert" <linux@...blig.org>,
Job Sava <jsava@...ticallink.com>,
Alexandre Belloni <alexandre.belloni@...tlin.com>,
Uwe Kleine-König <u.kleine-koenig@...libre.com>,
devicetree@...r.kernel.org, imx@...ts.linux.dev,
linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org,
linux-input@...r.kernel.org
Subject: Re: [PATCH v7 5/6] Input: mc13783-pwrbutton: add OF support and drop
platform_data
On Fri, 31 Oct 2025, Alexander Kurz wrote:
> Add OF support for the mc13783-pwrbutton so that it can be used with
> modern DT based systems, dropping support for platform_data.
>
> Signed-off-by: Alexander Kurz <akurz@...la.de>
> ---
> drivers/input/misc/mc13783-pwrbutton.c | 104 +++++++++++++++++++++----
> drivers/mfd/mc13xxx-core.c | 4 -
> include/linux/mfd/mc13xxx.h | 14 ----
Acked-by: Lee Jones <lee@...nel.org>
> 3 files changed, 88 insertions(+), 34 deletions(-)
>
> diff --git a/drivers/input/misc/mc13783-pwrbutton.c b/drivers/input/misc/mc13783-pwrbutton.c
> index 08618c59197f..0fa630adff19 100644
> --- a/drivers/input/misc/mc13783-pwrbutton.c
> +++ b/drivers/input/misc/mc13783-pwrbutton.c
> @@ -27,6 +27,7 @@
> #include <linux/interrupt.h>
> #include <linux/platform_device.h>
> #include <linux/mfd/mc13783.h>
> +#include <linux/property.h>
> #include <linux/sched.h>
> #include <linux/slab.h>
>
> @@ -41,10 +42,20 @@ struct mc13783_pwrb {
> struct mc13xxx *mc13783;
> const struct mc13xxx_button_devtype *devtype;
> int flags;
> + int b_on_flags[3];
> + unsigned int b_on_key[3];
> unsigned short keymap[3];
> int irq[3];
> };
>
> +#define MC13783_BUTTON_DBNC_0MS 0
> +#define MC13783_BUTTON_DBNC_30MS 1
> +#define MC13783_BUTTON_DBNC_150MS 2
> +#define MC13783_BUTTON_DBNC_750MS 3
> +#define MC13783_BUTTON_ENABLE (1 << 2)
> +#define MC13783_BUTTON_POL_INVERT (1 << 3)
> +#define MC13783_BUTTON_RESET_EN (1 << 4)
> +
> #define MC13783_PWRB_B1_POL_INVERT (1 << 0)
> #define MC13783_PWRB_B2_POL_INVERT (1 << 1)
> #define MC13783_PWRB_B3_POL_INVERT (1 << 2)
> @@ -88,9 +99,69 @@ static irqreturn_t button_irq(int irq, void *_priv)
> return IRQ_HANDLED;
> }
>
> +static int mc13xxx_pwrbutton_parse_properties(struct platform_device *pdev,
> + struct mc13783_pwrb *priv)
> +{
> + struct fwnode_handle *child;
> + struct device *dev = &pdev->dev;
> + struct mc13xxx_button_devtype *devtype =
> + (struct mc13xxx_button_devtype *)platform_get_device_id(pdev)->driver_data;
> +
> + struct fwnode_handle *parent __free(fwnode_handle) =
> + device_get_named_child_node(dev->parent, "buttons");
> + if (!parent)
> + return -ENODATA;
> +
> + fwnode_for_each_named_child_node(parent, child, "onkey") {
> + u32 idx;
> + u8 dbnc = MC13783_BUTTON_DBNC_30MS;
> + u16 dbnc_ms;
> +
> + if (fwnode_property_read_u32(child, "reg", &idx))
> + continue;
> +
> + if (idx > devtype->button_id_max) {
> + dev_warn(dev, "reg out of range\n");
> + continue;
> + }
> +
> + fwnode_property_read_u16(child, "debounce-delay-ms", &dbnc_ms);
> + switch (dbnc_ms) {
> + case 0:
> + dbnc = MC13783_BUTTON_DBNC_0MS;
> + break;
> + case 30:
> + dbnc = MC13783_BUTTON_DBNC_30MS;
> + break;
> + case 150:
> + dbnc = MC13783_BUTTON_DBNC_150MS;
> + break;
> + case 750:
> + dbnc = MC13783_BUTTON_DBNC_750MS;
> + break;
> + default:
> + dev_warn(dev, "invalid debounce-delay-ms value\n");
> + continue;
> + }
> +
> + if (fwnode_property_read_u32(child, "linux,code", &priv->b_on_key[idx]))
> + continue;
> +
> + if (fwnode_property_read_bool(child, "active-low"))
> + priv->b_on_flags[idx] |= MC13783_BUTTON_POL_INVERT;
> +
> + if (fwnode_property_read_bool(child, "fsl,enable-reset"))
> + priv->b_on_flags[idx] |= MC13783_BUTTON_RESET_EN;
> +
> + priv->b_on_flags[idx] |= MC13783_BUTTON_ENABLE | dbnc;
> + }
> +
> + return 0;
> +}
> +
> static int mc13783_pwrbutton_probe(struct platform_device *pdev)
> {
> - const struct mc13xxx_buttons_platform_data *pdata;
> + struct device *dev = &pdev->dev;
> struct mc13xxx *mc13783 = dev_get_drvdata(pdev->dev.parent);
> struct mc13xxx_button_devtype *devtype =
> (struct mc13xxx_button_devtype *)pdev->id_entry->driver_data;
> @@ -100,11 +171,8 @@ static int mc13783_pwrbutton_probe(struct platform_device *pdev)
> int reg = 0;
> int irq = 0;
>
> - pdata = dev_get_platdata(&pdev->dev);
> - if (!pdata) {
> - dev_err(&pdev->dev, "missing platform data\n");
> - return -ENODEV;
> - }
> + if (!dev->parent->of_node)
> + return -ENODATA;
>
> pwr = devm_input_allocate_device(&pdev->dev);
> if (!pwr)
> @@ -114,14 +182,18 @@ static int mc13783_pwrbutton_probe(struct platform_device *pdev)
> if (!priv)
> return -ENOMEM;
>
> - if (devtype->button_id_max < 2 && pdata->b_on_flags[2] & 0x3) {
> + err = mc13xxx_pwrbutton_parse_properties(pdev, priv);
> + if (err)
> + return err;
> +
> + if (devtype->button_id_max < 2 && priv->b_on_flags[2] & 0x3) {
> dev_err(&pdev->dev, "button not supported\n");
> return -ENODEV;
> }
>
> - reg |= (pdata->b_on_flags[0] & 0x3) << MC13783_POWER_CONTROL_2_ON1BDBNC;
> - reg |= (pdata->b_on_flags[1] & 0x3) << MC13783_POWER_CONTROL_2_ON2BDBNC;
> - reg |= (pdata->b_on_flags[2] & 0x3) << MC13783_POWER_CONTROL_2_ON3BDBNC;
> + reg |= (priv->b_on_flags[0] & 0x3) << MC13783_POWER_CONTROL_2_ON1BDBNC;
> + reg |= (priv->b_on_flags[1] & 0x3) << MC13783_POWER_CONTROL_2_ON2BDBNC;
> + reg |= (priv->b_on_flags[2] & 0x3) << MC13783_POWER_CONTROL_2_ON3BDBNC;
>
> priv->pwr = pwr;
> priv->mc13783 = mc13783;
> @@ -130,17 +202,17 @@ static int mc13783_pwrbutton_probe(struct platform_device *pdev)
> mc13xxx_lock(mc13783);
>
> for (int i = 0; i < devtype->button_id_max; i++) {
> - if ((pdata->b_on_flags[i] & MC13783_BUTTON_ENABLE) == 0)
> + if ((priv->b_on_flags[i] & MC13783_BUTTON_ENABLE) == 0)
> continue;
>
> - priv->keymap[i] = pdata->b_on_key[i];
> - if (pdata->b_on_key[i] != KEY_RESERVED)
> - __set_bit(pdata->b_on_key[i], pwr->keybit);
> + priv->keymap[i] = priv->b_on_key[i];
> + if (priv->b_on_key[i] != KEY_RESERVED)
> + __set_bit(priv->b_on_key[i], pwr->keybit);
>
> - if (pdata->b_on_flags[i] & MC13783_BUTTON_POL_INVERT)
> + if (priv->b_on_flags[i] & MC13783_BUTTON_POL_INVERT)
> priv->flags |= (MC13783_PWRB_B1_POL_INVERT << i);
>
> - if (pdata->b_on_flags[i] & MC13783_BUTTON_RESET_EN)
> + if (priv->b_on_flags[i] & MC13783_BUTTON_RESET_EN)
> reg |= (MC13783_POWER_CONTROL_2_ON1BRSTEN << i);
>
> irq = platform_get_irq_byname(pdev, devtype->irq_name[i]);
> diff --git a/drivers/mfd/mc13xxx-core.c b/drivers/mfd/mc13xxx-core.c
> index c29974722704..9512136e821b 100644
> --- a/drivers/mfd/mc13xxx-core.c
> +++ b/drivers/mfd/mc13xxx-core.c
> @@ -504,10 +504,6 @@ int mc13xxx_common_init(struct device *dev)
> &pdata->regulators, sizeof(pdata->regulators));
> mc13xxx_add_subdevice_pdata(mc13xxx, "%s-led",
> pdata->leds, sizeof(*pdata->leds));
> - mc13xxx_add_subdevice_pdata_res(mc13xxx, "%s-pwrbutton",
> - pdata->buttons, sizeof(*pdata->buttons),
> - mc13xxx->variant->button_resources,
> - mc13xxx->variant->button_resources_size);
> if (mc13xxx->flags & MC13XXX_USE_CODEC)
> mc13xxx_add_subdevice_pdata(mc13xxx, "%s-codec",
> pdata->codec, sizeof(*pdata->codec));
> diff --git a/include/linux/mfd/mc13xxx.h b/include/linux/mfd/mc13xxx.h
> index 71c7d3614d4c..ac3765df341d 100644
> --- a/include/linux/mfd/mc13xxx.h
> +++ b/include/linux/mfd/mc13xxx.h
> @@ -174,19 +174,6 @@ struct mc13xxx_leds_platform_data {
> u32 led_control[MAX_LED_CONTROL_REGS];
> };
>
> -#define MC13783_BUTTON_DBNC_0MS 0
> -#define MC13783_BUTTON_DBNC_30MS 1
> -#define MC13783_BUTTON_DBNC_150MS 2
> -#define MC13783_BUTTON_DBNC_750MS 3
> -#define MC13783_BUTTON_ENABLE (1 << 2)
> -#define MC13783_BUTTON_POL_INVERT (1 << 3)
> -#define MC13783_BUTTON_RESET_EN (1 << 4)
> -
> -struct mc13xxx_buttons_platform_data {
> - int b_on_flags[3];
> - unsigned int b_on_key[3];
> -};
> -
> #define MC13783_TS_ATO_FIRST false
> #define MC13783_TS_ATO_EACH true
>
> @@ -219,7 +206,6 @@ struct mc13xxx_platform_data {
>
> struct mc13xxx_regulator_platform_data regulators;
> struct mc13xxx_leds_platform_data *leds;
> - struct mc13xxx_buttons_platform_data *buttons;
> struct mc13xxx_ts_platform_data touch;
> struct mc13xxx_codec_platform_data *codec;
> };
> --
> 2.39.5
>
--
Lee Jones [李琼斯]
Powered by blists - more mailing lists