From nobody Fri Apr 3 02:58:12 2026 Received: from mail-dy1-f171.google.com (mail-dy1-f171.google.com [74.125.82.171]) (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 C31E31D130E for ; Wed, 25 Mar 2026 00:54:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774400087; cv=none; b=M/wH5WnDc6lgYtzsYRv/c+lKC3tBRLvkd+YkzfIYOL1/w2afrdmGgamzBT1OoZXEQ2hHMPE0Zs3IHwGMQ9GkGfxJYkLRsuf25DJCZL8VtEKfp0sCrGGpaP6XlF7cLf+zDPrfGOhtr46MGPM80oo09CxGy58TJaeYfyaGM/Fo5ks= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774400087; c=relaxed/simple; bh=Ew9/7j1GoZ/LCr215EIJkwdWyoKjLnkG4AMTSCB6FqA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=MMfoortUa7W+Ch5qDWC5/pYFq0kqdGJTKqhe0sIndFx630UKH44mWQBycpx0cA/fD52lSO0i/W/JZQkgX468nSTpy2z73cZt2NVu7HAxVqptDwcLdpFfCjYyXRJ/HJuEmh+QOsricb7OwpWcpAosJf17U/mlgC5AAspBI6C9Y1E= 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=Gjf7FJXA; arc=none smtp.client-ip=74.125.82.171 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="Gjf7FJXA" Received: by mail-dy1-f171.google.com with SMTP id 5a478bee46e88-2bdcf5970cdso378208eec.0 for ; Tue, 24 Mar 2026 17:54:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1774400085; x=1775004885; 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=uWBP5g1FssXe7sJ3MiExiQN03DJBA9NDYND5impoWFI=; b=Gjf7FJXAxJklJh43XKXJhTiDOTceUkhgEt7BD40z2TzJrX9qVH57Pkk/rIMycXtrY5 xTOXWQzoto8JuzEU0lxgiKxFzgehTCqx9ApI/n6hJLdX3xhAGh9MEMWeEtxgZba+Bju/ 06PKLs++EyLAk5lIGUpbZOXXlikHs+ocwy/ax98wJq2JniS9H/my+CECgS8nUNIbAjAr BZgMhlCXw8MxMMUIGnTX4Vn5yCT1KrB3GemxlvjhwZEEsBsmISriwJZSgaYmKrJZ6+zU 0X9m3HuyaeyD2gpgSDTtsWePrdOLO7yR0289Al/FmpVjXVtMM4K57jvMUOKja764pqdx PtiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774400085; x=1775004885; 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=uWBP5g1FssXe7sJ3MiExiQN03DJBA9NDYND5impoWFI=; b=qVyIUv2Ztk4/lmb98K0lfDykEwtrHrcagfzW8K43qz1mQrXTijNmbjjjhfThs+JQfM FosCqOMnZ4j36fZP+wkXwbJTVJmBUnylWDfjNB7wZbnGuihC2LyPHOmSZfvIfxr9PgT4 vPU3E9HUrXgnoYqTkp9emjs+N8iR7szVVyNXj0aXWZluV4JQhUjzUX5qNib+fpE+vTi/ 0/hTtur97szQlFjPBt6DcpfkN8GR5jCdTre3TyGby1UWTNWHyLyc7rGRSqhGT+3p7ZzS VmrTXVAoszppIijuZMFD9AXV3Rtdm+kFH9W/biWNgLecmdIBZtMarkuCB/nlosO0iqG9 KQSw== X-Gm-Message-State: AOJu0YxDKx2veLWO9mKJaFaxWWeipBX499QucvnwDxybKNIjYccwBMej vPKDgmnHItXOw0zvldStfr+Z9JtLngSbE/gLyD+z5khGk+C2/LNLEZURSZ7IWA== X-Gm-Gg: ATEYQzwKbMFuMjBcuPDSxEPnfh5p0lq3WHYlQkXXsKY727vyf3Lcl5p+IFwUk4lu4EZ 97gDexO18SQsY7790TVgmIurS9KX53jUegYIwbrNEsFpFetYId5Pfsp/IH50kBKA0r0lHH6JTnn w+aE4VLVguib5klej5H0oMvZ580wwgBPzC31mYZNEJubCiSf4LIO1u8yd0ARkU0NsfZvN3D/8Re 9ORfJSdLqLQZ8z2mycOddc8CASoL7QHPU7Ec51jr/6LZwkinyVMAktBQictDaokvXaK7an08Mq9 CHCkXDxTP3hotg3iokNHRJRglSCuMQ0Vq/0dVl9Tgi2t30/uj1znLh1P1idTZYbo6OAVWBucU7B a/wUF2CEmGt+ZBNfj9DOzY+zJB5sOYUZGUCzYatgWp/hrPdGWxCTGZ0W8qM8CGwf95hKkJYk42S dTfW7HWFcNFurZw66bPZXg43OgYjkht/V2rmM+m8qfX1cQS9FqoHHUC5k+PsNpV/UDeAO5Bswz4 ivnfLdc4BaCa2Y= X-Received: by 2002:a05:7301:2b06:b0:2be:6693:9b4d with SMTP id 5a478bee46e88-2c14b4f708amr2491128eec.9.1774400084480; Tue, 24 Mar 2026 17:54:44 -0700 (PDT) Received: from dtor-ws.sjc.corp.google.com ([2a00:79e0:2ebe:8:a686:fd7f:70d3:9156]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-2c10b35116bsm20162457eec.30.2026.03.24.17.54.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Mar 2026 17:54:43 -0700 (PDT) From: Dmitry Torokhov Date: Tue, 24 Mar 2026 17:54:39 -0700 Subject: [PATCH v3 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: <20260324-rohm-software-nodes-v3-1-edde5a0324d5@gmail.com> References: <20260324-rohm-software-nodes-v3-0-edde5a0324d5@gmail.com> In-Reply-To: <20260324-rohm-software-nodes-v3-0-edde5a0324d5@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 | 120 +++++++++++++++++++++++++++++++++--------= ---- 1 file changed, 88 insertions(+), 32 deletions(-) diff --git a/drivers/mfd/rohm-bd71828.c b/drivers/mfd/rohm-bd71828.c index a79f354bf5cb..e78af75a2115 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,78 @@ 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; + const struct software_node *node_group[] =3D { + &nodes[0], &nodes[1], NULL + }; + + software_node_unregister_node_group(node_group); +} + +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"), + { } + }; + const struct resource res[] =3D { + DEFINE_RES_IRQ_NAMED(button_irq, "bd71828-pwrkey"), + }; + struct mfd_cell gpio_keys_cell =3D { + .name =3D "gpio-keys", + .resources =3D res, + .num_resources =3D ARRAY_SIZE(res), + }; + const struct software_node * const *node_group; + 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; + + node_group =3D (const struct software_node *[]){ + &nodes[0], + &nodes[1], + NULL + }; + + error =3D software_node_register_node_group(node_group); + if (error) + return error; + + error =3D devm_add_action_or_reset(dev, bd71828_i2c_unregister_swnodes, n= odes); + if (error) + return error; + + gpio_keys_cell.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 +984,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; @@ -1022,23 +1078,23 @@ 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 + irq_domain =3D regmap_irq_get_domain(irq_data); + 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.1018.g2bb0e51243-goog From nobody Fri Apr 3 02:58:12 2026 Received: from mail-dy1-f175.google.com (mail-dy1-f175.google.com [74.125.82.175]) (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 B9AB821638D for ; Wed, 25 Mar 2026 00:54:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774400088; cv=none; b=li/mGhkpbK8mgvnGoy+pOdyw4HFWEKKMn3iWGkKfNKRhsc9Bu2U1GgCs4vLM08NOCghlWGK0jdC6n7JL36mJxLLCnz9acB6hjfY5oSTcKylduAt6G5lt8MUaRezcoHlj3DT5RREGl1YpB/piVu9WN+n/vOhMbk409x71L6a2ScU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774400088; c=relaxed/simple; bh=4XFaen0vq/mtrh1WLqcL6ZqRkSnM+bhnxEJpgoIlBaI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=rSIZ9SIRuDChFcSgZQpc5nN4mTAhIZ+2cxi0IlOufrVGLIf8tvOnJb3/jgyloVDJYnJaFdk9Q3sjfu7F2OOpbZlS29v66/Z9Qxs1ulXqj1mmS9LpACuVveFuaR6gcQw3jYfwhn8V9TPeI7wEwwIudHZDULR7OAkEb6AVGspdXPI= 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=fPEY9NHa; arc=none smtp.client-ip=74.125.82.175 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="fPEY9NHa" Received: by mail-dy1-f175.google.com with SMTP id 5a478bee46e88-2c0ea57fea7so7480829eec.0 for ; Tue, 24 Mar 2026 17:54:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1774400086; x=1775004886; 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=eLBeyFOK6V2hELDi8jTHLn1e1gL/TMk5MDcH3V80EXk=; b=fPEY9NHaB+o0RdaRuCsCwJzNxR7/i8ZQBMarPbyoWB9TYi/Sr7fEq6jnJFOBDUxZik hAGln5jMK5uadG1EhEfRl9V3cOmUulIgoYfziAG8ZIT231rK9fD9wmxfgnWVCtDJX3Rb fjfKRoW8V2fwCwD1MFMtBLvxWLvFZTihW7xpYhSw7PfprTgiHiP3ony9nx/uOXIe8KKg hmwkuyncfymRWbXd9Z9jmT4EFg/HSs4GbqUv7hTFN8hZXluXA+P/GHrfX9CGvLwfYUd1 eZ4UPk3AbmoBmTbG52YdPZni53F16SYt+L2jyVUHG0w527kQJTpGxYU3GiGJPtQShs0R YIbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774400086; x=1775004886; 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=eLBeyFOK6V2hELDi8jTHLn1e1gL/TMk5MDcH3V80EXk=; b=THpZWl8R8lauRcDfclt5KXmBegq5W9AW/DFbgaHNw8jrs+BSSIyq0VB3n2y8eW+6FF YlHy5rOwyU3eYb/hiPXGsqucNrWTOWgnNf5kBq8+/u9C7vFCmcnSNq/J98k2eP/WHleU VCwaaAdpg6Iu5IcMxU6EyrGumuqcZ2wtctnWctcrlnBBFf6+52B6RO/bC0hmy5D/GTrN j8684KuUc/erlzznDTkPsE2ak1td95xjEbvRfvP0ynE4upjIN5CzXUHA0Ou51s+04xoR 8lQzTb6VQaCsD9740+mgNzBgG54yLiOC+qMvDnqW6zGv06K0mC+XeCci7XOlDNO6bnkY V+Iw== X-Gm-Message-State: AOJu0YyaTakyi9DEwKN7rQFH1C2w1EMAlncanQszv25jtBP8r6S0aosq d7ZaMtdZtLx7dtswmzuJCnSVIdm64CUOqApF0t0y4rYJINS7gAxR00eP X-Gm-Gg: ATEYQzwcyi3TbWy4q3t/6WBzAV33JywEJ30CxpQrpx8z0/iosuMIRHQnRdDKFta5z1s y56fuVzkzrn0hYBWJDB6gQ7/vn76ujtTeqmWzEDmaoXDLOf23YJ55MdEPAiZMqa6iPaz1zy5Wca wbmzbArdWX3ZoMuLt+rN++r9UkYceahKpzqN4z3V3QCrv/6NLEcU5Zt9HUKGFoI/sB/1SrUC4Vl 581WwZEUIUuzzASlxJ/3DjO+FFw+SHwrRCtmLFxk66azPjzdyOL+h1ZhL15yLpPr7Gpnvc1dYO6 Q39Wjrs/NvpTLZdmXowKtQITCDsb62ERx6tTQTsoXNC55ae4l3gDInbJceH74ApQcxxv6egeASy eObIIvMLGXiJzXEQL6pHjwXR3ZlZmyUOx9sTKWZ9R0XMj1Q+DYWrGAtGi6pj3TAlq/webZ7QwL6 TMAXvVgfBalSrbErdmov+szLcqluli6dCGU/vAG4P2Oe24hFmWOkS3jg9ZEoBLL26Yex0i7YNiq fyThgSpbqea5aU= X-Received: by 2002:a05:7300:8b05:b0:2c1:161f:ac39 with SMTP id 5a478bee46e88-2c15d3e3b8cmr788645eec.26.1774400085722; Tue, 24 Mar 2026 17:54:45 -0700 (PDT) Received: from dtor-ws.sjc.corp.google.com ([2a00:79e0:2ebe:8:a686:fd7f:70d3:9156]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-2c10b35116bsm20162457eec.30.2026.03.24.17.54.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Mar 2026 17:54:45 -0700 (PDT) From: Dmitry Torokhov Date: Tue, 24 Mar 2026 17:54:40 -0700 Subject: [PATCH v3 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: <20260324-rohm-software-nodes-v3-2-edde5a0324d5@gmail.com> References: <20260324-rohm-software-nodes-v3-0-edde5a0324d5@gmail.com> In-Reply-To: <20260324-rohm-software-nodes-v3-0-edde5a0324d5@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. Signed-off-by: Dmitry Torokhov --- drivers/mfd/rohm-bd718x7.c | 118 ++++++++++++++++++++++++++++++++---------= ---- 1 file changed, 85 insertions(+), 33 deletions(-) diff --git a/drivers/mfd/rohm-bd718x7.c b/drivers/mfd/rohm-bd718x7.c index ff714fd4f54d..39961177a17f 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,84 @@ 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; + const struct software_node *node_group[] =3D { + &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[] =3D { + PROPERTY_ENTRY_STRING("label", "bd718xx-pwrkey"), + { } + }; + static const struct property_entry bd718xx_powerkey_props[] =3D { + PROPERTY_ENTRY_U32("linux,code", KEY_POWER), + { } + }; + const struct resource res[] =3D { + DEFINE_RES_IRQ_NAMED(BD718XX_INT_PWRBTN_S, "bd718xx-pwrkey"), + }; + struct mfd_cell gpio_keys_cell =3D { + .name =3D "gpio-keys", + .resources =3D res, + .num_resources =3D ARRAY_SIZE(res), + }; + const struct software_node * const *node_group; + 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; + + node_group =3D (const struct software_node *[]){ + &nodes[0], + &nodes[1], + NULL + }; + + error =3D software_node_register_node_group(node_group); + if (error) + return error; + + error =3D devm_add_action_or_reset(dev, bd718xx_i2c_unregister_swnodes, + nodes); + if (error) + return error; + + gpio_keys_cell.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; @@ -169,20 +223,18 @@ static int bd718xx_i2c_probe(struct i2c_client *i2c) 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; + irq_domain =3D regmap_irq_get_domain(irq_data); =20 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.1018.g2bb0e51243-goog