From nobody Fri Apr 3 23:44:26 2026 Received: from mail-dl1-f48.google.com (mail-dl1-f48.google.com [74.125.82.48]) (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 57F3820125F for ; Mon, 23 Mar 2026 01:38:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774229884; cv=none; b=JSs8kWT80mjiP6DezwQUIgqCAw5jkL1M+xi3dsCF4NCu8bcgi2SH/BeqQr78lk3Dp52FjWU8lf20S9Tieby+YAAHwqrskoHpCgFQrUbjj3CvVwlzzDNtUfRiQzuCKGJIQF4IJG2J6cCsXvdc3q12EurTQpxWJyWR/dl0qaUo014= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774229884; c=relaxed/simple; bh=tDFJ8xQMeZYfBI9q73TIUYFASsjXt/2dCYloazUGYq0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=lizU5bg2Yr+VJIm3MzH+PUdNvNl4ISZu1DvzILWI8mkH5Nm7GOHlDA45Rk4c13u6RC+MRAVUTQjHX2qW3TMxf+iYuF82mgZKIrSJZ8vO1UTLUeKYfYuT0XRs44Hv/clZNjfOBDUbAcU8jbsve3DdQYnoQluUBDgNAHPl1gcgUvc= 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=ScK0MIc3; arc=none smtp.client-ip=74.125.82.48 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="ScK0MIc3" Received: by mail-dl1-f48.google.com with SMTP id a92af1059eb24-12776bebe9fso4209851c88.1 for ; Sun, 22 Mar 2026 18:38:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1774229882; x=1774834682; 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=lK+EqnVB5PEwuz2lSb6FYRG4IUVDcUWKIpw1mXp1pe4=; b=ScK0MIc3pZV9++0nvdIkQ0KK6QxxzaZkEoVcp84T+dUX8+1LKPn8gajLZ5aLdVdfK7 JySpczYfWxKS2zxeW3z61VYDerUKsqjinIvYTV17wIa9hOAiT/d7/0e2tadHsmHfI0+W nbakprNDB+f3vdj2rJ7Tm85GXQmMBMkbbURacVkbEDEydSFmlnkBd6TRTuaaEQBN8foK kdOMp9OfvLYFSO24GZ71KCVqfpmu7pszfyclPvPyDfaFjqcaMVp/0ffV+K+CIjpX3upf J0wfHo8WV4s/OyLTRh3UrsFVdUi3FX1QKkP647VgnNqaNeFlTD6SSbXzHyrjaOA5yd+O ieIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774229882; x=1774834682; 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=lK+EqnVB5PEwuz2lSb6FYRG4IUVDcUWKIpw1mXp1pe4=; b=iQjb/1r6UPqOPigdSzPkM2pdA6YA12EmiTYfyMntL31EXakAKa8qM65wEQSI2RHXu5 GWkfUpUIidOq3cJ70oxFk3ZeB/ZbTfpcFfmgxOCQMpLV//hn9nR1nJ0CFMpWJd9OGwdK 88SCICDZu8OD3+yPh3do+M20Jk3RcCnNUu0cT7vJ7A+9PsDuDPYA99LOSNnBmEVjxck2 rbgBOikpSjMFV1bb95kSqVCxn8x8AXQJbOs0K5C9z7CveC34M4OyRV4LwydmcWAG/yL5 BcO5CBW/pFvSHVDvep45Zap4o7+Knl4SwjqWzuyTu0ILXjkrxdhsezdAWWp6Smg9rM6j OCXQ== X-Gm-Message-State: AOJu0YwJAtfKd1zmIRoc7lajRSNjJM5UUB5p/yava6YYnkQnDr2tt+4r b6EXoOW/Fepk6LW7khfKWE/QyQmRRQ0Z1CWLgPUonyfR+wh9N4Mhkn98UnL3cA== X-Gm-Gg: ATEYQzxFvM+xbxfJ0+rAgjXFjRu08APjQ6qaBMkZwmAEPOsryz5aVy6u06Q5XK4/rmZ VJGORsGxacFyBi2kOcpysElI74yRPxAIjjooVED+Quk1WDT0zWyFCCRZerPx3XSXde3H5qH+ji0 FbmlXwz0Tr3H79QRF6JDqBsmk3t1QpQF9h+BtxjeJQegs8CZRHTKuLodSC65h544MvUsxK73pPl bcjrPiKMzjulJrKhEOrCF8NkiY9q4MplgNjgGt8prE0zNs3nMazcjAFxH9MiGDen3YhlGrQBwgM BA/JKchW+Y3bzhlImkos7Swg4rzXuD7wWojMp2oIAhijHu19EVFwUHrFFCwEeyidwnamZMltgUz bQS2n3s/1ZhArH3xPFWezEsJBMtt2XyoZyV4ZwjjXetPUGSvJoandYMqP8wyHoYr59mePThVWdF j1UqZPa8qibq/w8KJLAhLFuaov5mIDDKZCu5+E9HJS6L1UQrCLC1wox0ENZKgzA3cxoAAx/yqxO 11nsx0IB5cFGxU= X-Received: by 2002:a05:7022:68a4:b0:11d:e40f:ee69 with SMTP id a92af1059eb24-12a726d96c1mr4922465c88.36.1774229881916; Sun, 22 Mar 2026 18:38:01 -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.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Mar 2026 18:38:01 -0700 (PDT) From: Dmitry Torokhov Date: Sun, 22 Mar 2026 18:37:55 -0700 Subject: [PATCH v2 1/2] mfd: rohm-bd71828: 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-1-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-bd71828 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-bd71828.c | 117 ++++++++++++++++++++++++++++++++---------= ---- 1 file changed, 85 insertions(+), 32 deletions(-) diff --git a/drivers/mfd/rohm-bd71828.c b/drivers/mfd/rohm-bd71828.c index a79f354bf5cb..20b7910e7f63 100644 --- a/drivers/mfd/rohm-bd71828.c +++ b/drivers/mfd/rohm-bd71828.c @@ -5,7 +5,8 @@ * ROHM BD718[15/28/79] and BD72720 PMIC driver */ =20 -#include +#include +#include #include #include #include @@ -18,6 +19,7 @@ #include #include #include +#include #include #include =20 @@ -37,19 +39,6 @@ }, \ } =20 -static struct gpio_keys_button button =3D { - .code =3D KEY_POWER, - .gpio =3D -1, - .type =3D EV_KEY, - .wakeup =3D 1, -}; - -static const struct gpio_keys_platform_data bd71828_powerkey_data =3D { - .buttons =3D &button, - .nbuttons =3D 1, - .name =3D "bd71828-pwrkey", -}; - static const struct resource bd71815_rtc_irqs[] =3D { DEFINE_RES_IRQ_NAMED(BD71815_INT_RTC0, "bd70528-rtc-alm-0"), DEFINE_RES_IRQ_NAMED(BD71815_INT_RTC1, "bd70528-rtc-alm-1"), @@ -174,11 +163,8 @@ static struct mfd_cell bd71828_mfd_cells[] =3D { .name =3D "bd71828-rtc", .resources =3D bd71828_rtc_irqs, .num_resources =3D ARRAY_SIZE(bd71828_rtc_irqs), - }, { - .name =3D "gpio-keys", - .platform_data =3D &bd71828_powerkey_data, - .pdata_size =3D sizeof(bd71828_powerkey_data), }, + /* Power button is registered separately */ }; =20 static const struct resource bd72720_power_irqs[] =3D { @@ -242,11 +228,8 @@ static const struct mfd_cell bd72720_mfd_cells[] =3D { .name =3D "bd72720-rtc", .resources =3D bd72720_rtc_irqs, .num_resources =3D ARRAY_SIZE(bd72720_rtc_irqs), - }, { - .name =3D "gpio-keys", - .platform_data =3D &bd71828_powerkey_data, - .pdata_size =3D sizeof(bd71828_powerkey_data), }, + /* Power button is registered separately */ }; =20 static const struct regmap_range bd71815_volatile_ranges[] =3D { @@ -877,6 +860,75 @@ static int set_clk_mode(struct device *dev, struct reg= map *regmap, OUT32K_MODE_CMOS); } =20 +static void bd71828_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 bd71828_i2c_register_pwrbutton(struct device *dev, int button_i= rq, + struct irq_domain *irq_domain) +{ + static const struct property_entry bd71828_powerkey_parent_props[] =3D { + PROPERTY_ENTRY_STRING("label", "bd71828-pwrkey"), + { } + }; + static const struct property_entry bd71828_powerkey_props[] =3D { + PROPERTY_ENTRY_U32("linux,code", KEY_POWER), + PROPERTY_ENTRY_BOOL("wakeup-source"), + { } + }; + 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 bd71828_powerkey_parent_props; + + /* Node representing power button within gpio-keys device */ + nodes[1].parent =3D &nodes[0]; + nodes[1].properties =3D bd71828_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, bd71828_i2c_unregister_swnodes, n= odes); + if (error) + return error; + + const struct mfd_cell gpio_keys_cell =3D { + .name =3D "gpio-keys", + .resources =3D (const struct resource[]) { + DEFINE_RES_IRQ_NAMED(button_irq, "bd71828-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 subdevic= e"); + + return 0; +} + static struct i2c_client *bd71828_dev; static void bd71828_power_off(void) { @@ -929,6 +981,7 @@ static struct regmap *bd72720_do_regmaps(struct i2c_cli= ent *i2c) static int bd71828_i2c_probe(struct i2c_client *i2c) { struct regmap_irq_chip_data *irq_data; + struct irq_domain *irq_domain; int ret; struct regmap *regmap =3D NULL; const struct regmap_config *regmap_config; @@ -1008,6 +1061,8 @@ static int bd71828_i2c_probe(struct i2c_client *i2c) dev_dbg(&i2c->dev, "Registered %d IRQs for chip\n", irqchip->num_irqs); =20 + irq_domain =3D regmap_irq_get_domain(irq_data); + /* * On some ICs the main IRQ register has corresponding mask register. * This is not handled by the regmap IRQ. Let's enable all the main @@ -1022,23 +1077,21 @@ static int bd71828_i2c_probe(struct i2c_client *i2c) "Failed to enable main level IRQs\n"); } } - if (button_irq) { - ret =3D regmap_irq_get_virq(irq_data, button_irq); - if (ret < 0) - return dev_err_probe(&i2c->dev, ret, - "Failed to get the power-key IRQ\n"); - - button.irq =3D ret; - } =20 ret =3D set_clk_mode(&i2c->dev, regmap, clkmode_reg); if (ret) return ret; =20 ret =3D devm_mfd_add_devices(&i2c->dev, PLATFORM_DEVID_AUTO, mfd, cells, - NULL, 0, regmap_irq_get_domain(irq_data)); + NULL, 0, irq_domain); if (ret) - return dev_err_probe(&i2c->dev, ret, "Failed to create subdevices\n"); + return dev_err_probe(&i2c->dev, ret, "Failed to create subdevices\n"); + + if (button_irq) { + ret =3D bd71828_i2c_register_pwrbutton(&i2c->dev, button_irq, irq_domain= ); + if (ret) + return ret; + } =20 if (of_device_is_system_power_controller(i2c->dev.of_node) && chip_type =3D=3D ROHM_CHIP_TYPE_BD71828) { --=20 2.53.0.959.g497ff81fa9-goog