From nobody Fri Apr 3 23:43:49 2026 Received: from mail-dl1-f52.google.com (mail-dl1-f52.google.com [74.125.82.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 467FF1EE7D5 for ; Mon, 23 Mar 2026 01:38:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774229885; cv=none; b=MY4xWHOYSEa1uLGFXVQXGI7osXIuILdZG/PEvuRrwmnsGScfk+Jczdix7yxFkGeSIcmJN1TPLBXawHICc2LyDnvIixY622xygC/gTbZl563OubrWP5UgFNEA3s8SSwOBvC4bHMd31i4Jde6frOzRRLkkRH8eR7cVxk4PrpW6vXY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774229885; c=relaxed/simple; bh=9E53s+YpCWO+BgB2h1ulfVWceA02jWrJIieXASleqHA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=kkj81N8fo5UVI3kXAaIQgmGjfDWWb3muhUriLtmHqQRBgyx0OOfJ0l9NOIdUU2RT5kAZLEWsase+WqYGdFGC5VXKOSVyKN02NE7xV2W16ZgdLw5tWVKqfc1LKLZS6nv6KDi8uo2G9WHqWO4cvV0lOdRzUi6j9drwdThda1K71JA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=aEfexIhk; arc=none smtp.client-ip=74.125.82.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="aEfexIhk" Received: by mail-dl1-f52.google.com with SMTP id a92af1059eb24-12776bebe9fso4209858c88.1 for ; Sun, 22 Mar 2026 18:38:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1774229883; x=1774834683; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=flwcAiaA+OCkBEt7bFJFhV67qUea2qSNugSKWyJK2Kw=; b=aEfexIhkVSp6YwQd2cQ1+0elUa6AYINnQPmS84pC6fKEQ+vwlR6Y7PFa4qpsuqhVi0 HoTOJas+TcZrwAJo0+f7bTh58gxffoSvpwwqezY9Sq1wdb+UK23m179eH9tpV6wN9VMI l/gMFuTK7aooqnOCwhyE7Z/BmOZcEpQnQo/fuezQaguuAuW4r8jZGt0jAKmie8GUgD3E IILpU12sMZ9G5A6suLOddeqDAEGRKwmZlehXEToeNlHH7uMm5f/jdkVGHwGAIwATi6O0 NilunOSJ/vV6SNYAOEm2yNI37EZpTwXwMbMw/l4jQLJgwSLOXsJS0ZoN5mvLefpOp3sK dCOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774229883; x=1774834683; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=flwcAiaA+OCkBEt7bFJFhV67qUea2qSNugSKWyJK2Kw=; b=EESJ+wYjUKp3NNJhXh4ZUpKcmXDoy/EU348mSG7pinG75BQUv2TiRspFbX5tr4AOhR tI1HkUdfcrJ9n9EJbJBEGfz7MhflL2y773j8vuZreb46vZp67Xd1ABBfNhcxEEz9SU0J mjxLRmYNDi6oiQLmZ9vhCT2o3X1PnnTwCklc2Q8sltp6NOZhv4fwO+8LD4K8T4cqZNRi A4Fo+TIc+bPfYnxIUBzC8hb3Szx4DzzSRW77LWx43HBo/SPkm0PdabKHs39+tNhImqMC CNMpIlgpdH3qdJikKk7/mYLKXHAD9CGPau2k8rlVNL2k9sY5R6pVUwFVh68kbFWgrT2c vExw== X-Gm-Message-State: AOJu0YzAEWuixlsZjCbQgIOI8aftDId4wGxXPhIzM4SwkEMiNML1rKSn BnRVAGqucQUThBxI+khrlOyRx8f3hBjIqoocWInFtrOB+ubOIMzgDnCmqjWmqg== X-Gm-Gg: ATEYQzzBpRoN+EnE5C8YYxusRyF9rmvw0cYUQ03wlya/73aU/mEjgFVyTbB6aDrkAmr mLEQR4aTj5KQS59h5XV1sUQ/LvDKoK/tML3rrE80Ry2YkR48RqM7reshdiPzs3JCEJAfcsFC5Rj 0bYEAGAlu2j53ywqlrXTwLHf7gsXTY4RNxlRvUZ9IRP7JPXruI0vOJ74Gr3/k6/RjPqz9LAinMg aizKtxn4ceF4U8jPmhBCCzXRI70QtoJGt7rQ/VlXL9gxCx79m3/mNj83wLaGH7sQOPg33dxa0qz 9l6bYNeR31ppG58BsdgBWEeppu79R6eSM8spQ25xKD+dfYuiYoMOY1aFPy2U3etfbNPnIpr19hf lcRA1EdXh22eJwc/O+F+lVInTXGy6hUgU1Y2FXvWin4Kq6/wnsRx0Tg4WWBNeE60Lx4p2ijD1+n VwoD8jyMFvuM7QCnERi17oFrr0NPr9KhwVJshJZpsyhCjiU6wfPF+kCYrX7tvZ7KHQJsTrXxUJ2 NQUGIsJTVH60kNz7WOY+bJB7g== X-Received: by 2002:a05:7022:100a:b0:128:d967:4674 with SMTP id a92af1059eb24-12a726ab878mr4867723c88.19.1774229883048; Sun, 22 Mar 2026 18:38:03 -0700 (PDT) Received: from dtor-ws.sjc.corp.google.com ([2a00:79e0:2ebe:8:b768:22ed:3eba:aeb3]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-12a736b929csm8406245c88.13.2026.03.22.18.38.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Mar 2026 18:38:02 -0700 (PDT) From: Dmitry Torokhov Date: Sun, 22 Mar 2026 18:37:56 -0700 Subject: [PATCH v2 2/2] mfd: rohm-bd718x7: Use software nodes for gpio-keys Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260322-rohm-software-nodes-v2-2-3c7d21336d37@gmail.com> References: <20260322-rohm-software-nodes-v2-0-3c7d21336d37@gmail.com> In-Reply-To: <20260322-rohm-software-nodes-v2-0-3c7d21336d37@gmail.com> To: Matti Vaittinen , Lee Jones Cc: linux-kernel@vger.kernel.org X-Mailer: b4 0.15-dev-a6826 Refactor the rohm-bd7182x7 MFD driver to use software nodes for instantiating the gpio-keys child device, replacing the old platform_data mechanism. The power key's properties are now defined using software nodes and property entries. The IRQ is passed as a resource attached to the platform device. This will allow dropping support for using platform data for configuring gpio-keys in the future. --- drivers/mfd/rohm-bd718x7.c | 117 ++++++++++++++++++++++++++++++++---------= ---- 1 file changed, 83 insertions(+), 34 deletions(-) diff --git a/drivers/mfd/rohm-bd718x7.c b/drivers/mfd/rohm-bd718x7.c index ff714fd4f54d..6f677be9a5d7 100644 --- a/drivers/mfd/rohm-bd718x7.c +++ b/drivers/mfd/rohm-bd718x7.c @@ -7,7 +7,8 @@ // Datasheet for BD71837MWV available from // https://www.rohm.com/datasheet/BD71837MWV/bd71837mwv-e =20 -#include +#include +#include #include #include #include @@ -15,37 +16,16 @@ #include #include #include +#include #include #include =20 -static struct gpio_keys_button button =3D { - .code =3D KEY_POWER, - .gpio =3D -1, - .type =3D EV_KEY, -}; - -static struct gpio_keys_platform_data bd718xx_powerkey_data =3D { - .buttons =3D &button, - .nbuttons =3D 1, - .name =3D "bd718xx-pwrkey", -}; - static struct mfd_cell bd71837_mfd_cells[] =3D { - { - .name =3D "gpio-keys", - .platform_data =3D &bd718xx_powerkey_data, - .pdata_size =3D sizeof(bd718xx_powerkey_data), - }, { .name =3D "bd71837-clk", }, { .name =3D "bd71837-pmic", }, }; =20 static struct mfd_cell bd71847_mfd_cells[] =3D { - { - .name =3D "gpio-keys", - .platform_data =3D &bd718xx_powerkey_data, - .pdata_size =3D sizeof(bd718xx_powerkey_data), - }, { .name =3D "bd71847-clk", }, { .name =3D "bd71847-pmic", }, }; @@ -125,10 +105,81 @@ static int bd718xx_init_press_duration(struct regmap = *regmap, return 0; } =20 +static void bd718xx_i2c_unregister_swnodes(void *data) +{ + const struct software_node *nodes =3D data; + + software_node_unregister_node_group((const struct software_node *[]){ + &nodes[0], + &nodes[1], + NULL + }); +} + +static int bd718xx_i2c_register_pwrbutton(struct device *dev, + struct irq_domain *irq_domain) +{ + static const struct property_entry bd718xx_powerkey_parent_props[] =3D { + PROPERTY_ENTRY_STRING("label", "bd718xx-pwrkey"), + { } + }; + static const struct property_entry bd718xx_powerkey_props[] =3D { + PROPERTY_ENTRY_U32("linux,code", KEY_POWER), + { } + }; + struct software_node *nodes; + int error; + + nodes =3D devm_kcalloc(dev, 2, sizeof(*nodes), GFP_KERNEL); + if (!nodes) + return -ENOMEM; + + /* Node corresponding to gpio-keys device itself */ + nodes[0].name =3D devm_kasprintf(dev, GFP_KERNEL, "%s-power-key", dev_nam= e(dev)); + if (!nodes[0].name) + return -ENOMEM; + + nodes[0].properties =3D bd718xx_powerkey_parent_props; + + /* Node representing power button within gpio-keys device */ + nodes[1].parent =3D &nodes[0]; + nodes[1].properties =3D bd718xx_powerkey_props; + + error =3D software_node_register_node_group((const struct software_node *= []){ + &nodes[0], + &nodes[1], + NULL + }); + if (error) + return error; + + error =3D devm_add_action_or_reset(dev, bd718xx_i2c_unregister_swnodes, + nodes); + if (error) + return error; + + struct mfd_cell gpio_keys_cell =3D { + .name =3D "gpio-keys", + .resources =3D (const struct resource[]){ + DEFINE_RES_IRQ_NAMED(BD718XX_INT_PWRBTN_S, "bd718xx-pwrkey"), + }, + .num_resources =3D 1, + .swnode =3D &nodes[0], + }; + error =3D devm_mfd_add_devices(dev, PLATFORM_DEVID_AUTO, + &gpio_keys_cell, 1, NULL, 0, irq_domain); + if (error) + return dev_err_probe(dev, error, + "Failed to create power button subdevice"); + + return 0; +} + static int bd718xx_i2c_probe(struct i2c_client *i2c) { struct regmap *regmap; struct regmap_irq_chip_data *irq_data; + struct irq_domain *irq_domain; int ret; unsigned int chip_type; struct mfd_cell *mfd; @@ -165,24 +216,22 @@ static int bd718xx_i2c_probe(struct i2c_client *i2c) if (ret) return dev_err_probe(&i2c->dev, ret, "Failed to add irq_chip\n"); =20 + irq_domain =3D regmap_irq_get_domain(irq_data); + ret =3D bd718xx_init_press_duration(regmap, &i2c->dev); if (ret) return ret; =20 - ret =3D regmap_irq_get_virq(irq_data, BD718XX_INT_PWRBTN_S); - - if (ret < 0) - return dev_err_probe(&i2c->dev, ret, "Failed to get the IRQ\n"); - - button.irq =3D ret; - ret =3D devm_mfd_add_devices(&i2c->dev, PLATFORM_DEVID_AUTO, - mfd, cells, NULL, 0, - regmap_irq_get_domain(irq_data)); + mfd, cells, NULL, 0, irq_domain); if (ret) - dev_err_probe(&i2c->dev, ret, "Failed to create subdevices\n"); + return dev_err_probe(&i2c->dev, ret, "Failed to create subdevices\n"); =20 - return ret; + ret =3D bd718xx_i2c_register_pwrbutton(&i2c->dev, irq_domain); + if (ret) + return ret; + + return 0; } =20 static const struct of_device_id bd718xx_of_match[] =3D { --=20 2.53.0.959.g497ff81fa9-goog