From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dl1-f50.google.com (mail-dl1-f50.google.com [74.125.82.50]) (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 7A41C29B781 for ; Tue, 28 Apr 2026 04:13:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.50 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777349615; cv=none; b=pX7kmwERajCJCRKWshqp3Gwy9jsczoTq8VIf5frRqI43MZy34qSljtPK/Km4RbVF4Gqg8kO4yYPeWI95t5vxm2hn0iscC5qRDdYqX497AJf6Gtj8AkM5UgiYRvGJfjpdWBoJ6GlEGNguQh+h2tAuYb+LVtmgAmWMqZ7hEHPtZQQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777349615; c=relaxed/simple; bh=gHA10TsG3XTBLKDY+5dllHaPmNc21KpSbGr/Pw7/rWQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=YlwU2FXZCwJF+MVCYSaLHjpx3B0SG0Sj+yG+8gljZdNR1k5rdSddGo+rCbE034jpoamFqKXvpSS5a+4YrEd19qE++6BgWvuO5b5GEb0Ip38eSV5GnPs9M28r3ZrtWsjlknQ7ZXAs/VtvFVeaVe22ul/zI+0hIs0OwrNO2JJxh2Y= 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=PZMrv6EX; arc=none smtp.client-ip=74.125.82.50 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="PZMrv6EX" Received: by mail-dl1-f50.google.com with SMTP id a92af1059eb24-12c8f9846c8so10877710c88.0 for ; Mon, 27 Apr 2026 21:13:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777349613; x=1777954413; 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=Cu9K0h6yqI2NEASJOBC2WbWdsm+a9p1eHkAwcexaE64=; b=PZMrv6EXLgorZ5HDTRXUN35uMdwE4B43zSjee3fEcscpPz2AgDCDq/doNz7TzJy+57 LHMg/iw5iHKV0XpKw7QiafmJnh3Qig80Isz2lnCzfukv1As0Hbi69z7qnhx3VPXssHt6 dAapgJgWMkmK6MZ632lXu6DckfdFtFdrDDli5wNBmY/MbGDInr9ycPriSo8XpwyJhlHY sHZ2VWYAv28a5TVS69bV+furF4kPrxLHF1XqjcO/ecHDGZTQwwJbv4OoSjSe/C3CyTg2 PIedNH/AWCluMjTYEC9quRTBCNj+ZYE+5pyVSXM/lzauK5yvx9JsTBu8LQl4T13wZofL yiKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777349613; x=1777954413; 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=Cu9K0h6yqI2NEASJOBC2WbWdsm+a9p1eHkAwcexaE64=; b=sPWrJlGj1EwN+N0HYzFJhTezUyAU3z2bJXYzu1r+OPxbT3M2DXp5Aw+kQcmHalPn4O XCfNWFCTE77rbnqUMgtahuOMX9KvNL8ThR+U3QT1FGKo+yxQwLUmWbbRNps8KmXRyK15 0zNC0A/19xOZeXOjypjCBbsY/Cv3scgHNR+oF+0eB49DRVhKfCyC0uuenIHzJuJE2+v1 FcO4vv/4nxx6Cm6xe9n/Oa0+3t2AHW/Ni/ScodGZrXcY54DC4Md8fCNziaX/dyn0sCr7 UeYbxePrh3NcYKoucaLfV/FcxMJYPI6WoLxk7qScpv0PwBgDFPEhG9CT6vAlQB5xCgv8 WHrA== X-Forwarded-Encrypted: i=1; AFNElJ+b+t2NTP7b5SLCs13NsTAQaPp60wI8HqoGQ+GN6Qr/jWZyoOoCTc/XUqWeS/GpZCR5NFyLLePb1cS/pT4=@vger.kernel.org X-Gm-Message-State: AOJu0Yz2ngZ/fg/Jo00n/Jxe7C/Gr85b+CFHY7TJflyLUo5mqlMjN/zr QAVOavAFO0DeuHN+BHLm2eViAdzlKELJzMB/+tn4zXMDaSHjZS5vaq7v X-Gm-Gg: AeBDiesODWeP7lyqT0Q40rW9cxM/PWhRMNPQN+Nh3PjPNNhW/j7vjp0twy5bMGG8IhQ lGPDx70PfwR+jMyAeHauVAFOCjIxB0xbJ/DmTCJO1sWNOyg9C3nJ8OlhME/H9kyib0hsWT0CS6y oMx43eM4IqqRj6tg59bDrs1SBR3EJC6/YS4X1uebf83FMFW0iYyT2E53QlFF0SliKaTrQJgpYki HhXlMSaG1JNw9aAr4xNQfomZ6IL24l2ECB7PI9o4g59X1Pd6Qm5GpcJt4zLeQQazL6n40CbbgfT mZp4CnJkR33t1lYUJ0Jp2xxNBgitKSX15u9neYJgiWqVIxKrsQs8oqvAS887ivJS6N/hTgfCJWm Tl811+bD7S/0LpACJ8cg0mKPI+b+hn4+lRHddjZS8F2bh7z8EOc51T2VcShrCIVxgcNJ3R6FRgY 3tmqCelbv0H6/lDrUoU2XykaLx773VpgLzSnvP/9ilDoj6S5SirQK6DHp4DOfc0iTnMWecLfGCW IkcNRiB6gl32KFJ2GBUs+x3rQ== X-Received: by 2002:a05:7022:90c:b0:128:cf80:deea with SMTP id a92af1059eb24-12ddd9804e3mr700945c88.1.1777349612529; Mon, 27 Apr 2026 21:13:32 -0700 (PDT) Received: from dtor-ws.sjc.corp.google.com ([2a00:79e0:2ebe:8:e678:f42a:a63c:516c]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-12ddd9a64desm1843954c88.9.2026.04.27.21.13.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Apr 2026 21:13:31 -0700 (PDT) From: Dmitry Torokhov Date: Mon, 27 Apr 2026 21:13:24 -0700 Subject: [PATCH v4 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: 7bit Message-Id: <20260427-rohm-software-nodes-v4-2-ffeb5b0c4774@gmail.com> References: <20260427-rohm-software-nodes-v4-0-ffeb5b0c4774@gmail.com> In-Reply-To: <20260427-rohm-software-nodes-v4-0-ffeb5b0c4774@gmail.com> To: Matti Vaittinen , Lee Jones Cc: Arnd Bergmann , linux-kernel@vger.kernel.org X-Mailer: b4 0.16-dev-6911d 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. Signed-off-by: Dmitry Torokhov --- drivers/mfd/rohm-bd718x7.c | 120 ++++++++++++++++++++++++++++++++------------- 1 file changed, 87 insertions(+), 33 deletions(-) diff --git a/drivers/mfd/rohm-bd718x7.c b/drivers/mfd/rohm-bd718x7.c index ff714fd4f54d..4d8de19e5c34 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 -#include +#include +#include #include #include #include @@ -15,37 +16,16 @@ #include #include #include +#include #include #include -static struct gpio_keys_button button = { - .code = KEY_POWER, - .gpio = -1, - .type = EV_KEY, -}; - -static struct gpio_keys_platform_data bd718xx_powerkey_data = { - .buttons = &button, - .nbuttons = 1, - .name = "bd718xx-pwrkey", -}; - static struct mfd_cell bd71837_mfd_cells[] = { - { - .name = "gpio-keys", - .platform_data = &bd718xx_powerkey_data, - .pdata_size = sizeof(bd718xx_powerkey_data), - }, { .name = "bd71837-clk", }, { .name = "bd71837-pmic", }, }; static struct mfd_cell bd71847_mfd_cells[] = { - { - .name = "gpio-keys", - .platform_data = &bd718xx_powerkey_data, - .pdata_size = sizeof(bd718xx_powerkey_data), - }, { .name = "bd71847-clk", }, { .name = "bd71847-pmic", }, }; @@ -125,10 +105,86 @@ static int bd718xx_init_press_duration(struct regmap *regmap, return 0; } +static int bd718xx_i2c_register_swnodes(const struct software_node *nodes) +{ + const struct software_node * const node_group[] = { + &nodes[0], &nodes[1], NULL + }; + + return software_node_register_node_group(node_group); +} + +static void bd718xx_i2c_unregister_swnodes(void *data) +{ + const struct software_node *nodes = data; + const struct software_node * const node_group[] = { + &nodes[0], &nodes[1], NULL + }; + + software_node_unregister_node_group(node_group); +} + +static int bd718xx_i2c_register_pwrbutton(struct device *dev, + struct irq_domain *irq_domain) +{ + static const struct property_entry bd718xx_powerkey_parent_props[] = { + PROPERTY_ENTRY_STRING("label", "bd718xx-pwrkey"), + { } + }; + static const struct property_entry bd718xx_powerkey_props[] = { + PROPERTY_ENTRY_U32("linux,code", KEY_POWER), + { } + }; + const struct resource res[] = { + DEFINE_RES_IRQ_NAMED(BD718XX_INT_PWRBTN_S, "bd718xx-pwrkey"), + }; + struct mfd_cell gpio_keys_cell = { + .name = "gpio-keys", + .resources = res, + .num_resources = ARRAY_SIZE(res), + }; + struct software_node *nodes; + int error; + + nodes = devm_kcalloc(dev, 2, sizeof(*nodes), GFP_KERNEL); + if (!nodes) + return -ENOMEM; + + /* Node corresponding to gpio-keys device itself */ + nodes[0].name = devm_kasprintf(dev, GFP_KERNEL, "%s-power-key", dev_name(dev)); + if (!nodes[0].name) + return -ENOMEM; + + nodes[0].properties = bd718xx_powerkey_parent_props; + + /* Node representing power button within gpio-keys device */ + nodes[1].parent = &nodes[0]; + nodes[1].properties = bd718xx_powerkey_props; + + error = bd718xx_i2c_register_swnodes(nodes); + if (error) + return error; + + error = devm_add_action_or_reset(dev, bd718xx_i2c_unregister_swnodes, + nodes); + if (error) + return error; + + gpio_keys_cell.swnode = &nodes[0]; + error = 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; @@ -169,20 +225,18 @@ static int bd718xx_i2c_probe(struct i2c_client *i2c) if (ret) return ret; - ret = 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 = ret; + irq_domain = regmap_irq_get_domain(irq_data); ret = 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"); - return ret; + ret = bd718xx_i2c_register_pwrbutton(&i2c->dev, irq_domain); + if (ret) + return ret; + + return 0; } static const struct of_device_id bd718xx_of_match[] = { -- 2.54.0.545.g6539524ca2-goog