From nobody Fri Jun 12 11:27:35 2026 Received: from mail-dy1-f178.google.com (mail-dy1-f178.google.com [74.125.82.178]) (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 76EFD2D593E for ; Thu, 11 Jun 2026 15:48:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781192913; cv=none; b=jsywlqdzVgAbqxmEAenOWxU90SXipAyofxZ/ZMIWlWKc6YwMpj4eMCjaP71NnA9mkX4d18BvOXTOnAk6qU77N4bzoqU1fBDHOtqy0BFMgbGxwCKcPM8yfPYBotBE1aQm4OI6eIRj6xNoEgPPmuVN3na+FsUY5GL+UU3lZi0E980= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781192913; c=relaxed/simple; bh=JfWjySAioe9T7FMugrYvCIy2RnJE8Pzwpab7+8+iQtk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=GnRdvGcRerAXeJoGE5HgYQ96vPnUIhobEZs8vEN2Whhw+3pJyEadUYm+eoBn17Mnuk99dHGZ0Tin+K0aK4ovx3/RTMuJgqIxLgu5Qy5LGr7hejA2H04QBKH9SQs7SSmqKgyv2F23SHJCuZGW6bvZQc8mtO1i+xVFSJYJwwDxy+Y= 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=buRjs6M/; arc=none smtp.client-ip=74.125.82.178 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="buRjs6M/" Received: by mail-dy1-f178.google.com with SMTP id 5a478bee46e88-304cf518c9dso20858eec.1 for ; Thu, 11 Jun 2026 08:48:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781192911; x=1781797711; 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=MZw8mvwueIE3Q8PMulBJsfc1jE/ygspXYVupr3eZbJE=; b=buRjs6M/88bmA277idyi6dFWwv9BfQljK2iDgV2wPzHMMMk3lXYIsKXBgzIOXNd4Vw 709TzXNMd+fG+Btm/tOJxKBJGgozFb9dAS12mNUrNlDpq+uRv0BfbocCsNAxtN1jpMmW do9olzxzHQ+o9YcCLx/YcUxoL3DPiB4d4AhYr7TFxxmB3pn4+YObmV2kCfqyAsr9xL1G u5aUF4T+26I+nXh7Xm/qa8MamjiskynHPOju6T8aeEw09nM5fOxblo7RztwwvAIR+7vx kWtq2SBwUwMrpAykm6Q6yTgJOZswn96x4XwENH8BBHUXsKpJp92tZdIdJZHOlxbegbjF JanA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781192911; x=1781797711; 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=MZw8mvwueIE3Q8PMulBJsfc1jE/ygspXYVupr3eZbJE=; b=S10UQVwwe8jdrjPD/q23tjw39BCPffvF0YrJpIPnJ/5f0Xs3gDRk6lqToSsBUxpwf9 ArVcFXjGavuM2HiKP00StIHNS+XgqQsccVfkCiScjIPrkS5ejWaSyRcepXvzWxkDaH+N 2x4DZNpLJz3H361PQpGjTUERbfeM/nXOkhLfpCrGDaa5z43oAY3X1EIubw5UEyT0cnG8 YCqp3+yNKatL7aHEmeLd91u9oXYJD2NNu/ZDj3wsz9+feNxuxxAGaudSwVP1kyPcWrK3 Sp2vjLSYHchf8KIgWRcAoSKyiXmCS9h6qKW8FTitcyAxoeC34vGL++S1vpPRVdbA5QHO 37Ow== X-Forwarded-Encrypted: i=1; AFNElJ98L6wz+M5IT/iA9ljAZceszvWOr0cw5f7swKZBDFButdKaP7OKWFPkk8dNMxrnASj/DLeQ2E3kYnXgndA=@vger.kernel.org X-Gm-Message-State: AOJu0Yw/wXMv0ii9cBW3CbKcGg5O1Sgm3E7uxxU3H6p9rna/NvDKn5zU IpMqW6e5e82a8+xyMQUHQIg6Ez9l0/HKE8gGHa5zDZyfpufs1w4n6l5x X-Gm-Gg: Acq92OGHg2lapk4vNnbB15RxAN4WoX3cg3oQSXEa9TJ+xAHism3RFQqfKPv6Z06zwa7 WAdnC5wOSAn1ar+ymtLCDM+QsNwSJ6ypekp5Sk8DztJi5GwArnlgeQvJRVCYsWCU3/WI8Tc9w1z bYFLGN1ghOUD7ZsMAwDY8vMRoEDvETGloEgC3BwnroLyJIHlv4xGx4HUvXHpzZyGneHTahccxCv s3pyXTCbKlfnitUkxycnFolfeJ2Ma+XLkrd+azKik0xxShA4WwPCzUNC6MQqZF7QRfMbA2JztB6 MOmUYEtsPrG60Gd8w9bOftyIdEv5NMHSrISnLjfIwB0qYhBvAuWRZwWCLbmFR7dSwPwqNN8po+n 3bJR4d3+86RIDrBTovwfY9ZRMroDGL2lhF6r+sItgr306rvfqdtlYrrvmSXjBpM2+JUnlFCJ0ww aIXqTozCAzymiyK4T2+pz9+Xp1lEa5LhKiI1PNBGUhYzjB2fA4U2sttWGo879+BUCA5Li0PK/E5 SQlfo2cPXhTUIHYco3t2hX64w== X-Received: by 2002:a05:7301:1e8a:b0:304:d835:27f with SMTP id 5a478bee46e88-3080499f77emr2494738eec.22.1781192911442; Thu, 11 Jun 2026 08:48:31 -0700 (PDT) Received: from dtor-ws.sjc.corp.google.com ([2a00:79e0:2ebe:8:ae0e:e075:91c8:6570]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-30806aa88a7sm2184492eec.0.2026.06.11.08.48.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Jun 2026 08:48:30 -0700 (PDT) From: Dmitry Torokhov Date: Thu, 11 Jun 2026 08:48:25 -0700 Subject: [PATCH v5 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: <20260611-rohm-software-nodes-v5-1-0244664a3b65@gmail.com> References: <20260611-rohm-software-nodes-v5-0-0244664a3b65@gmail.com> In-Reply-To: <20260611-rohm-software-nodes-v5-0-0244664a3b65@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-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 | 125 +++++++++++++++++++++++++++++++++--------= ---- 1 file changed, 93 insertions(+), 32 deletions(-) diff --git a/drivers/mfd/rohm-bd71828.c b/drivers/mfd/rohm-bd71828.c index a79f354bf5cb..5fb6142cf087 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,10 +163,6 @@ 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), }, }; =20 @@ -242,11 +227,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 +859,84 @@ static int set_clk_mode(struct device *dev, struct reg= map *regmap, OUT32K_MODE_CMOS); } =20 +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"), + { } +}; + +#define GPIO_KEYS 0 /* Node corresponding to gpio-keys device itself */ +#define PWRON_KEY 1 /* Node describing power button in gpio-keys */ + +static int bd71828_i2c_register_swnodes(const struct software_node *nodes) +{ + const struct software_node * const node_group[] =3D { + &nodes[GPIO_KEYS], &nodes[PWRON_KEY], NULL + }; + + return software_node_register_node_group(node_group); +} + +static void bd71828_i2c_unregister_swnodes(void *data) +{ + const struct software_node *nodes =3D data; + const struct software_node * const node_group[] =3D { + &nodes[GPIO_KEYS], &nodes[PWRON_KEY], 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) +{ + 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), + }; + struct software_node *nodes; + int ret; + + nodes =3D devm_kcalloc(dev, 2, sizeof(*nodes), GFP_KERNEL); + if (!nodes) + return -ENOMEM; + + nodes[GPIO_KEYS].name =3D devm_kasprintf(dev, GFP_KERNEL, "%s-power-key",= dev_name(dev)); + if (!nodes[GPIO_KEYS].name) + return -ENOMEM; + + nodes[GPIO_KEYS].properties =3D bd71828_powerkey_parent_props; + + nodes[PWRON_KEY].parent =3D &nodes[GPIO_KEYS]; + nodes[PWRON_KEY].properties =3D bd71828_powerkey_props; + + ret =3D bd71828_i2c_register_swnodes(nodes); + if (ret) + return ret; + + ret =3D devm_add_action_or_reset(dev, bd71828_i2c_unregister_swnodes, nod= es); + if (ret) + return ret; + + gpio_keys_cell.swnode =3D &nodes[GPIO_KEYS]; + + ret =3D devm_mfd_add_devices(dev, PLATFORM_DEVID_AUTO, &gpio_keys_cell, 1, + NULL, 0, irq_domain); + if (ret) + return dev_err_probe(dev, ret, "Failed to register power-button"); + + return 0; +} + static struct i2c_client *bd71828_dev; static void bd71828_power_off(void) { @@ -929,6 +989,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 +1083,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.54.0.1099.g489fc7bff1-goog From nobody Fri Jun 12 11:27:35 2026 Received: from mail-dy1-f182.google.com (mail-dy1-f182.google.com [74.125.82.182]) (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 91781400E0F for ; Thu, 11 Jun 2026 15:48:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781192915; cv=none; b=GKV/bbsyyh9eFv6UOL+w+ol/ktbN4ZAt7rESLlH+8vARo0KruyM9/4jIr7rJ6R6A9uX3tRqugXRFjhAkpPeGoIyA8+65E77suezEZiN08Sb02vGPHlOnEwWpuVhrBb8mXhCqIIM65bJWcLGFrjVruk12BccrD2c+GgnjTe9vlyc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781192915; c=relaxed/simple; bh=Lh7L2h/Knyh3RSfwZqkIZ1XNshlGMUTdSu1o2qAlzXg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=FVhGUVE+sO1T1xz8ngo/PYmcvbxalhGy1ym+7+QYtjuafZRv8dR83pX5u8ynBIDDXWOMZ4LOKHWfkPOO0BTYd6xJV8sZU29ik/QHdUm7vPFovNyWxJUkmPUVUl4EADBOYrpT8YOb70hPEciI/SbczakC4WnHZYWe7SnG/VYDlb4= 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=BXDif3DP; arc=none smtp.client-ip=74.125.82.182 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="BXDif3DP" Received: by mail-dy1-f182.google.com with SMTP id 5a478bee46e88-307263ad0cbso51284eec.0 for ; Thu, 11 Jun 2026 08:48:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781192913; x=1781797713; 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=cHM9ksniuUhqTAVTpdb7IEp6BHP9lExgqgKDsZXSpKU=; b=BXDif3DPjodZso+iIyabhVdyd53D9QZEQh1urps37gl/WaPNIcEEXRW70FQcXlhL6q kR3eEnPa04uHcc2yPyvROvfv2as+uMJvBK6ABpUFgcLOBZVEa5QT5jPJoUeMYtx+fgFF y91GvUH0ABsu2gilJ/awnkmb/RMI6zsdD1OjO96URkfdHOUtsNRJ910wt0m72EPBSGRO lQVN47rLixBXgb8kKXxU8u4sur4GZTSWEJCfZhRytF9tshtFVNZDl/rPqwOJ+U98xKe1 /y2zRmZoTXy6IJk1MvWOngX/Rue4D1GvWM8ozxeY6LnNoBcwGlVZFZnOUMe8ushAQqq6 3zOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781192913; x=1781797713; 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=cHM9ksniuUhqTAVTpdb7IEp6BHP9lExgqgKDsZXSpKU=; b=cCadfInje73a+X0Nc/h/V8NotClOn7gsf/wLGP0QurmPJyg5vio5XU4ZtJTTRJDiD6 u3xWjHsl3cl//R+ypxz4MX8xVFqrOSZbG/K6QpvqdohbrjsALMZMYJpWiArmAHTwR9SF rZ7wNXvoV38xDXTTqCPYb9ul+zG2v3OV6w4ED8xKleqXUW2h3iPIvQCKHiyqMHKjMx8e Q06y2iYBY9+UX6Cab2cKU6cT3JNQ93pZTtWIIiSKt3p04ZJSPsCzXgs3gCtTFTlgbSd6 CxZ/GSHdCH2n1myGvyuPbtFh/4D3KQG4GsdJ7xCFacl++8P6+AeuiDvjPWI+pRA5dsDV tLVg== X-Forwarded-Encrypted: i=1; AFNElJ/7KYIS+AXwA4QpHVze7BXT/3DtD3Sd/LmByZQUbstu4l4jkX8UkYAaEVUS9AeREJpWUM1ofFV+NGQ7pOk=@vger.kernel.org X-Gm-Message-State: AOJu0YyTXhoEizKQsIoqRvYcSlRLFf/ekLw1PC3XB7pT8YvL0WyBiq17 hIU0hFRLusfUheXv758iq/k4U72tF+XIsMxnfsHw0bM9ZrtNGcMAf6kF X-Gm-Gg: Acq92OHUcpgEVN7gFg3bM4rF/k2CM6V0aYfdADA3ZGvov3ghfeEoogpb0t1k0VzYFxV /YydK4nTGUpWqM4UyV3WzA+utAMHa1FijblR56QyJuUl1ByWgCLXTvy19dt6snmaGaK5bM5lr9D ynctaVtdvMU3AEPwoUmgt3G7RdrIK8MwhjLw0hedebu95kakxE2UBGcsRrtRJ9Y7UfqWSsg592l LntvQHhAXeCHxMeJwr56Xqsm0v07UFot82T1qovO0BdzGDvuCYOO2hL+Aud00aF8IGsq9L0w6jf PiPDS+cuMllGov4r4zZEChHVsJtZXOYSC5W9WXt1bGOS3dEbeBbt500wSrN88OB+pxHtTIEKXpI 3VburdB3uglmukzJ+pKN1dOiAiIR/xTSnUm3L09llmbuwlaOZuRHx6UIHO/clxoTjeshYYXBtUk d4coETtq1xoPV6B3RYbK+5bIUMmP7cKK1RcKNnMBGY3xxEKZeqXKJHu7p/4YXSFdbm+KnMydIj+ LB0OoAYhEQbl5V2H+PILLQ/yA== X-Received: by 2002:a05:7300:6c25:b0:307:934e:da79 with SMTP id 5a478bee46e88-30804b769b7mr2834662eec.34.1781192912515; Thu, 11 Jun 2026 08:48:32 -0700 (PDT) Received: from dtor-ws.sjc.corp.google.com ([2a00:79e0:2ebe:8:ae0e:e075:91c8:6570]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-30806aa88a7sm2184492eec.0.2026.06.11.08.48.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Jun 2026 08:48:32 -0700 (PDT) From: Dmitry Torokhov Date: Thu, 11 Jun 2026 08:48:26 -0700 Subject: [PATCH v5 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: <20260611-rohm-software-nodes-v5-2-0244664a3b65@gmail.com> References: <20260611-rohm-software-nodes-v5-0-0244664a3b65@gmail.com> In-Reply-To: <20260611-rohm-software-nodes-v5-0-0244664a3b65@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 | 123 +++++++++++++++++++++++++++++++++--------= ---- 1 file changed, 90 insertions(+), 33 deletions(-) diff --git a/drivers/mfd/rohm-bd718x7.c b/drivers/mfd/rohm-bd718x7.c index ff714fd4f54d..be2acc429fe3 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,89 @@ static int bd718xx_init_press_duration(struct regmap = *regmap, return 0; } =20 +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), + { } +}; + +static const struct resource bd718xx_powerkey_resources[] =3D { + DEFINE_RES_IRQ_NAMED(BD718XX_INT_PWRBTN_S, "bd718xx-pwrkey"), +}; + +#define GPIO_KEYS 0 /* Node corresponding to gpio-keys device itself */ +#define PWRON_KEY 1 /* Node describing power button in gpio-keys */ + +static int bd718xx_i2c_register_swnodes(const struct software_node *nodes) +{ + const struct software_node * const node_group[] =3D { + &nodes[GPIO_KEYS], &nodes[PWRON_KEY], NULL + }; + + return software_node_register_node_group(node_group); +} + +static void bd718xx_i2c_unregister_swnodes(void *data) +{ + const struct software_node *nodes =3D data; + const struct software_node * const node_group[] =3D { + &nodes[GPIO_KEYS], &nodes[PWRON_KEY], NULL + }; + + software_node_unregister_node_group(node_group); +} + +static int bd718xx_i2c_register_pwrbutton(struct device *dev, + struct irq_domain *irq_domain) +{ + struct mfd_cell gpio_keys_cell =3D { + .name =3D "gpio-keys", + .resources =3D bd718xx_powerkey_resources, + .num_resources =3D ARRAY_SIZE(bd718xx_powerkey_resources), + }; + struct software_node *nodes; + int ret; + + nodes =3D devm_kcalloc(dev, 2, sizeof(*nodes), GFP_KERNEL); + if (!nodes) + return -ENOMEM; + + nodes[GPIO_KEYS].name =3D devm_kasprintf(dev, GFP_KERNEL, "%s-power-key",= dev_name(dev)); + if (!nodes[GPIO_KEYS].name) + return -ENOMEM; + + nodes[GPIO_KEYS].properties =3D bd718xx_powerkey_parent_props; + + nodes[PWRON_KEY].parent =3D &nodes[GPIO_KEYS]; + nodes[PWRON_KEY].properties =3D bd718xx_powerkey_props; + + ret =3D bd718xx_i2c_register_swnodes(nodes); + if (ret) + return ret; + + ret =3D devm_add_action_or_reset(dev, bd718xx_i2c_unregister_swnodes, nod= es); + if (ret) + return ret; + + gpio_keys_cell.swnode =3D &nodes[GPIO_KEYS]; + + ret =3D devm_mfd_add_devices(dev, PLATFORM_DEVID_AUTO, &gpio_keys_cell, 1, + NULL, 0, irq_domain); + if (ret) + return dev_err_probe(dev, ret, "Failed to register power-button"); + + 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 +228,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) + return dev_err_probe(&i2c->dev, ret, "Failed to create subdevices\n"); + + ret =3D bd718xx_i2c_register_pwrbutton(&i2c->dev, irq_domain); if (ret) - dev_err_probe(&i2c->dev, ret, "Failed to create subdevices\n"); + return ret; =20 - return ret; + return 0; } =20 static const struct of_device_id bd718xx_of_match[] =3D { --=20 2.54.0.1099.g489fc7bff1-goog